diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index 981f9242d..5dedd6d95 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -1,20 +1,20 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" -#include "../net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "../net/minecraft/server/MinecraftServer.h" -#include "../net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "../net/minecraft/client/renderer/GameRenderer.h" -#include "../net/minecraft/client/ProgressRenderer.h" -#include "../net/minecraft/client/renderer/LevelRenderer.h" -#include "../Header Files/MobSkinMemTextureProcessor.h" -#include "../net/minecraft/client/Minecraft.h" -#include "../net/minecraft/client/multiplayer/ClientConnection.h" -#include "../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" +#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" @@ -24,44 +24,44 @@ #include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h" #include "Minecraft.World/ConsoleHelpers/PathHelper.h" -#include "../net/minecraft/stats/StatsCounter.h" -#include "../net/minecraft/server/level/GameMode.h" -#include "Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" #if defined(_WINDOWS64) -#include "../Windows64/XML/ATGXmlParser.h" -#include "../Windows64/XML/xmlFilesCallback.h" +#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" +#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" #endif #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "Minecraft_Macros.h" -#include "../net/minecraft/server/PlayerList.h" -#include "../net/minecraft/server/level/ServerPlayer.h" -#include "Source Files/GameRules/ConsoleGameRules.h" -#include "Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "java/InputOutputStream/InputOutputStream.h" #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "../net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/client/User.h" #include #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Minecraft.World/Header Files/compression.h" -#include "../net/minecraft/client/skins/TexturePackRepository.h" -#include "../net/minecraft/client/skins/DLCTexturePack.h" -#include "Source Files/DLC/DLCPack.h" -#include "Source Files/Localisation/StringTable.h" -#include "Source Files/UI/All Platforms/ArchiveFile.h" -#include "../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #if defined(__linux__) #include #include #endif -#include "Source Files/UI/UI.h" -#include "Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include #include -#include "Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" // CMinecraftApp app; unsigned int CMinecraftApp::m_uiLastSignInData = 0; @@ -3606,7 +3606,7 @@ void CMinecraftApp::loadMediaArchive() { #if _WINDOWS64 mediapath = L"Common\\Media\\MediaWindows64.arc"; #elif __linux__ - mediapath = L"Common/Media/MediaLinux.arc"; + mediapath = L"Minecraft.Client/Common/Media/MediaLinux.arc"; #endif if (!mediapath.empty()) { diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.h b/minecraft/Minecraft.Client/Common/Consoles_App.h index a604e498c..cc2663309 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.h +++ b/minecraft/Minecraft.Client/Common/Consoles_App.h @@ -8,19 +8,19 @@ // using namespace std; -#include "Source Files/Audio/Consoles_SoundEngine.h" -#include "Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" -#include "Source Files/Localisation/StringTable.h" -#include "Source Files/DLC/DLCManager.h" -#include "Source Files/GameRules/ConsoleGameRulesConstants.h" -#include "Source Files/GameRules/GameRuleManager.h" -#include "../Header Files/SkinBox.h" -#include "Source Files/UI/All Platforms/ArchiveFile.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h" #include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" typedef struct _JoinFromInviteData { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp b/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp index 09e1d4c91..c7b5ff765 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Consoles_SoundEngine.h" +#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h" bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() { return m_bIsPlayingStreamingCDMusic; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h b/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h index ca0687109..8134ad41b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h @@ -1,7 +1,13 @@ #pragma once +#include +#include +#include + #include "Minecraft.World/Header Files/SoundTypes.h" +class File; + typedef struct { float x, y, z; } AUDIO_VECTOR; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp index 7827f566f..b4e1e5b6d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp @@ -1,19 +1,33 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "SoundEngine.h" #include #include "Minecraft.World/ConsoleHelpers/PathHelper.h" -#include "../../Consoles_App.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../net/minecraft/client/skins/DLCTexturePack.h" -#include "../DLC/DLCAudioFile.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #if defined(__linux__) #define STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" + // Fixes strcasecmp in miniaudio // https://stackoverflow.com/questions/31127260/strcasecmp-a-non-standard-function int strcasecmp(const char* a, const char* b) { @@ -30,11 +44,12 @@ int strcasecmp(const char* a, const char* b) { } #define MINIAUDIO_IMPLEMENTATION #include "miniaudio.h" + #undef STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" #endif #if defined(_WINDOWS64) -#include "../../../Windows64/Windows64_App.h" +#include "Minecraft.Client/Windows64/Windows64_App.h" #include "Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h" #endif @@ -80,8 +95,8 @@ const char* SoundEngine::m_szStreamFileA[eStream_Max] = {"calm1", "ward", "where_are_we_now"}; #if defined(__linux__) -char SoundEngine::m_szSoundPath[] = {"Common/Sound/"}; -char SoundEngine::m_szMusicPath[] = {"Common/"}; +char SoundEngine::m_szSoundPath[] = {"Minecraft.Client/Common/Sound/"}; +char SoundEngine::m_szMusicPath[] = {"Minecraft.Client/Common/"}; char SoundEngine::m_szRedistName[] = {"redist64"}; #endif @@ -161,8 +176,8 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, if (szId[i] == '.') szId[i] = '/'; std::string base = PathHelper::GetExecutableDirA() + "/"; - const char* roots[] = {"Sound/Minecraft/", "Common/Sound/Minecraft/", - "Common/res/TitleUpdate/res/Sound/Minecraft/"}; + const char* roots[] = {"Sound/Minecraft/", "Minecraft.Client/Common/Sound/Minecraft/", + "Minecraft.Client/Common/res/TitleUpdate/res/Sound/Minecraft/"}; char finalPath[512] = {0}; bool found = false; @@ -230,8 +245,8 @@ void SoundEngine::playUI(int iSound, float volume, float pitch) { const char* roots[] = { "Sound/Minecraft/UI/", "Sound/Minecraft/", - "Common/Sound/Minecraft/UI/", - "Common/Sound/Minecraft/", + "Minecraft.Client/Common/Sound/Minecraft/UI/", + "Minecraft.Client/Common/Sound/Minecraft/", }; char finalPath[512] = {0}; bool found = false; @@ -434,7 +449,7 @@ void SoundEngine::playMusicTick() { bool found = false; m_szStreamName[0] = '\0'; - const char* roots[] = {"Common/music/", "music/", "./"}; + const char* roots[] = {"Minecraft.Client/Common/music/", "music/", "./"}; for (const char* r : roots) { for (const char* e : {".ogg", ".mp3", ".wav"}) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h index 04666c310..32914d15f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h @@ -1,9 +1,18 @@ #pragma once class Mob; class Options; +class C4JThread; +class Random; + using namespace std; +#include + #include "Minecraft.World/Header Files/SoundTypes.h" #include "./miniaudio.h" +#include "Minecraft.Client/Common/App_Defines.h" +#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + constexpr float SFX_3D_MIN_DISTANCE = 1.0f; constexpr float SFX_3D_MAX_DISTANCE = 16.0f; constexpr float SFX_3D_ROLLOFF = 0.5f; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp index bd61acfaf..24cde1b8d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp @@ -1,6 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" - #include "Consoles_SoundEngine.h" +#include "Minecraft.World/Header Files/SoundTypes.h" const wchar_t* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { L"mob/chicken/chicken", // eSoundType_MOB_CHICKEN_AMBIENT diff --git a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp b/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp index ba0c8c74f..b105bd4d1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp @@ -1,6 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #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 "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/DataInputStream.h" std::unordered_map ColourTable::s_colourNamesMap; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.h b/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.h index efcf46546..cbc29280a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.h @@ -1,5 +1,9 @@ #pragma once #include +#include +#include + +#include "Minecraft.Client/Common/App_enums.h" class ColourTable { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp b/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp index efcd0ba59..569f26954 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ConsoleGameMode.h" -#include "Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" + +class ClientConnection; +class Minecraft; ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft* minecraft, ClientConnection* connection) diff --git a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h b/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h index 20ad57cf8..67a981c61 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h +++ b/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h @@ -1,5 +1,8 @@ #pragma once -#include "Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" + +class ClientConnection; +class Minecraft; class ConsoleGameMode : public TutorialMode { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp index e21fde24c..01f60a4ae 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp @@ -1,12 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include #include #include +#include + #include "DLCManager.h" #include "DLCAudioFile.h" +#include "4J.Render/4J_Render.h" +#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" #if defined(_WINDOWS64) -#include "../../../Windows64/XML/ATGXmlParser.h" -#include "../../../Windows64/XML/xmlFilesCallback.h" +#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" +#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" #endif namespace { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h index 1a3eb6b91..642833b9d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h @@ -1,4 +1,8 @@ #pragma once +#include +#include +#include + #include "DLCFile.h" class DLCAudioFile : public DLCFile { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp index 2d6cd1aab..2ad3513a6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DLCManager.h" #include "DLCCapeFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Linux/Linux_App.h" DLCCapeFile::DLCCapeFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Cape, path) {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.h index 5d72b8a61..f90932d5b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "DLCFile.h" class DLCCapeFile : public DLCFile { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp index 6d2e42eab..7e36f8107 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp @@ -1,9 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DLCManager.h" #include "DLCColourTableFile.h" -#include "../../../net/minecraft/client/Minecraft.h" -#include "../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Linux/Linux_App.h" DLCColourTableFile::DLCColourTableFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_ColourTable, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h index 119ddf0e8..d66a9bd2f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "DLCFile.h" class ColourTable; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp index 989ffc511..1c09e0c9b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp @@ -1,5 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "DLCFile.h" +#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) { m_type = type; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.h index c6f5da912..5e520bd86 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.h @@ -1,5 +1,7 @@ #pragma once #include +#include + #include "DLCManager.h" class DLCFile { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h index 0da3d4b7b..17167b2b6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h @@ -1,7 +1,7 @@ #pragma once #include "DLCFile.h" -#include "../GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" class DLCGameRules : public DLCFile { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp index 75207e8a5..590cff1c5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DLCManager.h" #include "DLCGameRulesFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h" DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path) : DLCGameRules(DLCManager::e_DLCType_GameRules, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h index 2bcb24a65..9679671e5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "DLCGameRules.h" class DLCGameRulesFile : public DLCGameRules { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp index ec8cafa93..8abb4693f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" - #include -#include "java/File.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "java/InputOutputStream/InputOutputStream.h" - #include "DLCManager.h" #include "DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h" +#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" + +class StringTable; DLCGameRulesHeader::DLCGameRulesHeader(const std::wstring& path) : DLCGameRules(DLCManager::e_DLCType_GameRulesHeader, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h index e080e2baf..7b42967e7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h @@ -1,7 +1,12 @@ #pragma once +#include +#include + #include "DLCGameRules.h" -#include "../GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" + +class StringTable; class DLCGameRulesHeader : public DLCGameRules, public JustGrSource { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp index 863b13bb9..4b1de96c9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DLCManager.h" #include "DLCLocalisationFile.h" -#include "../Localisation/StringTable.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_LocalisationData, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h index 7b8fca417..86a430282 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "DLCFile.h" class StringTable; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp index c8a05c5d0..54e3f84c3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp @@ -1,12 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include #include "DLCManager.h" #include "DLCPack.h" #include "DLCFile.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/Header Files/PortableFileIO.h" -#include "../../../net/minecraft/client/Minecraft.h" -#include "../../../net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include #include #include diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp index 72980c347..33b275d2e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp @@ -1,4 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "DLCPack.h" #include "DLCSkinFile.h" #include "DLCCapeFile.h" @@ -10,6 +14,14 @@ #include "DLCAudioFile.h" #include "DLCColourTableFile.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { m_dataPath = L""; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h index 3c76c0207..f0032e3a5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h @@ -1,7 +1,13 @@ #pragma once // using namespace std; #include +#include +#include +#include + #include "DLCManager.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" class DLCFile; class DLCSkinFile; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp index 0d29e87e3..426e41e32 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp @@ -1,11 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "DLCManager.h" #include "DLCSkinFile.h" -#include "../../../net/minecraft/client/model/geom/ModelPart.h" -#include "../../../net/minecraft/client/renderer/entity/EntityRenderer.h" -#include "../../../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "4J.Render/4J_Render.h" +#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" DLCSkinFile::DLCSkinFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Skin, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h index c30a9fc5a..ba9835c2e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h @@ -1,6 +1,13 @@ #pragma once +#include +#include +#include +#include + #include "DLCFile.h" -#include "../../../net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Header Files/SkinBox.h" class DLCSkinFile : public DLCFile { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp index c25b6cd62..5144ef740 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DLCManager.h" #include "DLCTextureFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" DLCTextureFile::DLCTextureFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Texture, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h index bb25336ab..993539925 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h @@ -1,5 +1,9 @@ #pragma once +#include +#include + #include "DLCFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" class DLCTextureFile : public DLCFile { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp index 245af58f3..59954aa23 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DLCManager.h" #include "DLCUIDataFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Linux/Linux_App.h" DLCUIDataFile::DLCUIDataFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_UIData, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h index 9676ac0dd..4f1fe7902 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "DLCFile.h" class DLCUIDataFile : public DLCFile { diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h index bb12d422e..e7ab3565b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h @@ -3,30 +3,30 @@ #include "GameRuleManager.h" -#include "LevelRules/Rules/GameRule.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" -#include "LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "LevelRules/RuleDefinitions/LevelRuleset.h" -#include "LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" -#include "LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" -#include "LevelGeneration/LevelGenerationOptions.h" -#include "LevelGeneration/ApplySchematicRuleDefinition.h" -#include "LevelGeneration/ConsoleGenerateStructure.h" -#include "LevelGeneration/ConsoleGenerateStructureAction.h" -#include "LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "LevelGeneration/BiomeOverride.h" -#include "LevelGeneration/StartFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h" -#include "LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp index 26d0b7473..3aa7c55e4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp @@ -1,14 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/Header Files/compression.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/File.h" #include "Minecraft.World/Header Files/compression.h" -#include "../DLC/DLCPack.h" -#include "../DLC/DLCLocalisationFile.h" -#include "../DLC/DLCGameRulesFile.h" -#include "../DLC/DLCGameRules.h" -#include "../DLC/DLCGameRulesHeader.h" -#include "../Localisation/StringTable.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" #include "ConsoleGameRules.h" #include "GameRuleManager.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h index 90e97e43c..ce95165e2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h @@ -1,9 +1,9 @@ #pragma once ////using namespace std; -#include "LevelGeneration/LevelGenerators.h" -#include "LevelRules/LevelRules.h" -#include "../DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" class LevelGenerationOptions; class RootGameRulesDefinition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 3cf64bc5d..b59614557 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -1,14 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "ApplySchematicRuleDefinition.h" #include "LevelGenerationOptions.h" #include "ConsoleSchematicFile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#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 "java/InputOutputStream/DataOutputStream.h" ApplySchematicRuleDefinition::ApplySchematicRuleDefinition( LevelGenerationOptions* levelGenOptions) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index 439f20b64..cd68af5a2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -1,8 +1,13 @@ #pragma once +#include #include -#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include + +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "ConsoleSchematicFile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" class AABB; class Vec3; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp index a0069199b..1762f14e1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "BiomeOverride.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataOutputStream.h" BiomeOverride::BiomeOverride() { m_tile = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h index dddf3ea6f..32bf8b301 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h @@ -1,7 +1,11 @@ #pragma once // using namespace std; -#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include +#include + +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class BiomeOverride : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index fe7c3e167..5ce711a66 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -1,11 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "ConsoleGenerateStructure.h" -#include "../ConsoleGameRules.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "java/InputOutputStream/DataOutputStream.h" ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) { m_x = m_y = m_z = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h index fbe16648f..b79061c16 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -1,6 +1,11 @@ #pragma once -#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include +#include + +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Level; class Random; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h index 1e12e739b..674bfeea5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h @@ -1,6 +1,6 @@ #pragma once -#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" class ConsoleGenerateStructureAction : public GameRuleDefinition { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index 4a63c0e36..959bac893 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -1,16 +1,34 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include #include -#include "nbt/com.mojang.nbt.h" -#include "java/System.h" +#include +#include +#include + #include "ConsoleSchematicFile.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" +#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "Minecraft.World/net/minecraft/world/entity/Painting.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#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/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/x64headers/extraX64.h" +#include "java/Class.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/DoubleTag.h" +#include "nbt/IntTag.h" +#include "nbt/ListTag.h" +#include "nbt/NbtIo.h" +#include "nbt/Tag.h" ConsoleSchematicFile::ConsoleSchematicFile() { m_xSize = m_ySize = m_zSize = 0; @@ -152,10 +170,6 @@ void ConsoleSchematicFile::load(DataInputStream* dis) { y = ((IntTag*)eTag->get(L"TileY"))->data; z = ((IntTag*)eTag->get(L"TileZ"))->data; } -#ifdef _DEBUG - // app.DebugPrintf(1,"Loaded entity type %d at - // (%f,%f,%f)\n",(int)type,x,y,z); -#endif m_entities.push_back(std::pair( Vec3(x, y, z), (CompoundTag*)eTag->copy())); } diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h index 7a0493ff2..c82006efa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -4,7 +4,17 @@ #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1 #define XBOX_SCHEMATIC_CURRENT_VERSION 2 +#include +#include +#include +#include +#include +#include + #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" class Level; class DataOutputStream; @@ -13,6 +23,7 @@ class TileEntity; class LevelChunk; class AABB; class Vec3; +class CompoundTag; class ConsoleSchematicFile { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp index b896befec..64e716ec9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include #include @@ -9,9 +9,9 @@ #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "../../Localisation/StringTable.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" #include "LevelGenerationOptions.h" -#include "../ConsoleGameRules.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" JustGrSource::JustGrSource() { m_displayName = L"Default_DisplayName"; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h index 13b904d12..6893ea0ba 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -5,7 +5,7 @@ #include -#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" class ApplySchematicRuleDefinition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp index 9bff2e772..74922709e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "LevelGenerationOptions.h" #include "LevelGenerators.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h" LevelGenerators::LevelGenerators() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h index ccfbff3ad..383e0c25b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h @@ -1,5 +1,8 @@ #pragma once +#include +#include +#include // using namespace std; class LevelGenerationOptions; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp index f8a8276fa..c75e1f147 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "StartFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataOutputStream.h" StartFeature::StartFeature() { m_chunkX = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h index 01cf7a489..86bcef36a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h @@ -1,8 +1,11 @@ #pragma once // using namespace std; -#include "../LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include + +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class StartFeature : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 5340ca9f9..950d1d4af 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "XboxStructureActionGenerateBox.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "java/InputOutputStream/DataOutputStream.h" XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() { m_x0 = m_y0 = m_z0 = m_x1 = m_y1 = m_z1 = m_edgeTile = m_fillTile = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h index e6fc7e256..be366f935 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h @@ -1,5 +1,8 @@ #pragma once -#include "../ConsoleGenerateStructureAction.h" +#include + +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class StructurePiece; class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index 16cdab489..e46139acf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "XboxStructureActionPlaceBlock.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "java/InputOutputStream/DataOutputStream.h" XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() { m_x = m_y = m_z = m_tile = m_data = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h index 7c740c7ba..93e6e0040 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h @@ -1,5 +1,8 @@ #pragma once -#include "../ConsoleGenerateStructureAction.h" +#include + +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class StructurePiece; class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 0f20a46ee..8e32b4fd3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -1,11 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "XboxStructureActionPlaceContainer.h" -#include "../../LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() { m_tile = Tile::chest_Id; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h index fbb462da5..1ad4f0a22 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class AddItemRuleDefinition; class StructurePiece; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 4e42f0073..39ee5e3b4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -1,9 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include +#include + #include "XboxStructureActionPlaceSpawner.h" -#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "java/InputOutputStream/DataOutputStream.h" XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() { m_tile = Tile::mobSpawner_Id; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h index 300066c22..5a43d7351 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class StructurePiece; class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp index 0c049fe86..fe15ded22 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "LevelRules.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h" LevelRules::LevelRules() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h index d297beb2a..f12e7548b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + class LevelRuleset; class LevelRules { diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 88c1cb6ee..a441824c4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -1,8 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" #include "AddEnchantmentRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentCategory.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "java/InputOutputStream/DataOutputStream.h" AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() { m_enchantmentId = m_enchantmentLevel = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h index 64bdb86c0..4c148d90a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class ItemInstance; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index a1fad7779..ca63c72f5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -1,10 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "AddItemRuleDefinition.h" #include "AddEnchantmentRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "java/InputOutputStream/DataOutputStream.h" AddItemRuleDefinition::AddItemRuleDefinition() { m_itemId = m_quantity = m_auxValue = m_dataTag = 0; @@ -45,10 +50,6 @@ GameRuleDefinition* AddItemRuleDefinition::addChild( rule = new AddEnchantmentRuleDefinition(); m_enchantments.push_back((AddEnchantmentRuleDefinition*)rule); } else { -#ifndef _CONTENT_PACKAGE - // wprintf(L"AddItemRuleDefinition: Attempted to add invalid child rule - // - %d\n", ruleType ); -#endif } return rule; } diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h index adbaabf62..97da5f40f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h @@ -1,6 +1,11 @@ #pragma once +#include +#include +#include + #include "GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class Container; class AddEnchantmentRuleDefinition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index 5573fadd2..aec526290 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -1,10 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../WstringLookup.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "CollectItemRuleDefinition.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/network/Connection.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "java/InputOutputStream/DataOutputStream.h" CollectItemRuleDefinition::CollectItemRuleDefinition() { m_itemId = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h index 5b0e4283b..8a524cb93 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h @@ -1,6 +1,11 @@ #pragma once +#include +#include + #include "GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" class Pos; class UseTileRuleDefinition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index bf653a796..f92d06735 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -1,9 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "CompleteAllRuleDefinition.h" -#include "../../ConsoleGameRules.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/network/Connection.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" void CompleteAllRuleDefinition::getChildren( std::vector* children) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h index 5f90abc34..e2b0cfe9c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "CompoundGameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" + +class GameRule; class CompleteAllRuleDefinition : public CompoundGameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index 6e31e156f..185ce531b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -1,8 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "CompoundGameRuleDefinition.h" -#include "../../ConsoleGameRules.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" CompoundGameRuleDefinition::CompoundGameRuleDefinition() { m_lastRuleStatusChanged = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h index fa1b04ce0..ee3aa59d4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" class CompoundGameRuleDefinition : public GameRuleDefinition { protected: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 3a3980386..6eaf33c27 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -1,7 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../WstringLookup.h" +#include +#include +#include +#include +#include +#include +#include + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../../ConsoleGameRules.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataOutputStream.h" + +class Connection; GameRuleDefinition::GameRuleDefinition() { m_descriptionId = L""; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index cbd1e05ce..2c8ace3be 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -2,16 +2,20 @@ // using namespace std; #include #include +#include +#include #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "../../ConsoleGameRulesConstants.h" - -#include "../Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" class GameRule; class LevelRuleset; class Player; class WstringLookup; +class Connection; +class DataOutputStream; +class ItemInstance; class GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index 50e50768e..f48cd1841 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp @@ -1,8 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../../../Localisation/StringTable.h" -#include "../../ConsoleGameRules.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" #include "LevelRuleset.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" + +class AABB; LevelRuleset::LevelRuleset() { m_stringTable = nullptr; } diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h index c44c19d91..f8322069d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h @@ -1,8 +1,14 @@ #pragma once +#include +#include + #include "CompoundGameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition; +class AABB; +class StringTable; class LevelRuleset : public CompoundGameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index a25448ff6..1c4d92fe4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "NamedAreaRuleDefinition.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataOutputStream.h" NamedAreaRuleDefinition::NamedAreaRuleDefinition() { m_name = L""; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h index 8dc433d5f..beff99224 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index 5d4b4f88f..4fccbe543 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -1,11 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "UpdatePlayerRuleDefinition.h" -#include "../../ConsoleGameRules.h" #include "Minecraft.World/net/minecraft/Pos.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#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/food/FoodData.h" +#include "java/InputOutputStream/DataOutputStream.h" UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() { m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h index 5f768ff35..856a8a28a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h @@ -1,7 +1,11 @@ #pragma once // using namespace std; +#include +#include + #include "GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class AddItemRuleDefinition; class Pos; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index 5b3d0ae90..f33b60de1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UseTileRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/DataOutputStream.h" UseTileRuleDefinition::UseTileRuleDefinition() { m_tileId = -1; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index bcd7edbbf..2a11c9d31 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -1,8 +1,11 @@ #pragma once // using namespace std; +#include + #include "GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" class UseTileRuleDefinition : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp index 4a3fb7a2a..ed62534e5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp @@ -1,5 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../ConsoleGameRules.h" + +#include +#include +#include +#include +#include + +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" + +class Connection; +class ItemInstance; GameRule::GameRule(GameRuleDefinition* definition, Connection* connection) { m_definition = definition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h index f0b0586bb..00c686c73 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h @@ -1,11 +1,17 @@ #pragma once // using namespace std; +#include #include +#include +#include class CompoundTag; class GameRuleDefinition; class Connection; +class DataInputStream; +class DataOutputStream; +class ItemInstance; // A game rule maintains the state for one particular definition class GameRule { diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.cpp index dc71aad4b..a2071ca68 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include "WstringLookup.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.h index a19eefe29..798eef5e2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + class WstringLookup { private: unsigned int numIDs; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp index 16ff80e86..e92b5d1bf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp @@ -1,5 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "LeaderboardInterface.h" +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" LeaderboardInterface::LeaderboardInterface(LeaderboardManager* man) { m_manager = man; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h index 1f9d49b9d..98827f23d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h @@ -1,6 +1,7 @@ #pragma once #include "LeaderboardManager.h" +#include "4J.Common/4J_Compat.h" // 4J-JEV: Simple interface for handling ReadStat failures. class LeaderboardInterface { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp index 1dd0162f0..58526f4d4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp @@ -1,8 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" - #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" - #include "LeaderboardManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/x64headers/extraX64.h" const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = { L"Friends", L"MyScore", L"TopRank"}; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h index 7d87d9d6b..09ded58c3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h @@ -1,8 +1,11 @@ #pragma once +#include + +#include "4J.Common/4J_Compat.h" + // Forward Declarations. class LeaderboardManager; - // READ LISTENTER // class LeaderboardReadListener; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.h b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.h index 00a85e5ae..315f4c358 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.h @@ -6,6 +6,7 @@ #ifndef BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A #define BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A +#include #include #if __cplusplus >= 201703L diff --git a/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp b/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp index f92a32b16..b4f18fbf7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp @@ -1,5 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "StringTable.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/DataInputStream.h" StringTable::StringTable(void) {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.h b/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.h index f7ebafec4..74094af31 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.h @@ -1,6 +1,9 @@ #pragma once #include +#include +#include +#include #define LOCALE_COUNT 11 diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp index 21123e3fe..90eba2ea7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" @@ -12,29 +12,29 @@ #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h" -#include "../../../net/minecraft/client/multiplayer/ClientConnection.h" -#include "../../../net/minecraft/client/Minecraft.h" -#include "../../../net/minecraft/client/User.h" -#include "../../../net/minecraft/server/MinecraftServer.h" -#include "../../../net/minecraft/server/PlayerList.h" -#include "../../../net/minecraft/server/level/ServerPlayer.h" -#include "../../../net/minecraft/server/network/PlayerConnection.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "../../../net/minecraft/client/ProgressRenderer.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" #include "Minecraft.World/Header Files/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "../../../net/minecraft/client/gui/Gui.h" -#include "../../../net/minecraft/client/renderer/LevelRenderer.h" -#include "../GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" -#include "../UI/UI.h" -#include "../UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" // Global instance CGameNetworkManager g_NetworkManager; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp index 91bd1ef0c..29e927d24 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp @@ -1,5 +1,10 @@ #include "NetworkPlayerQNet.h" +#include + +#include "Minecraft.World/x64headers/extraX64.h" +#include "java/System.h" + NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) { m_qnetPlayer = qnetPlayer; m_pSocket = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.h b/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.h index faf7ba653..7bc684c98 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.h @@ -1,6 +1,13 @@ #pragma once +#include +#include + #include "NetworkPlayerInterface.h" +#include "4J.Common/4J_Compat.h" + +class IQNetPlayer; +class Socket; // This is an implementation of the INetworkPlayer interface for the supported // QNet-backed path. It diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp index e5c5898b8..201e917f4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp @@ -1,8 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "Socket.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "NetworkPlayerQNet.h" #include "PlatformNetworkManagerStub.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" CPlatformNetworkManagerStub* g_pPlatformNetworkManager; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h index 0b4873732..1a3ede278 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h @@ -1,10 +1,19 @@ #pragma once +#include // using namespace std; #include +#include + #include "Minecraft.World/ConsoleHelpers/C4JThread.h" #include "NetworkPlayerInterface.h" #include "PlatformNetworkManagerInterface.h" #include "SessionInfo.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/x64headers/extraX64.h" + +class C4JThread; +class CGameNetworkManager; +class INetworkPlayer; class CPlatformNetworkManagerStub : public CPlatformNetworkManager { friend class CGameNetworkManager; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp index 680328f9a..cb2bb2b3a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp @@ -1,13 +1,15 @@ +#include #include #include +#include -#include "java/InputOutputStream/InputOutputStream.h" #include "Socket.h" -#include - // 4jcraft TODO -#include "../../Minecraft.Client/Common/ShutdownManager.h" -#include "../../Minecraft.Client/net/minecraft/server/network/ServerConnection.h" +#include "Minecraft.Client/Common/ShutdownManager.h" +#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" class SocketAddress {}; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.h b/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.h index 0e45e10d4..a253bb2ba 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.h @@ -1,20 +1,23 @@ #pragma once #include #include +#include #ifndef __linux__ #include #include #endif #include #include + #include "java/InputOutputStream/InputStream.h" #include "java/InputOutputStream/OutputStream.h" - #include "Minecraft.World/ConsoleHelpers/C4JThread.h" // 4jcraft TODO #include "Minecraft.World/ConsoleHelpers/ThreadName.h" // 4jcraft TODO #include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +class INetworkPlayer; + #define SOCKET_CLIENT_END 0 #define SOCKET_SERVER_END 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.cpp b/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.cpp index 4029fa862..05d8ab0e5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TrialMode.h" -#include "../Tutorial/FullTutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.h" +#include "Minecraft.Client/Common/Source Files/Trial/TrialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" + +class ClientConnection; +class Minecraft; TrialMode::TrialMode(int iPad, Minecraft* minecraft, ClientConnection* connection) diff --git a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.h b/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.h index 78120e485..e819f8fbd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.h @@ -1,5 +1,8 @@ #pragma once -#include "../Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" + +class ClientConnection; +class Minecraft; class TrialMode : public FullTutorialMode { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.cpp index fe6caf76d..4c3c21de5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.cpp @@ -1,9 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaConstraint.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.h index 05265b73f..11acf7f06 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.h @@ -1,6 +1,7 @@ #pragma once #include "TutorialConstraint.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" class AABB; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.cpp index 0432e9937..6ca5fdbb7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -1,13 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include -#include "../Tutorial.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "ChangeStateConstraint.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "../../../../net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" ChangeStateConstraint::ChangeStateConstraint( Tutorial* tutorial, eTutorial_State targetState, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.h index 66a5d5128..c91413657 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.h @@ -1,10 +1,11 @@ #pragma once -#include "../TutorialEnum.h" -#include "TutorialConstraint.h" - #include +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "TutorialConstraint.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" + class AABB; class Tutorial; class GameType; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.cpp index f77025bce..c02ce0548 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.cpp @@ -1,5 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "InputConstraint.h" +#include "4J_Input.h" +#include "Minecraft.Client/Common/App_enums.h" bool InputConstraint::isMappingConstrained(int iPad, int mapping) { // If it's a menu button, then we ignore all inputs diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp index c2d1b7826..bb4c73c58 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp @@ -1,15 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "../GameRules/ConsoleGameRules.h" -#include "Hints/DiggerItemHint.h" -#include "Tasks/TutorialTasks.h" -#include "Hints/AreaHint.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTasks.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h" #include "FullTutorial.h" -#include "Constraints/TutorialConstraints.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraints.h" FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) : Tutorial(iPad, true) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.cpp index 655393826..91f677203 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "FullTutorial.h" #include "FullTutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" + +class ClientConnection; FullTutorialMode::FullTutorialMode(int iPad, Minecraft* minecraft, ClientConnection* connection) diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h index de3e28824..c3221cb1b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h @@ -1,6 +1,9 @@ #pragma once #include "TutorialMode.h" +class ClientConnection; +class Minecraft; + class FullTutorialMode : public TutorialMode { public: FullTutorialMode(int iPad, Minecraft* minecraft, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.cpp index 82b73dcf7..1908bc4ad 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.cpp @@ -1,10 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaHint.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial, eTutorial_State displayState, eTutorial_State completeState, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h index 68ec72ba5..e12223fc9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h @@ -1,8 +1,11 @@ #pragma once #include "TutorialHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" class AABB; +class Tutorial; class AreaHint : public TutorialHint { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp index 75b4f377d..7b42d5a5c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "DiggerItemHint.h" DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.cpp index 55d0a61ad..d0397305f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "LookAtEntityHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, int titleId, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.h index 22f0413b9..64737a3d9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.h @@ -3,8 +3,10 @@ #include "java/Class.h" #include "TutorialHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" class ItemInstance; +class Tutorial; class LookAtEntityHint : public TutorialHint { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.cpp index e6c8c6be1..688d87b96 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.cpp @@ -1,8 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "../Tutorial.h" +#include + +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "LookAtTileHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial, int tiles[], unsigned int tilesLength, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.h index 868662264..e35dd4fa9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.h @@ -2,8 +2,10 @@ // using namespace std; #include "TutorialHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" class ItemInstance; +class Tutorial; class LookAtTileHint : public TutorialHint { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.cpp index 9b43f1054..09b672397 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.cpp @@ -1,8 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "../Tutorial.h" +#include + +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "TakeItemHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[], unsigned int itemsLength) diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.h index 5992fb0ca..65891c979 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.h @@ -2,8 +2,10 @@ // using namespace std; #include "TutorialHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" class ItemInstance; +class Tutorial; class TakeItemHint : public TutorialHint { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.cpp index 8528899a8..bf4ba4bc6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.cpp @@ -1,11 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "TutorialHint.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" + +class Entity; +class ItemInstance; +class Tile; TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, eHintType type, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h index 171c7b002..12e23364f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h @@ -1,7 +1,14 @@ #pragma once // using namespace std; -#include "../TutorialEnum.h" +#include + +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "java/Class.h" + +class Entity; +class ItemInstance; +class Tile; #define TUTORIAL_HINT_MAX_MINE_REPEATS 20 diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.cpp index 2e0c2949d..cd0a59039 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Tutorial.h" +#include + +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "AreaTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial, std::vector* inConstraints, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.h index e1642f5bb..195762903 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.h @@ -1,7 +1,13 @@ #pragma once // using namespace std; +#include + #include "TutorialTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" + +class Tutorial; +class TutorialConstraint; // A task that creates an maintains an area constraint until it is activated class AreaTask : public TutorialTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp index 589db40f9..ac9c5b6f1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp @@ -1,12 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include -#include -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../Tutorial.h" -#include "../Constraints/TutorialConstraints.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "ChoiceTask.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "4J_Input.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" ChoiceTask::ChoiceTask( Tutorial* tutorial, int descriptionId, int promptId /*= -1*/, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h index 0489c4f83..d3ef093ef 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h @@ -2,6 +2,9 @@ // using namespace std; #include "TutorialTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" + +class Tutorial; // Information messages with a choice class ChoiceTask : public TutorialTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.cpp index 5ac78b6d4..70339b793 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "CompleteUsingItemTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" + +class Tutorial; CompleteUsingItemTask::CompleteUsingItemTask(Tutorial* tutorial, int descriptionId, int itemIds[], diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.h index 5a86c69f2..c15dfa19b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.h @@ -4,6 +4,7 @@ #include "TutorialTask.h" class Level; +class Tutorial; class CompleteUsingItemTask : public TutorialTask { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.cpp index 4a59f36f9..975bda2bd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.cpp @@ -1,11 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include #include -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../Tutorial.h" -#include "../Constraints/TutorialConstraints.h" +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "ControllerTask.h" +#include "4J_Input.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Linux/Linux_App.h" + +class Tutorial; ControllerTask::ControllerTask(Tutorial* tutorial, int descriptionId, bool enablePreCompletion, bool showMinimumTime, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.h index 7851db37c..b26902336 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.h @@ -1,8 +1,12 @@ #pragma once // using namespace std; +#include + #include "TutorialTask.h" +class Tutorial; + // 4J Stu - Tasks that involve using the controller class ControllerTask : public TutorialTask { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.cpp index 4ce43dead..c42574045 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.cpp @@ -1,6 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "CraftTask.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + +class Tutorial; +class TutorialConstraint; CraftTask::CraftTask( int itemId, int auxValue, int quantity, Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.h index 3729d49b9..797eef27c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "TutorialTask.h" +class Tutorial; +class TutorialConstraint; + class CraftTask : public TutorialTask { public: CraftTask(int itemId, int auxValue, int quantity, Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.cpp index 7e0e0f664..0f5dadb2b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" #include "EffectChangedTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" + +class Tutorial; EffectChangedTask::EffectChangedTask(Tutorial* tutorial, int descriptionId, MobEffect* effect, bool apply, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.h index 00bca0eb1..3402b46f2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.h @@ -4,6 +4,7 @@ #include "TutorialTask.h" class MobEffect; +class Tutorial; class EffectChangedTask : public TutorialTask { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.cpp index e2511fbdd..31c4536be 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "FullTutorialActiveTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" FullTutorialActiveTask::FullTutorialActiveTask( Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.h index 8d1b75cad..245a95a5a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.h @@ -2,6 +2,9 @@ // using namespace std; #include "TutorialTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" + +class Tutorial; // Information messages with a choice class FullTutorialActiveTask : public TutorialTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.cpp index 29de37f35..0316d414f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.cpp @@ -1,13 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" - -#include - -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../Tutorial.h" +#include #include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" - #include "HorseChoiceTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" + +class Tutorial; HorseChoiceTask::HorseChoiceTask(Tutorial* tutorial, int iDescHorse, int iDescDonkey, int iDescMule, int iPromptId, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.h index 2c1881f1b..2b8e2c65e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.h @@ -1,6 +1,9 @@ #pragma once #include "ChoiceTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" + +class Tutorial; // Same as choice task, but switches description based on horse type. class HorseChoiceTask : public ChoiceTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp index 655ef7649..c5832d15b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp @@ -1,12 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include #include -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../Tutorial.h" -#include "../Constraints/TutorialConstraints.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "InfoTask.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "4J_Input.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" InfoTask::InfoTask( Tutorial* tutorial, int descriptionId, int promptId /*= -1*/, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.h index d3a27bff0..1323b23bb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.h @@ -1,8 +1,12 @@ #pragma once // using namespace std; +#include + #include "TutorialTask.h" +class Tutorial; + // Information messages class InfoTask : public TutorialTask { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.cpp index b6e7edd12..f563f7100 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.cpp @@ -1,5 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "PickupTask.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" void PickupTask::onTake(std::shared_ptr item, unsigned int invItemCountAnyAux, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.h index d9a1cdc41..798a9a873 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.h @@ -1,8 +1,12 @@ #pragma once +#include + // using namespace std; #include "TutorialTask.h" class ItemInstance; +class Tutorial; +class TutorialConstraint; class PickupTask : public TutorialTask { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.cpp index 702c62212..d00fc37f4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.cpp @@ -1,5 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "ProcedureCompoundTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" ProcedureCompoundTask::~ProcedureCompoundTask() { for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.h index 1cf44db38..a5973f2fa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "TutorialTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" + +class Tutorial; // A tutorial task that requires each of the task to be completed in order until // the last one is complete. If an earlier task that was complete is now not diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.cpp index d0ecb4062..421ae51d9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ProgressFlagTask.h" bool ProgressFlagTask::isCompleted() { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.h index 0dc8ae26a..bba2de7a9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.h @@ -1,8 +1,10 @@ #pragma once // using namespace std; -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "TutorialTask.h" +class Tutorial; + class ProgressFlagTask : public TutorialTask { public: enum EProgressFlagType { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.cpp index 9e6784855..7d08c3482 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.cpp @@ -1,13 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" - -#include - -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../Tutorial.h" - -#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include #include "RideEntityTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "java/Class.h" + +class Tutorial; +class TutorialConstraint; RideEntityTask::RideEntityTask(const int eType, Tutorial* tutorial, int descriptionId, bool enablePreCompletion, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.h index 1c04e1a6a..529d52d94 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.h @@ -1,8 +1,12 @@ #pragma once +#include + #include "TutorialTask.h" class Level; +class Tutorial; +class TutorialConstraint; // 4J-JEV: Tasks that involve riding an entity. class RideEntityTask : public TutorialTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.cpp index edd5cb5c2..0f12790a2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.cpp @@ -1,9 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/player/LocalPlayer.h" -#include "../../../../net/minecraft/stats/StatsCounter.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "StatTask.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" + +class Tutorial; StatTask::StatTask(Tutorial* tutorial, int descriptionId, bool enablePreCompletion, Stat* stat, int variance /*= 1*/) diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.h index 02b75fb0e..930078c80 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.h @@ -4,6 +4,7 @@ #include "TutorialTask.h" class Stat; +class Tutorial; // 4J Stu - Tutorial tasks that can use the current stat trackin code. This is // things like blocks mined/items crafted. diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StateChangeTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StateChangeTask.h index 17345ee25..62b282d39 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StateChangeTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StateChangeTask.h @@ -1,6 +1,6 @@ #pragma once // using namespace std; -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "TutorialTask.h" class StateChangeTask : public TutorialTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.cpp index b1db8393f..56a2b134c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Tutorial.h" -#include "../Constraints/TutorialConstraints.h" +#include + +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "TutorialTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" TutorialTask::TutorialTask(Tutorial* tutorial, int descriptionId, bool enablePreCompletion, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h index b0fca6d4e..32d95e21f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h @@ -1,11 +1,17 @@ #pragma once +#include +#include +#include + // using namespace std; -#include "../TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" class Level; class Tutorial; class TutorialConstraint; class MobEffect; +class Entity; +class ItemInstance; // A class that represents each individual task in the tutorial. // diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.cpp index e5f95a001..e7864a743 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.cpp @@ -1,8 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include + #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "UseItemTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" + +class Tutorial; +class TutorialConstraint; UseItemTask::UseItemTask(const int itemId, Tutorial* tutorial, int descriptionId, bool enablePreCompletion, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.h index ba7c73ef7..ff4703aa2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.h @@ -1,9 +1,13 @@ #pragma once // using namespace std; +#include + #include "TutorialTask.h" class Level; +class Tutorial; +class TutorialConstraint; // 4J Stu - Tasks that involve placing a tile class UseItemTask : public TutorialTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.cpp index 3b832cf02..6ff9ef2f5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.cpp @@ -1,8 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include + #include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "UseTileTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" + +class Tutorial; +class TutorialConstraint; UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial* tutorial, int descriptionId, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.h index e6747701c..18d75a1d6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.h @@ -1,9 +1,13 @@ #pragma once // using namespace std; +#include + #include "TutorialTask.h" class Level; +class Tutorial; +class TutorialConstraint; // 4J Stu - Tasks that involve using a tile, with or without an item. e.g. // Opening a chest diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.cpp index 6e9c6b78c..bbee75d8a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.cpp @@ -1,8 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "../../UI/UI.h" -#include "../Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "XuiCraftingTask.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" bool XuiCraftingTask::isCompleted() { // This doesn't seem to work diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.h index 34faed23b..0bf06c950 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.h @@ -1,7 +1,12 @@ #pragma once +#include + #include "TutorialTask.h" #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +class Tutorial; +class TutorialConstraint; + class XuiCraftingTask : public TutorialTask { public: enum eCraftingTaskType { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp index e2f47b2da..a7246740b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp @@ -1,23 +1,23 @@ #include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "../../../net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "../../../net/minecraft/server/MinecraftServer.h" -#include "../../../net/minecraft/client/Minecraft.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "../../../net/minecraft/server/level/SurvivalMode.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/server/level/SurvivalMode.h" #include "Tutorial.h" #include "TutorialMessage.h" -#include "Tasks/TutorialTasks.h" -#include "Constraints/TutorialConstraints.h" -#include "Hints/TutorialHints.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTasks.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraints.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHints.h" std::vector Tutorial::s_completableTasks; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h index 77d76ced3..2f53c8d28 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h @@ -1,8 +1,8 @@ #pragma once // using namespace std; -#include "Tasks/TutorialTask.h" -#include "Constraints/TutorialConstraint.h" -#include "Hints/TutorialHint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" #include "TutorialMessage.h" #include "TutorialEnum.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.cpp index 3b3888cac..75876e1c2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TutorialMessage.h" +#include "Minecraft.Client/Linux/Linux_App.h" TutorialMessage::TutorialMessage( int messageId, bool limitRepeats /*= false*/, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.h index 164d83262..c4327e311 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.h @@ -1,5 +1,7 @@ #pragma once +#include + // The default number of times any message should be shown #define TUTORIAL_MESSAGE_DEFAULT_SHOW 3 diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.cpp index d5789c723..29548950f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.cpp @@ -1,14 +1,19 @@ #include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include -#include "../../../net/minecraft/client/Minecraft.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h" + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" + +class ClientConnection; TutorialMode::TutorialMode(int iPad, Minecraft* minecraft, ClientConnection* connection) diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h index 3277c89b8..f5c38dc30 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h @@ -1,9 +1,13 @@ #pragma once // using namespace std; -#include "../../../net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Tutorial.h" +class ClientConnection; +class Minecraft; +class Tutorial; + class TutorialMode : public MultiPlayerGameMode { protected: Tutorial* tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.cpp index 4e49486c1..e4ea105af 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.cpp @@ -1,10 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/Header Files/PortableFileIO.h" #include "Minecraft.World/Header Files/compression.h" - #include "ArchiveFile.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/FileInputStream.h" void ArchiveFile::_readHeader(DataInputStream* dis) { int numberOfFiles = dis->readInt(); diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h index 1c74d0d98..1bbd625d3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h @@ -3,10 +3,14 @@ #include #include #include +#include +#include #include "java/File.h" #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" +class DataInputStream; + class ArchiveFile { protected: File m_sourcefile; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 02ee601b4..077436a2a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "IUIScene_AbstractContainerMenu.h" @@ -6,8 +6,8 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu() { m_menu = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp index 6c6d6c63d..9c5bc5108 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "IUIScene_AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "java/InputOutputStream/InputOutputStream.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" IUIScene_AnvilMenu::IUIScene_AnvilMenu() { m_inventory = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.cpp index ba2ad0c8b..142c22ae6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -1,13 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" #include "Minecraft.World/net/minecraft/util/HtmlString.h" #include "IUIScene_BeaconMenu.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" IUIScene_BeaconMenu::IUIScene_BeaconMenu() { m_beacon = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h index 2636b0f2d..51fb5e299 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "IUIScene_AbstractContainerMenu.h" class BeaconTileEntity; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.cpp index 45846ca44..5c43ae5d2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.cpp @@ -1,7 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include "IUIScene_BrewingMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.cpp index 1e776693e..0bd8ce8e8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.cpp @@ -1,8 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "IUIScene_CommandBlockMenu.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" void IUIScene_CommandBlockMenu::Initialise(CommandBlockEntity* commandBlock) { m_commandBlock = commandBlock; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.h index 2143187ab..82bf697c5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +class CommandBlockEntity; + class IUIScene_CommandBlockMenu { public: virtual ~IUIScene_CommandBlockMenu() = default; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.cpp index 71c46d0c6..cffd51b29 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "IUIScene_ContainerMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp index 575ff6f11..c319b335b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "../../../../net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "IUIScene_CraftingMenu.h" Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp index b01ca970c..f454a40c4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "IUIScene_CreativeMenu.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.cpp index 39a46344b..cd5b64baf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include "IUIScene_DispenserMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.cpp index a99e59e89..0cf37cb1b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.cpp @@ -1,8 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "IUIScene_EnchantingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" + +class Player; IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.cpp index efba5efed..87e2028da 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.cpp @@ -1,7 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include "IUIScene_FireworksMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FireworksMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.cpp index e28bbe7a8..80798d4b2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.cpp @@ -1,7 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include "IUIScene_FurnaceMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.cpp index e88f33e09..38dde5bec 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.cpp @@ -1,11 +1,26 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "IUIScene_HUD.h" +#include "4J_Profile.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#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/food/FoodData.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "java/Class.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" IUIScene_HUD::IUIScene_HUD() { m_lastActiveSlot = -1; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h index 2be2fcc2f..897bc6028 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h @@ -1,5 +1,7 @@ #pragma once +#include + class IUIScene_HUD { protected: int m_lastActiveSlot; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.cpp index 9e9ac826a..0e10473e8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "IUIScene_HopperMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HopperMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp index ee5e6d8f5..b7f04e0fc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "IUIScene_HorseInventoryMenu.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection( diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h index ccce39b27..a7d7feb7f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h @@ -1,10 +1,16 @@ #pragma once +#include + #include "IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/Container.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +class Container; +class EntityHorse; +class Inventory; + class IUIScene_HorseInventoryMenu : public virtual IUIScene_AbstractContainerMenu { protected: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.cpp index 47235b8c2..138ccd6aa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.cpp @@ -1,7 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include "IUIScene_InventoryMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp index 8223cb399..a9a92b4fc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -1,18 +1,18 @@ #include #include -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "IUIScene_PauseMenu.h" -#include "../UIScene.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/server/MinecraftServer.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "../../../../net/minecraft/client/ProgressRenderer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "../../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../../net/minecraft/client/skins/TexturePack.h" -#include "../../../../net/minecraft/client/skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" int IUIScene_PauseMenu::ExitGameDialogReturned( diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp index 15fd6ab7c..6add8b167 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "IUIScene_TradingMenu.h" IUIScene_TradingMenu::IUIScene_TradingMenu() { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h index 3f60a3526..a29ba6f97 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h @@ -5,7 +5,7 @@ #include #include "UIEnums.h" -#include "../../../App_Defines.h" +#include "Minecraft.Client/Common/App_Defines.h" #include "4J.Storage/4J_Storage.h" class Container; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.cpp index bf7f1b769..704e8c4cb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.cpp @@ -1,8 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include + #include "UIComponent_Chat.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" UIComponent_Chat::UIComponent_Chat(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h index e1d85e9a9..b6121e44a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h @@ -1,6 +1,15 @@ #pragma once -#include "../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; #define CHAT_LINES_COUNT 10 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.cpp index 7a46a7c03..3882a9d7b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIComponent_DebugUIConsole.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" + +class UILayer; UIComponent_DebugUIConsole::UIComponent_DebugUIConsole(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h index 242fa91e9..3cf70889c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h @@ -1,7 +1,13 @@ #pragma once -#include "../UIScene.h" -#include "../Controls/UIControl_Label.h" +#include +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" + +class UILayer; class UIComponent_DebugUIConsole : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index f1d35e8d0..4b27089c4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIComponent_DebugUIMarketingGuide.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide( int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h index 2e550ec1d..395025639 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -1,7 +1,13 @@ #pragma once -#include "../UIScene.h" -#include "../Controls/UIControl_Label.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class UILayer; class UIComponent_DebugUIMarketingGuide : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.cpp index fcd12fa59..159ad21fb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIComponent_Logo.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" UIComponent_Logo::UIComponent_Logo(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h index cde241f03..669513b2a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h @@ -1,6 +1,11 @@ #pragma once -#include "../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" + +class UILayer; class UIComponent_Logo : public UIScene { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.cpp index 026e3e757..f2ebefa1b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIComponent_MenuBackground.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h index ad3f4df24..6decb0bb4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h @@ -1,6 +1,13 @@ #pragma once -#include "../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIComponent_MenuBackground : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.cpp index 03670ea8f..7467d0360 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.cpp @@ -1,12 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" -#include "UIComponent_Panorama.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include #include +#include "UIComponent_Panorama.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" + UIComponent_Panorama::UIComponent_Panorama(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h index 48f7634c9..7200d88a0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h @@ -1,6 +1,14 @@ #pragma once -#include "../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIComponent_Panorama : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp index 3b153368f..7b77da448 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIComponent_PressStartToPlay.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h index e91da7a41..dcd6c32de 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h @@ -1,6 +1,6 @@ #pragma once -#include "../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIComponent_PressStartToPlay : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.cpp index 22a7807b2..2ce09700f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.cpp @@ -1,6 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIComponent_Tooltips.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h index 6b54ffb26..f35c8f3d8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h @@ -1,6 +1,17 @@ #pragma once -#include "../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIComponent_Tooltips : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp index 377ed5025..8e3b61cb9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIComponent_TutorialPopup.h" -#include "../../Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h index 2477de825..4ca20f77d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h @@ -1,6 +1,6 @@ #pragma once -#include "../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #define TUTORIAL_POPUP_FADE_TIMER_ID 0 #define TUTORIAL_POPUP_MOVE_SCENE_TIMER_ID 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp index 05e55034f..da0f18c03 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_HUD.h" -#include "../../../../net/minecraft/client/renderer/BossMobGuiInfo.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "../../../../net/minecraft/client/renderer/entity/EnderDragonRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h index c1cfd979e..8db8f5f80 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h @@ -1,7 +1,7 @@ #pragma once -#include "../UIScene.h" -#include "../All Platforms/IUIScene_HUD.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h" #define CHAT_LINES_COUNT 10 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.cpp index 95b14b42a..8e84668a5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.cpp @@ -1,8 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/JavaMath.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" UIControl::UIControl() { m_parentScene = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h index a8df8d792..5c6854420 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h @@ -1,5 +1,11 @@ #pragma once +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + // This class for any name object in the flash scene class UIControl { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.cpp index 42f1623be..e5aa59e6c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.cpp @@ -1,8 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include +#include + #include "UIControl.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "java/JavaMath.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIControl_Base::UIControl_Base() { m_bLabelChanged = false; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h index c7d22f9e8..70a709bd6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "UIControl.h" -#include "../UIString.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" // This class maps to the FJ_Base class in actionscript class UIControl_Base : public UIControl { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.cpp index a16532797..6bc76de8e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_BeaconEffectButton.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" UIControl_BeaconEffectButton::UIControl_BeaconEffectButton() { m_data = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h index 5206e2871..911f45714 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_BeaconEffectButton : public UIControl { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.cpp index 449ed4aaf..d5f13b422 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h index da7b7bc1d..a8157c80d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_BitmapIcon : public UIControl { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.cpp index 18b394601..80060a176 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_Button::UIControl_Button() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h index 1c9a4d1ba..aabe71d70 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_Button : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.cpp index 37ede16e0..891689c7f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_ButtonList::UIControl_ButtonList() { m_itemCount = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h index f6666cb82..767bd3666 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_ButtonList : public UIControl_Base { protected: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.cpp index 3b4090bc2..896a91d57 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_CheckBox::UIControl_CheckBox() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h index 87de86bb5..15cce51c4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_CheckBox : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.cpp index dffdb0dea..5379a92bc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_Cursor.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" UIControl_Cursor::UIControl_Cursor() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h index 744c8bcc3..293b440a7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_Cursor : public UIControl_Base { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.cpp index 9f8064a11..7c617338b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_DLCList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h index 3c9004ddc..f9d834469 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl_ButtonList.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_DLCList : public UIControl_ButtonList { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.cpp index 9c9cb1cb7..5554c346a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_DynamicLabel::UIControl_DynamicLabel() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h index 7fdf1afdd..c6099a316 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h @@ -1,6 +1,12 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UIControl_DynamicLabel : public UIControl_Label { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.cpp index 396252530..ca1d280b8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.cpp @@ -1,13 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include +#include + #include "UIControl_EnchantmentBook.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" -#include "../../../../net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h" -#include "../../../../net/minecraft/client/Lighting.h" -#include "../../../../net/minecraft/client/model/BookModel.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/model/BookModel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "java/Class.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" UIControl_EnchantmentBook::UIControl_EnchantmentBook() { UIControl::setControlType(UIControl::eEnchantmentBook); diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h index 9df260f15..b9664867c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h @@ -1,9 +1,15 @@ #pragma once +#include + #include "UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "java/Random.h" class UIScene_EnchantingMenu; class BookModel; +class ItemInstance; class UIControl_EnchantmentBook : public UIControl { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.cpp index 6ee1900a7..11f33f934 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.cpp @@ -1,14 +1,24 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include #include -#include "../UI.h" -#include "UIControl_EnchantmentButton.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include +#include -#include +#include "UIControl_EnchantmentButton.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" UIControl_EnchantmentButton::UIControl_EnchantmentButton() { m_index = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h index 5005ba71f..9a1da92c3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "UIControl_Button.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "java/Random.h" class UIControl_EnchantmentButton : public UIControl_Button { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.cpp index 2f7a2d387..cf9d9bc04 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" UIControl_HTMLLabel::UIControl_HTMLLabel() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h index 1d5de82d4..30df43f80 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h @@ -1,6 +1,12 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UIControl_HTMLLabel : public UIControl_Label { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.cpp index 0e57e76c4..26c880510 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_Label.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" UIControl_Label::UIControl_Label() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h index 89230a759..a19ceb4e7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UIControl_Label : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.cpp index 0da7be971..5fb497de9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_LeaderboardList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_LeaderboardList::UIControl_LeaderboardList() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h index b7e4483ef..c43af4d32 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_LeaderboardList : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.cpp index 7c3ab4037..95ae5fa8c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.cpp @@ -1,26 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../net/minecraft/client/Minecraft.h" +#include +#include +#include -#include "../../../../net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "../../../../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" - -#include "../../../../net/minecraft/client/renderer/entity/PlayerRenderer.h" -#include "../../../../net/minecraft/client/renderer/entity/HorseRenderer.h" - -#include "../../../../net/minecraft/client/model/HumanoidModel.h" -#include "../../../../net/minecraft/client/model/ModelHorse.h" - -#include "../../../../net/minecraft/client/Lighting.h" -#include "../../../../net/minecraft/client/model/geom/ModelPart.h" -#include "../../../../net/minecraft/client/Options.h" - -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" // #include // "../../../Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" - -#include "../UI.h" #include "UIControl_MinecraftHorse.h" UIControl_MinecraftHorse::UIControl_MinecraftHorse() { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h index 32ef7780c..6659a1ad5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h @@ -1,6 +1,7 @@ #pragma once #include "UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UIControl_MinecraftHorse : public UIControl { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.cpp index 5b4a80115..837f01304 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -1,16 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "../../../../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "../../../../net/minecraft/client/renderer/entity/PlayerRenderer.h" -#include "../../../../net/minecraft/client/model/HumanoidModel.h" -#include "../../../../net/minecraft/client/Lighting.h" -#include "../../../../net/minecraft/client/model/geom/ModelPart.h" -#include "../../../../net/minecraft/client/Options.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../UI.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "UIControl_MinecraftPlayer.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" UIControl_MinecraftPlayer::UIControl_MinecraftPlayer() { UIControl::setControlType(UIControl::eMinecraftPlayer); diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h index 1c323bb3b..f7e9dbc33 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h @@ -1,6 +1,7 @@ #pragma once #include "UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UIControl_MinecraftPlayer : public UIControl { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.cpp index c6bb323c9..cee7ebf1e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_PlayerList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h index b76d78a08..2aa155a4a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl_ButtonList.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_PlayerList : public UIControl_ButtonList { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.cpp index bd9c3c989..baaab511a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -1,14 +1,25 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "../../../../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "../../../../net/minecraft/client/renderer/entity/PlayerRenderer.h" -#include "../../../../net/minecraft/client/model/HumanoidModel.h" -#include "../../../../net/minecraft/client/Lighting.h" -#include "../../../../net/minecraft/client/model/geom/ModelPart.h" -#include "../../../../net/minecraft/client/Options.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "UIControl_PlayerSkinPreview.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "java/Class.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" // #define SKIN_PREVIEW_BOB_ANIM #define SKIN_PREVIEW_WALKING_ANIM diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h index 050e7836b..df84d91d6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h @@ -1,9 +1,12 @@ #pragma once #include +#include +#include #include "UIControl.h" -#include "../../../../net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class ModelPart; class EntityRenderer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.cpp index 3ffe7865f..72726c2df 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_Progress.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_Progress::UIControl_Progress() { m_min = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h index 14baa44ac..6d3514067 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_Progress : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.cpp index a76efdced..268f85abc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_SaveList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h index 0b94a3588..7a22f7d83 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl_ButtonList.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_SaveList : public UIControl_ButtonList { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.cpp index f4873e7c4..b1056ecba 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.cpp @@ -1,6 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_Slider.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/Header Files/SoundTypes.h" UIControl_Slider::UIControl_Slider() { m_id = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h index 6bbc9f8d6..4e6f5bdb1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h @@ -1,6 +1,13 @@ #pragma once +#include +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_Slider : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.cpp index dd303deb2..df11cc334 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" UIControl_SlotList::UIControl_SlotList() { m_lastHighlighted = -1; } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h index b882e0b5d..6e54361f8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_SlotList : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.cpp index 7cbde1f93..eb4565d15 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_SpaceIndicatorBar.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() { m_min = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h index f65c53c5e..708612d20 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h @@ -1,6 +1,15 @@ #pragma once +#include +#include +#include +#include +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_SpaceIndicatorBar : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.cpp index 0aab6d683..54e312339 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_TextInput.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" UIControl_TextInput::UIControl_TextInput() { m_bHasFocus = false; } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h index b8bc7a1bb..e866c121c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UIControl_TextInput : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.cpp index b06a268cb..ad22130c9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_TexturePackList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIControl_TexturePackList::UIControl_TexturePackList() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h index 75f1aff5a..d424b0555 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_TexturePackList : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.cpp index 05b17f3e0..a9cac3afa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIControl_Touch.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" UIControl_Touch::UIControl_Touch() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.h index dd1670da4..5c7491a34 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "UIControl_Base.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIControl_Touch : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 027821d02..5dc04d0d0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -1,11 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" + +class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "../../UI.h" #include "UIScene_DebugCreateSchematic.h" -#include "../../../../../net/minecraft/client/Minecraft.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h index a567bc77c..4ac89e5a3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h @@ -1,7 +1,17 @@ #pragma once #ifdef _DEBUG_MENUS_ENABLED -#include "../../UIScene.h" -#include "../../../GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_DebugCreateSchematic : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp index bdec705e2..f53086a23 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,6 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" #include "UIScene_DebugOptions.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Linux_App.h" + +class UILayer; const wchar_t* UIScene_DebugOptionsMenu::m_DebugCheckboxTextA[eDebugSetting_Max + 1] = { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h index 69f77b7ee..21a773d8b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h @@ -1,7 +1,13 @@ #pragma once -#include "../../UIScene.h" -#include "../../Controls/UIControl_CheckBox.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" + +class UILayer; class UIScene_DebugOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index e2c7e28e8..b4a929ad5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -1,20 +1,36 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/TimeCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" + +class Player; +class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "../../UI.h" #include "UIScene_DebugOverlay.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/server/MinecraftServer.h" -#include "../../../../../net/minecraft/client/renderer/GameRenderer.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "../../../../../net/minecraft/client/multiplayer/ClientConnection.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/commands/common/net.minecraft.commands.common.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h index 6a4de2247..4db11a9a6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -1,7 +1,20 @@ #pragma once #ifdef _DEBUG_MENUS_ENABLED -#include "../../UIScene.h" -#include "../../Controls/UIControl_ButtonList.h" +#include +#include +#include +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "java/Class.h" + +class UILayer; class UIScene_DebugOverlay : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index febd48923..62a2a38d5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -1,10 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + +class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "../../UI.h" #include "UIScene_DebugSetCamera.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h index 02e6318b9..95b22a6fe 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h @@ -1,6 +1,17 @@ #pragma once #ifdef _DEBUG_MENUS_ENABLED -#include "../../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_DebugSetCamera : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 3d3c3a430..83ea5a357 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -1,9 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" -#include "../../../../../net/minecraft/client/skins/TexturePack.h" -#include "../../../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../../../net/minecraft/client/Minecraft.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "IUIScene_StartGame.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_structs.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" + +class UILayer; IUIScene_StartGame::IUIScene_StartGame(int iPad, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h index a68867da1..20efa912f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h @@ -1,6 +1,17 @@ #pragma once -#include "../../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; // Shared functions between CreteWorld, Load and Join class IUIScene_StartGame : public UIScene { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index a8c6d650f..db4542d23 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -1,16 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_CreateWorldMenu.h" -#include "../../../../../net/minecraft/server/MinecraftServer.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/Options.h" -#include "../../../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../../../net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" #include "Minecraft.World/net/minecraft/world/level/LevelType.h" -#include "../../../../../net/minecraft/client/skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #if defined(_WINDOWS64) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 91b5f1926..82f5bd741 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_DLCMainMenu.h" #define PLAYER_ONLINE_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index 6a0890c42..68c024c77 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_DLCMainMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index 6bcbca366..c787e1fc8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_DLCOffersMenu.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index fa820558a..e95095a77 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_DLCOffersMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index 42d2110d9..aaaae244d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_EULA.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index db3760cd8..69aaa4465 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_EULA : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index d1de33b93..f4eaaceea 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" #include "UIScene_Intro.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" + +class UILayer; #if !defined(_ENABLEIGGY) static int s_introTickCount = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index 79c40cc46..bcbfc069f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -1,6 +1,12 @@ #pragma once -#include "../../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class UILayer; class UIScene_Intro : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 485c615cd..4c681cad6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_JoinMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../../../net/minecraft/client/Options.h" -#include "../../../../../net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index 85cc12898..4b0398b6b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_JoinMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index a58217cbf..2130b4d05 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_LaunchMoreOptionsMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index 3cc441602..61f85798d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_LaunchMoreOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 803296b5b..40c7f8cad 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LeaderboardsMenu.h" -#include "../../../Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index 8ce0b84ab..6da07aded 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -1,7 +1,7 @@ #pragma once -#include "../../UIScene.h" -#include "../../../Leaderboards/LeaderboardInterface.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h" class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 9043dbaf3..00e309ee3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LoadMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../../../net/minecraft/client/Options.h" -#include "../../../../../net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../../../../../net/minecraft/client/skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 86ff2e07d..e77ab9191 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -1,8 +1,8 @@ #include #include -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LoadOrJoinMenu.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" @@ -13,11 +13,11 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #include "Minecraft.World/Header Files/PortableFileIO.h" -#include "../../../../../net/minecraft/client/ProgressRenderer.h" -#include "../../../../../net/minecraft/server/MinecraftServer.h" -#include "../../../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../../../net/minecraft/client/skins/TexturePack.h" -#include "../../../Network/SessionInfo.h" +#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/Common/Source Files/Network/SessionInfo.h" #if defined(SONY_REMOTE_STORAGE_DOWNLOAD) unsigned long UIScene_LoadOrJoinMenu::m_ulFileSize = 0L; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 3dd391902..0c7b41409 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class LevelGenerationOptions; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 7deebae6f..be6cf0286 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/Random.h" -#include "../../../../../net/minecraft/client/User.h" -#include "../../../../../net/minecraft/server/MinecraftServer.h" -#include "../../UI.h" +#include "Minecraft.Client/net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_MainMenu.h" Random* UIScene_MainMenu::random = new Random(); diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index bea3971e2..775ee3272 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_MainMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 4ce87d10b..907c503bf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_NewUpdateMessage.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index bf9c13f19..fa0aa0b21 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_NewUpdateMessage : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 35262a35c..a93717e38 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SaveMessage.h" #define PROFILE_LOADED_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index 8bf09f2d9..b30a7c11b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_SaveMessage : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index e424393e5..ece1302a6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_TrialExitUpsell.h" UIScene_TrialExitUpsell::UIScene_TrialExitUpsell(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h index 45adf15dd..3bf85c6f7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_TrialExitUpsell : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 2e5ae9f5b..3ba779ab0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_ControlsMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index b89383bd9..d4963533f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_ControlsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp index da0bd84ec..21a64746d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_Credits.h" #define CREDIT_ICON -2 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h index decb00435..e606674de 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #define PS3_CREDITS_COUNT 80 #define PSVITA_CREDITS_COUNT 82 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 63dab3cfe..dde2f4675 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_HelpAndOptionsMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index 394293a1e..54f0a5052 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #define BUTTON_HAO_CHANGESKIN 0 #define BUTTON_HAO_HOWTOPLAY 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 176497439..eb92a5cd7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_HowToPlay.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h index 5fa44c9c9..fd0f272f4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_HowToPlay : public UIScene { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index c9b0b0fb0..3a40359d4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_HowToPlayMenu.h" // strings for buttons in the list diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index 79d63f959..4d5318516 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_HowToPlayMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index c662db663..23c0491f6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LanguageSelector.h" // strings for buttons in the list diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index bba6e21a7..1347c06a6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #define HAS_LANGUAGE_SYSTEM(exp) exp, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index ca0d5cd08..785c4900e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_ReinstallMenu.h" UIScene_ReinstallMenu::UIScene_ReinstallMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index 0aba528b7..8488e85ab 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_ReinstallMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index e721c0632..f831ca339 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsAudioMenu.h" UIScene_SettingsAudioMenu::UIScene_SettingsAudioMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index 0e9e01ad3..3cb29a3a6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_SettingsAudioMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 023d3f041..41ba51638 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsControlMenu.h" UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index b07793d40..d75b00d14 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_SettingsControlMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index b04bf63d9..bab27235f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsGraphicsMenu.h" UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index 858e0242e..9b8eab08e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_SettingsGraphicsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 8ddd13b24..937fa6bdc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index 050b5bf41..1781e60f8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #define BUTTON_ALL_OPTIONS 0 #define BUTTON_ALL_AUDIO 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 864d79042..783d50207 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsOptionsMenu.h" int UIScene_SettingsOptionsMenu::m_iDifficultySettingA[4] = { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index 0a9eed586..a1a45f942 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_SettingsOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 0dcdcaf90..645cf56dc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsUIMenu.h" UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index 5f883615d..6dc30e35b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_SettingsUIMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 20562c733..4872c62df 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SkinSelectMenu.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index d6e3d4d10..854ef5d45 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -2,8 +2,8 @@ #include #include "Minecraft.World/ConsoleHelpers/Definitions.h" -#include "../../UIScene.h" -#include "../../Controls/UIControl_PlayerSkinPreview.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h" class UIScene_SkinSelectMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index f2134a480..6eb8b21eb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "../../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu( int iPad, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index 54fe6ecb3..f04da2b6b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -1,7 +1,7 @@ #pragma once -#include "../../../UIScene.h" -#include "../../../All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" class AbstractContainerMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index d89a92d7b..78e4322ce 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_AnvilMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index d6e6a773c..bd243cd96 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_AnvilMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index b208387cd..bd1a73a8d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_BeaconMenu.h" UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index bf7ce62f6..712d866a1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -1,8 +1,8 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "../../../Controls/UIControl_SlotList.h" -#include "../../../All Platforms/IUIScene_BeaconMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h" class UIScene_BeaconMenu : public UIScene_AbstractContainerMenu, public IUIScene_BeaconMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index 6cd2330be..fb6e252ed 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -1,10 +1,20 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_BrewingStandMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" + +class UILayer; UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h index ec81f464b..a9b4a2f31 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h @@ -1,9 +1,21 @@ #pragma once +#include +#include + #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_BrewingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class InventoryMenu; +class BrewingStandTileEntity; +class UILayer; class UIScene_BrewingStandMenu : public UIScene_AbstractContainerMenu, public IUIScene_BrewingMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index 878e7375f..203a84865 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -1,15 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" -#include "UIScene_ContainerMenu.h" +#include +#include -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "../../../../../../net/minecraft/client/player/LocalPlayer.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../Tutorial/Tutorial.h" -#include "../../../../Tutorial/TutorialMode.h" -#include "../../../../Tutorial/TutorialEnum.h" +#include "UIScene_ContainerMenu.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h" + +class UILayer; UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h index 08895cdfd..d00874cb8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h @@ -1,9 +1,18 @@ #pragma once +#include + #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_ContainerMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class InventoryMenu; +class UILayer; class UIScene_ContainerMenu : public UIScene_AbstractContainerMenu, public IUIScene_ContainerMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index d680cd10e..166f5ec2f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -1,13 +1,23 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" -#include "UIScene_CreativeMenu.h" +#include +#include -#include "java/JavaMath.h" -#include "../../../../../../net/minecraft/client/player/LocalPlayer.h" -#include "../../../../Tutorial/Tutorial.h" -#include "../../../../Tutorial/TutorialMode.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "UIScene_CreativeMenu.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#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/net/minecraft/client/Minecraft.h" + +class UILayer; UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index 4baaabc76..3322e7db8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -1,7 +1,18 @@ #pragma once +#include + #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class UILayer; class UIScene_CreativeMenu : public UIScene_AbstractContainerMenu, public IUIScene_CreativeMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 0123205f8..700607426 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -1,9 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_DispenserMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/inventory/TrapMenu.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" + +class UILayer; UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h index a64ac3f78..48c81e5c0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h @@ -1,9 +1,18 @@ #pragma once +#include + #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_DispenserMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class InventoryMenu; +class UILayer; class UIScene_DispenserMenu : public UIScene_AbstractContainerMenu, public IUIScene_DispenserMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index 5e0951300..f44f9f511 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_EnchantingMenu.h" UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h index 656104bd9..e5e0dc012 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_EnchantingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index d3a8d3765..d59ab3b25 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../../net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "UIScene_FireworksMenu.h" UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index 8342a6590..19f92775d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_FireworksMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 12d04720a..6c0266a64 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_FurnaceMenu.h" UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h index 8c371a24c..c15dd6fc3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_FurnaceMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index eb014803f..976ed6e77 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -1,9 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_HopperMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h" + +class UILayer; UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h index e26d76071..1674be3d2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h @@ -1,9 +1,18 @@ #pragma once +#include + #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_HopperMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class InventoryMenu; +class UILayer; class UIScene_HopperMenu : public UIScene_AbstractContainerMenu, public IUIScene_HopperMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index d7f3fdb8f..7cdd4d083 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -1,10 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "../../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_HorseInventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h" + +class UILayer; UIScene_HorseInventoryMenu::UIScene_HorseInventoryMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h index c0d87d22c..5fc2b1146 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h @@ -1,9 +1,20 @@ #pragma once +#include + #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_HorseInventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class InventoryMenu; +class UILayer; class UIScene_HorseInventoryMenu : public UIScene_AbstractContainerMenu, public IUIScene_HorseInventoryMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index fd87d0f38..b76faf0bd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -1,19 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InventoryMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "../../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../../net/minecraft/client/Options.h" -#include "../../../../../../net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "../../../../../../net/minecraft/client/Lighting.h" -#include "../../../../Tutorial/Tutorial.h" -#include "../../../../Tutorial/TutorialMode.h" -#include "../../../../Tutorial/TutorialEnum.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index 7a36e9a86..20f00731e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "../../../All Platforms/IUIScene_InventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.h" #include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 81587bc92..5dca3dd2b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/net/minecraft/util/HtmlString.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_TradingMenu.h" UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index c6f37a777..922518168 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -1,6 +1,9 @@ #pragma once -#include "../../../All Platforms/IUIScene_TradingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" + +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 6ba6d0260..566faf283 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "UIScene_CraftingMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index 5f47bdfbd..800289735 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -1,9 +1,9 @@ #pragma once -#include "../../UIScene.h" -#include "../../Controls/UIControl_SlotList.h" -#include "../../Controls/UIControl_Label.h" -#include "../../All Platforms/IUIScene_CraftingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h" #define CRAFTING_INVENTORY_SLOT_START 0 #define CRAFTING_INVENTORY_SLOT_END (CRAFTING_INVENTORY_SLOT_START + 27) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 59ca9bba9..b46d7006b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_DeathMenu.h" -#include "../../All Platforms/IUIScene_PauseMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index 5f50ce989..36602533b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_DeathMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 0c017041b..01fb2b550 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_EndPoem.h" -#include "../../UIBitmapFont.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index 249342420..516e417df 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_EndPoem : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 31da9d2b8..63d5cba8b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGameHostOptionsMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 9556c43f2..94af9b940 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_InGameHostOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 247f7bfa4..0f4cfeef6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGameInfoMenu.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index ab25fbafd..0869b25c3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -2,7 +2,7 @@ #include -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_InGameInfoMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 04c0e8bbb..2831e4f60 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGamePlayerOptionsMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" #define CHECKBOXES_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index 2c1a0a49e..6050306f0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -2,7 +2,7 @@ #include -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_InGamePlayerOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp index 29f460abc..884ae312d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGameSaveManagementMenu.h" namespace { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h index f41d824ae..1cdf4296d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h @@ -2,7 +2,7 @@ #include -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_InGameSaveManagementMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 3fccd13b2..ee26318da 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_PauseMenu.h" -#include "../../../../../net/minecraft/server/MinecraftServer.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../../../net/minecraft/client/skins/TexturePack.h" -#include "../../../../../net/minecraft/client/skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index 8a8b627ff..a17065dd2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -1,7 +1,7 @@ #pragma once -#include "../../UIScene.h" -#include "../../All Platforms/IUIScene_PauseMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h" #define BUTTON_PAUSE_RESUMEGAME 0 #define BUTTON_PAUSE_HELPANDOPTIONS 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 615b8c56f..311a1766b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_SignEntryMenu.h" -#include "../../../../../net/minecraft/client/Minecraft.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "../../../../../net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index 3635e762b..ec5dc0134 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class SignTileEntity; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 543fb7311..6fbb7ccdd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_TeleportMenu.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "../../../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../../../net/minecraft/client/multiplayer/ClientConnection.h" -#include "../../../../../net/minecraft/server/commands/TeleportCommand.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h" UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index da2e87a78..903852f79 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -2,7 +2,7 @@ #include -#include "../../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_TeleportMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp index 28eb88f37..61e64bce6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_ConnectingProgress.h" -#include "../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void* _initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h index b790ef39c..70dee981b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h @@ -1,6 +1,6 @@ #pragma once -#include "../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_ConnectingProgress : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp index 6ab98d614..1ba88c095 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_FullscreenProgress.h" -#include "../../../../net/minecraft/client/Minecraft.h" -#include "../../../../net/minecraft/client/ProgressRenderer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h index 478a4374b..f84234d62 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h @@ -1,6 +1,6 @@ #pragma once -#include "../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_FullscreenProgress : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp index 6e973c072..e9ee306d3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_Keyboard.h" #define KEYBOARD_DONE_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h index 12bc5adbb..420b033fd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h @@ -1,6 +1,6 @@ #pragma once -#include "../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_Keyboard : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp index 83a94589e..e9e11539d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_MessageBox.h" UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h index 981133aad..fc5ed8b64 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h @@ -1,6 +1,6 @@ #pragma once -#include "../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_MessageBox : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp index 9442b3ef0..528114de9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_QuadrantSignin.h" -#include "../../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h index d4d6609c4..277e6a306 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h @@ -2,7 +2,7 @@ #include -#include "../UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_QuadrantSignin : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.cpp index 46e612c42..47808f544 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../UI.h" #include "UIScene_Timer.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h" +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" + +class UILayer; UIScene_Timer::UIScene_Timer(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h index f6a807b02..a5e83d9cb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h @@ -1,6 +1,12 @@ #pragma once -#include "../UIScene.h" +#include + +#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" + +class UILayer; class UIScene_Timer : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UI.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UI.h index da18cf8eb..451abfea8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UI.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UI.h @@ -1,7 +1,7 @@ #pragma once -#include "All Platforms/UIEnums.h" -#include "All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" #include "UIBitmapFont.h" #include "UITTFFont.h" @@ -11,109 +11,109 @@ #include "UIGroup.h" #include "UIController.h" -#include "Controls/UIControl.h" -#include "Controls/UIControl_Base.h" -#include "Controls/UIControl_Button.h" -#include "Controls/UIControl_CheckBox.h" -#include "Controls/UIControl_Slider.h" -#include "Controls/UIControl_Label.h" -#include "Controls/UIControl_TextInput.h" -#include "Controls/UIControl_SlotList.h" -#include "Controls/UIControl_Cursor.h" -#include "Controls/UIControl_ButtonList.h" -#include "Controls/UIControl_Progress.h" -#include "Controls/UIControl_TexturePackList.h" -#include "Controls/UIControl_LeaderboardList.h" -#include "Controls/UIControl_SaveList.h" -#include "Controls/UIControl_PlayerList.h" -#include "Controls/UIControl_BitmapIcon.h" -#include "Controls/UIControl_DLCList.h" -#include "Controls/UIControl_HTMLLabel.h" -#include "Controls/UIControl_DynamicLabel.h" -#include "Controls/UIControl_MinecraftPlayer.h" -#include "Controls/UIControl_MinecraftHorse.h" -#include "Controls/UIControl_PlayerSkinPreview.h" -#include "Controls/UIControl_EnchantmentButton.h" -#include "Controls/UIControl_EnchantmentBook.h" -#include "Controls/UIControl_SpaceIndicatorBar.h" -#include "Controls/UIControl_BeaconEffectButton.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h" -#include "Components/UIScene_HUD.h" -#include "Components/UIComponent_Panorama.h" -#include "Components/UIComponent_Logo.h" -#include "Components/UIComponent_Tooltips.h" -#include "Components/UIComponent_TutorialPopup.h" -#include "Components/UIComponent_Chat.h" -#include "Components/UIComponent_PressStartToPlay.h" -#include "Components/UIComponent_MenuBackground.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h" -#include "Scenes/UIScene_QuadrantSignin.h" -#include "Scenes/UIScene_MessageBox.h" -#include "Scenes/UIScene_Timer.h" -#include "Scenes/UIScene_Keyboard.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h" -#include "Scenes/Debug/UIScene_DebugOverlay.h" -#include "Scenes/Debug/UIScene_DebugOptions.h" -#include "Components/UIComponent_DebugUIConsole.h" -#include "Components/UIComponent_DebugUIMarketingGuide.h" -#include "Scenes/Debug/UIScene_DebugSetCamera.h" -#include "Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" -#include "Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" -#include "Scenes/Frontend Menu screens/UIScene_Intro.h" -#include "Scenes/Frontend Menu screens/UIScene_SaveMessage.h" -#include "Scenes/Frontend Menu screens/UIScene_MainMenu.h" -#include "Scenes/Frontend Menu screens/UIScene_LoadMenu.h" -#include "Scenes/Frontend Menu screens/UIScene_JoinMenu.h" -#include "Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" -#include "Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" -#include "Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" -#include "Scenes/UIScene_FullscreenProgress.h" -#include "Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" -#include "Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" -#include "Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" -#include "Scenes/Help & Options/UIScene_ReinstallMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" -#include "Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" -#include "Scenes/Help & Options/UIScene_SettingsMenu.h" -#include "Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" -#include "Scenes/Help & Options/UIScene_SettingsAudioMenu.h" -#include "Scenes/Help & Options/UIScene_SettingsControlMenu.h" -#include "Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" -#include "Scenes/Help & Options/UIScene_SettingsUIMenu.h" -#include "Scenes/Help & Options/UIScene_SkinSelectMenu.h" -#include "Scenes/Help & Options/UIScene_HowToPlayMenu.h" -#include "Scenes/Help & Options/UIScene_LanguageSelector.h" -#include "Scenes/Help & Options/UIScene_HowToPlay.h" -#include "Scenes/Help & Options/UIScene_ControlsMenu.h" -#include "Scenes/Help & Options/UIScene_Credits.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h" -#include "Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" -#include "Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" -#include "Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" -#include "Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" -#include "Scenes/UIScene_ConnectingProgress.h" -#include "Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" -#include "Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" -#include "Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" -#include "Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" -#include "Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" -#include "Scenes/In-Game Menu Screens/UIScene_EndPoem.h" -#include "Scenes/Frontend Menu screens/UIScene_EULA.h" -#include "Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" \ No newline at end of file +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" \ No newline at end of file diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.cpp index 7d8bf94e7..1c7d78748 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.cpp @@ -1,10 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" - -#include "../../../Header Files/BufferedImage.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" #include "UIFontData.h" - -#include - #include "UIBitmapFont.h" ///////////////////////////// diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h index ce6ef481b..f3ed573fe 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h @@ -1,5 +1,10 @@ #pragma once +#include + +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + struct SFontData; class CFontData; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp index de714dfe0..0df961ad2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp @@ -4,14 +4,14 @@ #include "UI.h" #include "UIScene.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../../../net/minecraft/client/player/LocalPlayer.h" -#include "../../../net/minecraft/client/skins/DLCTexturePack.h" -#include "../../../net/minecraft/client/skins/TexturePackRepository.h" -#include "../../../net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "../../../net/minecraft/client/renderer/entity/EnderDragonRenderer.h" -#include "../../../net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "../../../net/minecraft/client/title/TitleScreen.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" #include "UIFontData.h" // 4J Stu - Enable this to override the Iggy Allocator @@ -20,7 +20,7 @@ // #define ENABLE_IGGY_EXPLORER #if defined(ENABLE_IGGY_EXPLORER) -#include "../../../Windows64/Iggy/include/iggyexpruntime.h" +#include "Minecraft.Client/Windows64/Iggy/include/iggyexpruntime.h" #endif // #define ENABLE_IGGY_PERFMON @@ -30,7 +30,7 @@ #define PM_ORIGIN_Y 34 #if defined(__WINDOWS64) -#include "../../../Windows64/Iggy/include/iggyperfmon.h" +#include "Minecraft.Client/Windows64/Iggy/include/iggyperfmon.h" #endif #endif @@ -314,15 +314,15 @@ UITTFFont* UIController::createFont(EFont fontLanguage) { switch (fontLanguage) { case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", - "Common/Media/font/JPN/DFGMaruGothic-Md.ttf", + "Minecraft.Client/Common/Media/font/JPN/DFGMaruGothic-Md.ttf", 0x2022); // JPN case eFont_TradChinese: return new UITTFFont("Mojangles_TTF_cnTD", - "Common/Media/font/CHT/DFHeiMedium-B5.ttf", + "Minecraft.Client/Common/Media/font/CHT/DFHeiMedium-B5.ttf", 0x2022); // CHT case eFont_Korean: return new UITTFFont("Mojangles_TTF_koKR", - "Common/Media/font/KOR/BOKMSD.ttf", + "Minecraft.Client/Common/Media/font/KOR/BOKMSD.ttf", 0x2022); // KOR // 4J-JEV, Cyrillic characters have been added to this font now, // (4/July/14) XC_LANGUAGE_RUSSIAN and XC_LANGUAGE_GREEK: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h index 5186ecc1a..1f58c5ec4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h @@ -3,8 +3,8 @@ #include #include -#include "All Platforms/IUIController.h" -#include "All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" #include "UIGroup.h" class UIAbstractBitmapFont; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.cpp index aaefcc976..2ce0799f7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.cpp @@ -1,5 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "UIFontData.h" +#include "Minecraft.Client/Linux/Linux_App.h" ///////////////////////////////////////////////////// // --- -- --- THIS FILE IS IN UNICODE --- -- --- // diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.h index bafd72400..1e9481a86 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.h @@ -1,6 +1,7 @@ #pragma once #include +#include // using namespace std; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.cpp index 01e06c30d..b9f087116 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.cpp @@ -1,5 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "UIGroup.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" + +class UIScene; UIGroup::UIGroup(EUIGroup group, int iPad) { m_group = group; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.h index 2bf4046e7..c5ce1f7f3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.h @@ -1,11 +1,17 @@ #pragma once +#include + #include "UILayer.h" -#include "All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UIComponent_Tooltips; class UIComponent_TutorialPopup; class UIScene_HUD; class UIComponent_PressStartToPlay; +class UILayer; +class UIScene; // A group contains a collection of layers for a specific context (e.g. each // player has 1 group) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp index 939e387b0..45fb04144 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp @@ -1,7 +1,82 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "UI.h" +#include + #include "UILayer.h" #include "UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h" +#include "Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h" +#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" UILayer::UILayer(UIGroup* parent) { m_parentGroup = parent; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.h index fb34c1b3c..795e0bfa2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.h @@ -1,5 +1,14 @@ #pragma once -#include "All Platforms/UIEnums.h" +#include +#include +#include +#include +#include + +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + // using namespace std; class UIScene; class UIGroup; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp index 0f282b16b..fd40fd24b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp @@ -1,12 +1,31 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include -#include "UI.h" -#include "UIScene.h" +#include +#include -#include "../../../net/minecraft/client/Lighting.h" -#include "../../../net/minecraft/client/player/LocalPlayer.h" -#include "../../../net/minecraft/client/renderer/entity/ItemRenderer.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "UIScene.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/UIController.h" +#include "Minecraft.Client/Common/Source Files/UI/UIGroup.h" +#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#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 "java/System.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" + +class MultiplayerLocalPlayer; UIScene::UIScene(int iPad, UILayer* parentLayer) { m_parentLayer = parentLayer; @@ -718,11 +737,6 @@ void UIScene::navigateBack() { ui.NavigateBack(m_iPad); if (m_parentLayer == nullptr) { -// app.DebugPrintf("A scene is trying to navigate back, but it's -// parent layer is nullptr!\n"); -#if !defined(_CONTENT_PACKAGE) -// __debugbreak(); -#endif } else { // m_parentLayer->removeScene(this); } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h index 0314f9bcf..c69db8f10 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h @@ -5,13 +5,48 @@ // A scene map directly to an Iggy movie (or more accurately a collection of // different sized movies) +#include #include +#include +#include +#include +#include -#include "All Platforms/UIEnums.h" -#include "Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class ItemRenderer; class UILayer; +class ItemInstance; +class UIControl; // 4J Stu - Setup some defines for quickly mapping elements in the scene diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp index a47685fd7..575f33cde 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp @@ -1,8 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" - #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" - #include "UIString.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/x64headers/extraX64.h" bool UIString::setCurrentLanguage() { int nextLanguage, nextLocale; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.h index 4b6d4289d..826780360 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.h @@ -2,6 +2,8 @@ #include #include +#include +#include typedef std::function StringBuilder; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.cpp index 2d59d2dc3..08c803b7e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "UI.h" +#include +#include + #include "Minecraft.World/Header Files/PortableFileIO.h" #include "UITTFFont.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" UITTFFont::UITTFFont(const std::string& name, const std::string& path, S32 fallbackCharacter) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.h index 72c3665b5..9fcf60531 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.h @@ -1,5 +1,10 @@ #pragma once +#include +#include + +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + class UITTFFont { private: std::uint8_t* pbData; diff --git a/minecraft/Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h b/minecraft/Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h index 6a06aaaad..a2e2fb53e 100644 --- a/minecraft/Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h +++ b/minecraft/Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h @@ -1,5 +1,5 @@ #pragma once -#include "MemTextureProcessor.h" +#include "Minecraft.Client/Header Files/MemTextureProcessor.h" class MobSkinMemTextureProcessor : public MemTextureProcessor { private: diff --git a/minecraft/Minecraft.Client/Header Files/stdafx.h b/minecraft/Minecraft.Client/Header Files/stdafx.h index b6cd0817f..e7873799f 100644 --- a/minecraft/Minecraft.Client/Header Files/stdafx.h +++ b/minecraft/Minecraft.Client/Header Files/stdafx.h @@ -21,7 +21,7 @@ #include #ifdef __linux__ -#include "../Linux/Stubs/LinuxStubs.h" +#include "Minecraft.Client/Linux/Stubs/LinuxStubs.h" #endif #ifdef _WINDOWS64 @@ -68,64 +68,64 @@ using namespace DirectX; #else #include "4J_Input.h" #include "4J_Profile.h" -#include "4J_Render.h" +#include "4J.Render/4J_Render.h" #include "4J_Storage.h" #endif -#include "../net/minecraft/client/renderer/Textures.h" -#include "../net/minecraft/client/gui/Font.h" -#include "../net/minecraft/client/ClientConstants.h" -#include "../net/minecraft/client/gui/Gui.h" -#include "../net/minecraft/client/gui/Screen.h" -#include "../net/minecraft/client/gui/ScreenSizeCalculator.h" -#include "../net/minecraft/client/Minecraft.h" -#include "../net/minecraft/client/MemoryTracker.h" -#include "stubs.h" -#include "BufferedImage.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" -#include "../Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "../Common/Source Files/UI/All Platforms/UIEnums.h" -#include "../Common/Source Files/UI/All Platforms/UIStructs.h" -#include "../Common/App_Defines.h" -#include "../Common/App_enums.h" -#include "../Common/Source Files/Tutorial/TutorialEnum.h" -#include "../Common/App_structs.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/App_Defines.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/App_structs.h" -#include "../Common/Consoles_App.h" -#include "../Common/Minecraft_Macros.h" -#include "../Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" // This is generated at build time via scripts/pack_loc.py #include "strings.h" #ifdef _WINDOWS64 -#include "../Windows64/Windows64_App.h" -#include "../Windows64/XML/ATGXmlParser.h" -#include "../Common/Source Files/Audio/SoundEngine.h" -#include "../Windows64/Iggy/include/iggy.h" -#include "../Windows64/Iggy/gdraw/gdraw_d3d11.h" -#include "../Windows64/Windows64_UIController.h" +#include "Minecraft.Client/Windows64/Windows64_App.h" +#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Windows64/Iggy/include/iggy.h" +#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h" +#include "Minecraft.Client/Windows64/Windows64_UIController.h" #else -#include "../Linux/Linux_App.h" -#include "../Linux/Iggy/include/iggy.h" -#include "../Common/Source Files/Audio/SoundEngine.h" -#include "../Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" #endif -#include "../Common/Source Files/ConsoleGameMode.h" -#include "../Common/Source Files/Console_Debug_enum.h" -#include "../Common/Source Files/Console_Awards_enum.h" -#include "../Common/Source Files/Tutorial/TutorialMode.h" -#include "../Common/Source Files/Tutorial/Tutorial.h" -#include "../Common/Source Files/Tutorial/FullTutorialMode.h" -#include "../Common/Source Files/Trial/TrialMode.h" -#include "../Common/Source Files/GameRules/ConsoleGameRules.h" -#include "../Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "../Common/Source Files/Colours/ColourTable.h" -#include "../Common/Source Files/DLC/DLCSkinFile.h" -#include "../Common/Source Files/DLC/DLCManager.h" -#include "../Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Trial/TrialMode.h" +#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" #include "extraX64client.h" diff --git a/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c b/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c index 61d5a12b6..42851b69d 100644 --- a/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c +++ b/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c @@ -1,19 +1,18 @@ #define GDRAW_ASSERTS #include "gdraw.h" -#include "../../../Windows64/Iggy/include/gdraw.h" -#include "../../../Windows64/Iggy/include/gdraw.h" #include -#include -#include #include -#include #include #include -#include -#include #include +#include + +#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h" +#include "SDL_video.h" +#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" #define true 1 #define false 0 @@ -684,7 +683,8 @@ static void gdraw_FramebufferRenderbufferSafe(GLenum target, GLenum attachment, #define glFramebufferRenderbuffer_SAFE gdraw_FramebufferRenderbufferSafe #define glFramebufferRenderbuffer glFramebufferRenderbuffer_SAFE -#include "../../../Windows64/Iggy/gdraw/gdraw_gl_shared.inl" +#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_gl_shared.inl" + #undef glVertexAttribPointer #define glVertexAttribPointer gdraw_real_vtxattrib diff --git a/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h b/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h index 8e0b3aa17..1dabc0dbe 100644 --- a/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h +++ b/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h @@ -1,8 +1,10 @@ #ifndef __LINUX_IGGY_GDRAW_H__ #define __LINUX_IGGY_GDRAW_H__ -#include "../../../Windows64/Iggy/include/gdraw.h" -#include "../../../Windows64/Iggy/include/iggy.h" +#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h" + +#include "Minecraft.Client/Windows64/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #ifdef __cplusplus extern "C" { diff --git a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp index e72c855d1..56747ff80 100644 --- a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp +++ b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp @@ -1,6 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" - #include "LinuxLeaderboardManager.h" +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" LeaderboardManager* LeaderboardManager::m_instance = new LinuxLeaderboardManager(); // Singleton instance of the diff --git a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h index de78da3b0..55b9d2e7d 100644 --- a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h +++ b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h @@ -1,6 +1,7 @@ #pragma once -#include "../../Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "4J.Common/4J_Compat.h" class LinuxLeaderboardManager : public LeaderboardManager { public: diff --git a/minecraft/Minecraft.Client/Linux/LinuxGL.cpp b/minecraft/Minecraft.Client/Linux/LinuxGL.cpp index e461dbdf6..8e9f141ad 100644 --- a/minecraft/Minecraft.Client/Linux/LinuxGL.cpp +++ b/minecraft/Minecraft.Client/Linux/LinuxGL.cpp @@ -1,11 +1,10 @@ #ifdef __linux__ -#include "Minecraft.World/Header Files/stdafx.h" -#include "4J_Render.h" - +#include "4J.Render/4J_Render.h" #include "java/IntBuffer.h" #include "java/FloatBuffer.h" #include "java/ByteBuffer.h" +#include "Minecraft.Client/Header Files/stubs.h" extern C4JRender RenderManager; @@ -108,6 +107,11 @@ void glTexGen_4J(int, int, FloatBuffer*) {} // query objects #include +#include +#include +#include +#include + static PFNGLGENQUERIESARBPROC _glGenQueriesARB = nullptr; static PFNGLBEGINQUERYARBPROC _glBeginQueryARB = nullptr; static PFNGLENDQUERYARBPROC _glEndQueryARB = nullptr; diff --git a/minecraft/Minecraft.Client/Linux/Linux_App.cpp b/minecraft/Minecraft.Client/Linux/Linux_App.cpp index 735f1921b..d14cc0643 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_App.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_App.cpp @@ -1,15 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Common/Consoles_App.h" -#include "../net/minecraft/client/User.h" -#include "../net/minecraft/client/Minecraft.h" -#include "../net/minecraft/server/MinecraftServer.h" -#include "../net/minecraft/server/PlayerList.h" -#include "../net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include +#include + +#include "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" -#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "Minecraft.World/net/minecraft/world/level/LevelType.h" #include "Linux_App.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "4J_Profile.h" +#include "4J.Render/4J_Render.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" CConsoleMinecraftApp app; diff --git a/minecraft/Minecraft.Client/Linux/Linux_App.h b/minecraft/Minecraft.Client/Linux/Linux_App.h index c48c35499..b1f76ee8e 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_App.h +++ b/minecraft/Minecraft.Client/Linux/Linux_App.h @@ -1,5 +1,12 @@ #pragma once +#include + +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Consoles_App.h" + +class C4JStringTable; + class CConsoleMinecraftApp : public CMinecraftApp { public: CConsoleMinecraftApp(); diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp index 7f340eab7..74ec9cfad 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include #include @@ -38,8 +38,8 @@ static void sigsegv_handler(int sig) { _exit(139); } #endif -#include "../net/minecraft/server/MinecraftServer.h" -#include "../net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "Minecraft.World/net/minecraft/world/item/MapItem.h" #include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" @@ -51,18 +51,18 @@ static void sigsegv_handler(int sig) { #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "../net/minecraft/client/multiplayer/ClientConnection.h" -#include "../net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/User.h" #include "Minecraft.Client/Common/Source Files/Network/Socket.h" #include "Minecraft.World/ConsoleHelpers/ThreadName.h" -#include "../net/minecraft/stats/StatsCounter.h" -#include "../net/minecraft/client/multiplayer/ConnectScreen.h" -// #include "../../Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h" +// #include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" -#include "../net/minecraft/client/renderer/Tesselator.h" -#include "../net/minecraft/client/Options.h" -#include "../net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.World/Header Files/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" // #include "../Orbis/Leaderboards/OrbisLeaderboardManager.h" diff --git a/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp b/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp index c87dbc8f7..b46250ee9 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp @@ -1,7 +1,7 @@ // Linux stub implementations for ShutdownManager // The PS3/PSVita versions have full implementations; on Linux these are no-ops. -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Common/ShutdownManager.h" +#include "Minecraft.Client/Common/ShutdownManager.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" void ShutdownManager::Initialise() {} void ShutdownManager::StartShutdown() {} diff --git a/minecraft/Minecraft.Client/Linux/Linux_UIController.cpp b/minecraft/Minecraft.Client/Linux/Linux_UIController.cpp index 2e086b1ae..21c4b96bf 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_UIController.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_UIController.cpp @@ -1,7 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + // GDraw GL backend for Linux -#include "Iggy/gdraw/gdraw.h" +#include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h" #include "Linux_UIController.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h" ConsoleUIController ui; diff --git a/minecraft/Minecraft.Client/Linux/Linux_UIController.h b/minecraft/Minecraft.Client/Linux/Linux_UIController.h index fd606da5b..070340efe 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_UIController.h +++ b/minecraft/Minecraft.Client/Linux/Linux_UIController.h @@ -1,6 +1,9 @@ #pragma once -#include "../Common/Source Files/UI/UIController.h" +#include "Minecraft.Client/Common/Source Files/UI/UIController.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class ConsoleUIController : public UIController { public: diff --git a/minecraft/Minecraft.Client/Linux/Stubs/d3d11_stubs.h b/minecraft/Minecraft.Client/Linux/Stubs/d3d11_stubs.h index 80a468daa..973d45081 100644 --- a/minecraft/Minecraft.Client/Linux/Stubs/d3d11_stubs.h +++ b/minecraft/Minecraft.Client/Linux/Stubs/d3d11_stubs.h @@ -4,7 +4,7 @@ #pragma once #include "winapi_stubs.h" -#include "DirectXMath/DirectXMath.h" +#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h" // The DirectXMath SAL shim defines a few reserved identifiers such as // `__valid`. Newer libstdc++ headers also use those internal names, so keep diff --git a/minecraft/Minecraft.Client/Linux/Stubs/iggy_stubs.h b/minecraft/Minecraft.Client/Linux/Stubs/iggy_stubs.h index fdd493302..52403a2d2 100644 --- a/minecraft/Minecraft.Client/Linux/Stubs/iggy_stubs.h +++ b/minecraft/Minecraft.Client/Linux/Stubs/iggy_stubs.h @@ -3,7 +3,7 @@ #pragma once -#include "../Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" #define STUBBED \ { \ diff --git a/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp b/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp index d8abb2318..887703696 100644 --- a/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp +++ b/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp @@ -1,12 +1,7 @@ #ifdef __linux__ -#include -#include -#include -#include - -#include "Stubs/LinuxStubs.h" -#include "../Common/Consoles_App.h" +#include "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/Header Files/stubs.h" void Display::update() {} diff --git a/minecraft/Minecraft.Client/Source Files/BufferedImage.cpp b/minecraft/Minecraft.Client/Source Files/BufferedImage.cpp index 43391bd0e..a9adab365 100644 --- a/minecraft/Minecraft.Client/Source Files/BufferedImage.cpp +++ b/minecraft/Minecraft.Client/Source Files/BufferedImage.cpp @@ -1,12 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../net/minecraft/client/renderer/Textures.h" #include "Minecraft.World/ConsoleHelpers/PathHelper.h" -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" -#include "../Header Files/BufferedImage.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" + #include #include #include +#include +#include BufferedImage::BufferedImage(int width, int height, int type) { data[0] = new int[width * height]; diff --git a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp index 584391d5a..d8241ddbd 100644 --- a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp +++ b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp @@ -1,7 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../net/minecraft/stats/StatsCounter.h" +#include +#include +#include + +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/x64headers/extraX64.h" +#include "extraX64client.h" + +class INVITE_INFO; #if defined(_WINDOWS64) // C4JStorage StorageManager; C_4JProfile ProfileManager; diff --git a/minecraft/Minecraft.Client/Source Files/FrameProfiler.cpp b/minecraft/Minecraft.Client/Source Files/FrameProfiler.cpp index c899525b8..d7a7a9076 100644 --- a/minecraft/Minecraft.Client/Source Files/FrameProfiler.cpp +++ b/minecraft/Minecraft.Client/Source Files/FrameProfiler.cpp @@ -1,5 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Header Files/FrameProfiler.h" #ifdef ENABLE_FRAME_PROFILER diff --git a/minecraft/Minecraft.Client/Source Files/stubs.cpp b/minecraft/Minecraft.Client/Source Files/stubs.cpp index 3ae169f67..34b9616ad 100644 --- a/minecraft/Minecraft.Client/Source Files/stubs.cpp +++ b/minecraft/Minecraft.Client/Source Files/stubs.cpp @@ -1,5 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Header Files/stubs.h" #if defined(__linux__) void LinuxLogStubLightmapProbe() { diff --git a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp index e7131fdce..0f4e622e2 100644 --- a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp +++ b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" // 4J +#include "Minecraft.Client/Header Files/stdafx.h" // 4J // gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools // @@ -43,8 +43,8 @@ #include #include -#include "../include/gdraw.h" -#include "../include/iggy.h" +#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h" +#include "Minecraft.Client/Windows64/Iggy/include/iggy.h" #include #include diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp index 916423453..0dec5d869 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "WindowsLeaderboardManager.h" diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h index 19653de2b..8a77983c1 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { public: diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp index e88456dfb..59853aca4 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp @@ -1,12 +1,12 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include #include -#include "../../net/minecraft/server/MinecraftServer.h" -#include "../../net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "Minecraft.World/net/minecraft/world/item/MapItem.h" #include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" @@ -18,20 +18,20 @@ #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "../../net/minecraft/client/multiplayer/ClientConnection.h" -#include "../../net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/User.h" #include "Minecraft.Client/Common/Source Files/Network/Socket.h" #include "Minecraft.World/ConsoleHelpers/ThreadName.h" -#include "../../net/minecraft/stats/StatsCounter.h" -#include "../../net/minecraft/client/multiplayer/ConnectScreen.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h" // #include "Social/SocialManager.h" -// #include "../../Common/Source Files/Leaderboards/LeaderboardManager.h" +// #include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" -#include "../../net/minecraft/client/renderer/Tesselator.h" -#include "../../net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "Sentient/SentientManager.h" -#include "../../net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "../Resource.h" #include "Minecraft.World/Header Files/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp index d93c067b1..ef4521742 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp +++ b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Common/Consoles_App.h" -#include "../net/minecraft/client/User.h" -#include "../net/minecraft/client/Minecraft.h" -#include "../net/minecraft/server/MinecraftServer.h" -#include "../net/minecraft/server/PlayerList.h" -#include "../net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Consoles_App.h" +#include "Minecraft.Client/net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp index 0538d1924..17b0a6ad4 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp +++ b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Windows64_UIController.h" // Temp -#include "../net/minecraft/client/Minecraft.h" -#include "../net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #define _ENABLEIGGY diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h index fec203922..95dd2baa1 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h +++ b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "../Common/Source Files/UI/UIController.h" +#include "Minecraft.Client/Common/Source Files/UI/UIController.h" class ConsoleUIController : public UIController { private: diff --git a/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp b/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp index 03bcbccd0..4e9c3d652 100644 --- a/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp +++ b/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp @@ -16,7 +16,7 @@ // Copyright (C) Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------------- -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "ATGXmlParser.h" #include diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp index 1dbc8bdbc..98d9ce6c8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp @@ -1,10 +1,23 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "Camera.h" #include "MemoryTracker.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/level/TilePos.h" +#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h" +#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathConvert.inl" +#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathMatrix.inl" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "java/FloatBuffer.h" +#include "Minecraft.Client/Header Files/stubs.h" float Camera::xPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Camera.h b/minecraft/Minecraft.Client/net/minecraft/client/Camera.h index a6fa03a30..98bb8803b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Camera.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/Camera.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "java/FloatBuffer.h" #include "java/IntBuffer.h" @@ -6,6 +8,9 @@ class TilePos; class Vec3; class Player; class Mob; +class FloatBuffer; +class Level; +class LivingEntity; class Camera { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp index 62796a580..84eeeb23d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp @@ -1,5 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ClientConstants.h" +#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" +#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" const std::wstring ClientConstants::VERSION_STRING = std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W + diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h index 1abca946c..49272c1ba 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.h @@ -1,5 +1,7 @@ #pragma once +#include + class ClientConstants { // This file holds global constants used by the client. // The file should be replaced at compile-time with the diff --git a/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp b/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp index 8d1fa65f0..9f78970c5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/DemoUser.cpp @@ -1,4 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "DemoUser.h" +#include "Minecraft.Client/net/minecraft/client/User.h" DemoUser::DemoUser() : User(L"DemoUser", L"n/a") {} \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp b/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp index 04d715474..461017efb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "GuiMessage.h" +#include "Minecraft.Client/net/minecraft/client/GuiMessage.h" GuiMessage::GuiMessage(const std::wstring& string) { this->string = string; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h b/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h index 84596a860..d251738cd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/GuiMessage.h @@ -1,5 +1,7 @@ #pragma once +#include + class GuiMessage { public: std::wstring string; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp b/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp index 7b50eb7d9..b56f4b1a1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "KeyMapping.h" KeyMapping::KeyMapping(const std::wstring& name, int key) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h b/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h index 6f06e6c1a..4a7f45bd3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/KeyMapping.h @@ -1,5 +1,7 @@ #pragma once +#include + // 4J Stu - Not updated to 1.8.2 as we don't use this class KeyMapping { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp index 2e86184fc..9971092f0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Lighting.h" #include "java/FloatBuffer.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Header Files/stubs.h" FloatBuffer* Lighting::lb = new FloatBuffer(16); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.cpp b/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.cpp index 75974d553..d5f5161e1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.cpp @@ -1,8 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "MemoryTracker.h" -#include "java/IntBuffer.h" #include "java/ByteBuffer.h" -#include "java/FloatBuffer.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "4J.Render/4J_Render.h" std::unordered_map MemoryTracker::GL_LIST_IDS; std::vector MemoryTracker::TEXTURE_IDS; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.h b/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.h index 6e9b553e3..9726cbd23 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/MemoryTracker.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + class ByteBuffer; class IntBuffer; class FloatBuffer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp index f9e1be47e..f1d1b7e79 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp @@ -2,44 +2,44 @@ #include #include -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.h" -#include "../server/level/GameMode.h" -#include "gui/PauseScreen.h" +#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" +#include "Minecraft.Client/net/minecraft/client/gui/PauseScreen.h" #include "Timer.h" #include "ProgressRenderer.h" -#include "renderer/LevelRenderer.h" -#include "particle/ParticleEngine.h" -#include "multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "User.h" -#include "renderer/Textures.h" -#include "renderer/GameRenderer.h" -#include "model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" #include "Options.h" -#include "skins/TexturePackRepository.h" -#include "../stats/StatsCounter.h" -#include "renderer/entity/EntityRenderDispatcher.h" -#include "renderer/tileentity/TileEntityRenderDispatcher.h" -#include "../server/level/SurvivalMode.h" -#include "renderer/Chunk.h" -#include "../server/level/CreativeMode.h" -#include "level/DemoLevel.h" -#include "multiplayer/MultiPlayerLevel.h" -#include "multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/server/level/SurvivalMode.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Chunk.h" +#include "Minecraft.Client/net/minecraft/server/level/CreativeMode.h" +#include "Minecraft.Client/net/minecraft/client/level/DemoLevel.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "DemoUser.h" -#include "gui/particle/GuiParticles.h" -#include "gui/Screen.h" -#include "gui/DeathScreen.h" -#include "gui/ErrorScreen.h" -#include "title/TitleScreen.h" -#include "gui/inventory/InventoryScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/DeathScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h" +#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h" #if defined(ENABLE_JAVA_GUIS) -#include "gui/inventory/CreativeInventoryScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h" #endif -#include "gui/InBedChatScreen.h" -#include "gui/achievement/AchievementPopup.h" -#include "player/Input.h" -#include "renderer/culling/FrustumCuller.h" +#include "Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h" +#include "Minecraft.Client/net/minecraft/client/player/Input.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" #include "Camera.h" #include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" @@ -60,7 +60,7 @@ #include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/Header Files/Minecraft.World.h" -#include "multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h" #include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" #include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" @@ -69,10 +69,10 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "renderer/texture/TextureManager.h" -#include "../../../Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "../../../Common/Source Files/UI/UIFontData.h" -#include "skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/UIFontData.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" // #define DISABLE_SPU_CODE // 4J Turning this on will change the graph at the bottom of the debug overlay diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h index 952b27c54..43972cd27 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h @@ -40,7 +40,7 @@ class MultiPlayerGameMode; #include "java/File.h" #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" -#include "resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #if defined(linux) #undef linux diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp index 57c7b3723..773ac4c89 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp @@ -1,18 +1,20 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Options.h" #include "KeyMapping.h" -#include "renderer/LevelRenderer.h" -#include "renderer/Textures.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.World/net/minecraft/locale/Language.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" -#include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" #include "java/InputOutputStream/FileInputStream.h" #include "java/InputOutputStream/FileOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Header Files/stubs.h" // 4J - the Option sub-class used to be an java enumerated type, trying to // emulate that functionality here diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Options.h b/minecraft/Minecraft.Client/net/minecraft/client/Options.h index eb614336a..127988ef4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Options.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/Options.h @@ -1,8 +1,11 @@ #pragma once +#include + +#include "java/File.h" + class Minecraft; class KeyMapping; -#include "java/File.h" class Options { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.cpp index 75b2eeb76..e65573aae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.cpp @@ -1,8 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "renderer/Tesselator.h" -#include "renderer/Textures.h" #include "ProgressRenderer.h" #include "java/System.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" std::recursive_mutex ProgressRenderer::s_progress; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h index 85635fcde..539d2730b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/ProgressRenderer.h @@ -1,7 +1,12 @@ #pragma once +#include #include +#include + #include "Minecraft.World/net/minecraft/util/ProgressListener.h" +class Minecraft; + class ProgressRenderer : public ProgressListener { public: enum eProgressStringType { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Timer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Timer.cpp index 2bf00a934..87c539c49 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Timer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Timer.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Timer.h" #include "java/System.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Timer.h b/minecraft/Minecraft.Client/net/minecraft/client/Timer.h index 0b958356e..4d1e18698 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Timer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/Timer.h @@ -1,5 +1,7 @@ #pragma once +#include + class Timer { private: static const int MAX_TICKS_PER_UPDATE = 10; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/User.cpp b/minecraft/Minecraft.Client/net/minecraft/client/User.cpp index 62c388298..5940a9cc0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/User.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/User.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "User.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HalfSlabTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" std::vector User::allowedTiles; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/User.h b/minecraft/Minecraft.Client/net/minecraft/client/User.h index 8ab308bd6..4eb99a65d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/User.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/User.h @@ -1,5 +1,10 @@ #pragma once +#include +#include + +class Tile; + class User { public: static std::vector allowedTiles; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.cpp index d5bcc5747..2eaa85ae4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Button.h" -#include "../renderer/Textures.h" + +class Minecraft; #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_GUI_LOCATION = ResourceLocation(TN_GUI_GUI); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.h index 529ab0902..08746b176 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Button.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "GuiComponent.h" +class Minecraft; + class Button : public GuiComponent { protected: int w; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp index 5d4c80a87..2ba2e7934 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp @@ -1,8 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "ChatScreen.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/Header Files/stubs.h" const std::wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.h index 3be4521f7..5656c40b8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Screen.h" class ChatScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp index 283b1d69d..33f373ee3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "ConfirmScreen.h" #include "SmallButton.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" ConfirmScreen::ConfirmScreen(Screen* parent, const std::wstring& title1, const std::wstring& title2, int id) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.h index 5933ff0e4..e3ded58c5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ConfirmScreen.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Screen.h" class ConfirmScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp index 5a9164ce3..3f4298bf7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.cpp @@ -1,8 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "ControlsScreen.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "SmallButton.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" ControlsScreen::ControlsScreen(Screen* lastScreen, Options* options) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.h index 4055c2f42..7c7eadc82 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ControlsScreen.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Screen.h" class Options; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp index 7cfd82924..a931efa3d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp @@ -1,18 +1,30 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "CreateWorldScreen.h" #include "EditBox.h" #include "Button.h" -#include "../../server/level/SurvivalMode.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "java/Random.h" -#include "../../server/MinecraftServer.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "MessageScreen.h" -#include +#include "4J_Storage.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#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/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/Header Files/stubs.h" CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) { done = false; // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.h index 704df772e..e786a2beb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "Screen.h" + class EditBox; class LevelStorageSource; +class Button; class CreateWorldScreen : public Screen { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp index d08c44f69..9392d3503 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp @@ -1,10 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "DeathScreen.h" #include "Button.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "PauseScreen.h" -#include "../title/TitleScreen.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" void DeathScreen::init() { buttons.clear(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp index 682eddd8b..c963b4703 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "EditBox.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/Header Files/stubs.h" EditBox::EditBox(Screen* screen, Font* font, int x, int y, int width, int height, const std::wstring& value) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.h index 133bfc0f8..6f13de8fa 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "GuiComponent.h" class Font; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp index 9960f228a..7039da466 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.cpp @@ -1,17 +1,23 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "EnchantmentScreen.h" -#include #include #include #include -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../Lighting.h" -#include "../renderer/Textures.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include +#include + +#include "EnchantmentScreen.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "../model/BookModel.h" -#include "../Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" + +class Level; // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes (and iggy too) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h index 181e39ef0..841112737 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EnchantmentScreen.h @@ -1,7 +1,17 @@ #pragma once -#include "inventory/AbstractContainerScreen.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" +#include "java/Random.h" + +class EnchantmentMenu; +class Inventory; +class ItemInstance; +class Level; class EnchantmentScreen : public AbstractContainerScreen { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.cpp index 500978393..6d0b9bc56 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ErrorScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" ErrorScreen::ErrorScreen(const std::wstring& title, const std::wstring& message) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h index b65f921b4..bf1804199 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ErrorScreen.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Screen.h" class ErrorScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp index abb2c2e28..a61452a81 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp @@ -1,13 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../renderer/Textures.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Font.h" -#include "../Options.h" -#include "../renderer/Tesselator.h" -#include "../resources/ResourceLocation.h" -#include "java/IntBuffer.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" Font::Font(Options* options, const std::wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation* textureLocation, int cols, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.h index 248d0ed9a..a7c4c8590 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.h @@ -1,9 +1,13 @@ #pragma once +#include +#include + class IntBuffer; class Options; class Textures; class ResourceLocation; +class Random; class Font { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp index 80ddc7325..5ffed8576 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp @@ -1,15 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Gui.h" -#include "../renderer/entity/ItemRenderer.h" -#include "../renderer/GameRenderer.h" -#include "../Options.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../renderer/Textures.h" -#include "../renderer/texture/TextureAtlas.h" -#include "../../server/level/GameMode.h" -#include "../Lighting.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" #include "ChatScreen.h" -#include "../multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "java/JavaMath.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" @@ -20,10 +20,10 @@ #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "java/System.h" #include "Minecraft.World/net/minecraft/locale/Language.h" -#include "../renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "../renderer/entity/EnderDragonRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.h index a5570110e..7520e9028 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.h @@ -1,8 +1,8 @@ #pragma once #include #include "GuiComponent.h" -#include "../GuiMessage.h" -#include "../renderer/entity/ItemRenderer.h" +#include "Minecraft.Client/net/minecraft/client/GuiMessage.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" class Random; class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp index d074250d0..a7310ef48 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp @@ -1,6 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "GuiComponent.h" -#include "../renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/Header Files/stubs.h" void GuiComponent::hLine(int x0, int x1, int y, int col) { if (x1 < x0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.h index fe7ece730..d29ffd0e3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.h @@ -1,4 +1,6 @@ #pragma once +#include + class Font; class GuiComponent { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp index 8ec638986..203205fba 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.cpp @@ -1,10 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "HopperScreen.h" -#include "../renderer/Textures.h" -#include "../player/LocalPlayer.h" #include "Font.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.h index 6137ded26..39561e00a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/HopperScreen.h @@ -1,10 +1,12 @@ #pragma once #include -#include "inventory/AbstractContainerScreen.h" + +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" class HopperTileEntity; class MinecartHopper; class Inventory; +class Container; class HopperScreen : public AbstractContainerScreen { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp index ed75deab2..6296f19f7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp @@ -1,9 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "InBedChatScreen.h" #include "Button.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/ChatScreen.h" +#include "Minecraft.Client/Header Files/stubs.h" void InBedChatScreen::init() { Keyboard::enableRepeatEvents(true); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp index 618f8e28f..3d0ebcd45 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -1,9 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "JoinMultiplayerScreen.h" #include "Button.h" #include "EditBox.h" -#include "../Options.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/locale/Language.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" JoinMultiplayerScreen::JoinMultiplayerScreen(Screen* lastScreen) { ipEdit = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h index 8ec479267..ee411c8eb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h @@ -1,5 +1,8 @@ #pragma once +#include + #include "Screen.h" + class EditBox; class Button; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp index 8882307cc..ef3d55eb5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.cpp @@ -1,22 +1,24 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "MerchantScreen.h" -#include #include +#include +#include + +#include "MerchantScreen.h" #include "TradeSwitchButton.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../Lighting.h" -#include "../renderer/Textures.h" -#include "../renderer/entity/ItemRenderer.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantContainer.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "../Minecraft.h" -#include "../multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.World/net/minecraft/world/item/Rarity.h" +#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" +#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/trading/Merchant.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" + +class Level; // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes (and iggy too) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h index f2e3cfb53..828233d55 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h @@ -1,10 +1,16 @@ #pragma once -#include "inventory/AbstractContainerScreen.h" +#include + +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" #include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" class TradeSwitchButton; +class Inventory; +class Level; +class Merchant; +class MerchantMenu; class MerchantScreen : public AbstractContainerScreen { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.cpp index ccfa7a13e..a428480a8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.cpp @@ -1,5 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "MessageScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" MessageScreen::MessageScreen(const std::wstring& message) { this->message = message; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.h index c4b5cc272..5e9a705fc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/MessageScreen.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Screen.h" class MessageScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp index 2b88ab3c1..ac0fe229a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp @@ -1,12 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Minecraft.h" +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minimap.h" #include "Font.h" -#include "../Options.h" -#include "../renderer/Textures.h" -#include "../renderer/Tesselator.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" int Minimap::LUT[256]; // 4J added bool Minimap::genLUT = true; // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h index 07a615242..f65d28b0a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.h @@ -1,5 +1,9 @@ #pragma once +#include +#include + #include "Minecraft.World/net/minecraft/world/item/MapItem.h" + class Options; class Font; class Textures; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp index a4f46373a..cd3b792dd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "NameEntryScreen.h" #include "Button.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.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" const std::wstring NameEntryScreen::allowedChars = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 " diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.h index 454178657..092d75d67 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Screen.h" +class Button; + class NameEntryScreen : public Screen { private: Screen* lastScreen; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp index b92a055c8..1ade5f896 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.cpp @@ -1,11 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "OptionsScreen.h" #include "SmallButton.h" #include "SlideButton.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "ControlsScreen.h" #include "VideoSettingsScreen.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) { title = L"Options"; // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h index 8019cb143..5139afb84 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h @@ -1,5 +1,8 @@ #pragma once +#include + #include "Screen.h" + class Options; class OptionsScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp index 2a1ce89ea..a1966fce6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp @@ -1,17 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include + #include "PauseScreen.h" #include "Button.h" -#include "../../stats/StatsCounter.h" #include "MessageScreen.h" #include "OptionsScreen.h" -#include "../title/TitleScreen.h" -#include "../multiplayer/MultiPlayerLevel.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "../player/LocalPlayer.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../../server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" PauseScreen::PauseScreen() { saveStep = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.h index 8b69dadaf..f3ca9570e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.h @@ -1,6 +1,8 @@ #pragma once #include "Screen.h" +class Minecraft; + class PauseScreen : public Screen { private: int saveStep; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp index 0918ae4dd..196bee6c3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp @@ -1,10 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "RenameWorldScreen.h" #include "EditBox.h" #include "Button.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.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" RenameWorldScreen::RenameWorldScreen(Screen* lastScreen, const std::wstring& levelId) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.h index dc8f356b1..79a2ff3de 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.h @@ -1,5 +1,8 @@ #pragma once +#include + #include "Screen.h" + class Button; class EditBox; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp index ad4836451..55b3730db 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.cpp @@ -1,17 +1,26 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "RepairScreen.h" #include #include #include + +#include "RepairScreen.h" #include "EditBox.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../Lighting.h" -#include "../renderer/Textures.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "../multiplayer/ClientConnection.h" -#include "../Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" + +class Inventory; +class Level; // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // IUIScene_AnvilMenu (from iggy UI) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h index 28a76c4c3..5ad377493 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h @@ -1,11 +1,17 @@ #pragma once -#include "Minecraft.World/Header Files/stdafx.h" -#include "inventory/AbstractContainerScreen.h" +#include + +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" class EditBox; +class AnvilMenu; +class Inventory; +class Level; class RepairScreen : public AbstractContainerScreen, public ContainerListener { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp index a5405d951..0dcddf83b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp @@ -1,10 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Screen.h" #include "Button.h" -#include "particle/GuiParticles.h" -#include "../renderer/Tesselator.h" -#include "../renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" #include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Header Files/stubs.h" Screen::Screen() // 4J added { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.h index ed6d7cee6..dab45b160 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.h @@ -1,8 +1,13 @@ #pragma once +#include +#include + #include "GuiComponent.h" + class Button; class GuiParticles; class Minecraft; +class Font; class Screen : public GuiComponent { protected: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.cpp index a0957b943..3ebaa95e7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "ScreenSizeCalculator.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" // who the fuck thought this was a good idea ScreenSizeCalculator::ScreenSizeCalculator(Options* options, int width, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.cpp index 0197e80e2..5b52112bb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.cpp @@ -1,9 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ScrolledSelectionList.h" #include "Button.h" -#include "../renderer/Tesselator.h" -#include "../renderer/Textures.h" -#include "java/System.h" + +class Minecraft; ScrolledSelectionList::ScrolledSelectionList(Minecraft* minecraft, int width, int height, int y0, int y1, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h index a803b35f4..7c7aaf1e4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + class Button; class Tesselator; +class Minecraft; class ScrolledSelectionList { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp index f946b3a1b..b4bf723a8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp @@ -1,13 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "SelectWorldScreen.h" #include "Button.h" #include "ConfirmScreen.h" #include "CreateWorldScreen.h" #include "RenameWorldScreen.h" -#include "../../server/level/DemoMode.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h" SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h index 0012b5879..67df168ff 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h @@ -1,6 +1,10 @@ #pragma once +#include +#include + #include "Screen.h" #include "ScrolledSelectionList.h" + class LevelSummary; class Button; class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.cpp index f5f5427ec..09dbccf07 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.cpp @@ -1,5 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "SlideButton.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" SlideButton::SlideButton(int id, int x, int y, const Options::Option* option, const std::wstring& msg, float value) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.h index 91db3302c..a7d8572a6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SlideButton.h @@ -1,6 +1,9 @@ #pragma once +#include + #include "Button.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" + class Minecraft; class SlideButton : public Button { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.cpp index 188b073d6..85d369234 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.cpp @@ -1,5 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "SmallButton.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" SmallButton::SmallButton(int id, int x, int y, const std::wstring& msg) : Button(id, x, y, 150, 20, msg) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.h index 6d68d0513..46df632d9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SmallButton.h @@ -1,6 +1,8 @@ #pragma once +#include + #include "Button.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" class SmallButton : public Button { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.cpp index bea6646ec..540e771da 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/TradeSwitchButton.cpp @@ -1,10 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "TradeSwitchButton.h" -#include "../renderer/Textures.h" -#include "../renderer/Tesselator.h" -#include "../Minecraft.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp index 04a8480a5..5024f30c0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.cpp @@ -1,10 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "VideoSettingsScreen.h" #include "SmallButton.h" #include "SlideButton.h" -#include "../Options.h" -#include "ControlsScreen.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" // 4jcraft #define ITEM_COUNT 10 diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.h index e4aa2189b..6635f162a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/VideoSettingsScreen.h @@ -1,5 +1,8 @@ #pragma once +#include + #include "Screen.h" + class Options; class VideoSettingsScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp index e901e1a4f..a54f1274e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "AchievementPopup.h" -#include "../../renderer/entity/ItemRenderer.h" -#include "../Font.h" -#include "../../renderer/Textures.h" -#include "../../Lighting.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "java/System.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "Minecraft.World/net/minecraft/stats/Achievement.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" AchievementPopup::AchievementPopup(Minecraft* mc) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h index f47c47d73..c310c540a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementPopup.h @@ -1,7 +1,12 @@ #pragma once -#include "../GuiComponent.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/gui/GuiComponent.h" + class Achievement; class ItemRenderer; +class Minecraft; class AchievementPopup : public GuiComponent { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp index 330ac0b09..25e3e08fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -1,17 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "AchievementScreen.h" -#include "../SmallButton.h" -#include "../../Options.h" -#include "../../KeyMapping.h" -#include "../Font.h" -#include "../../Lighting.h" -#include "../../renderer/Textures.h" -#include "../../../stats/StatsCounter.h" -#include "../../renderer/entity/ItemRenderer.h" -#include "java/System.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "java/JavaMath.h" +#include "Minecraft.Client/net/minecraft/client/gui/SmallButton.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/KeyMapping.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "Minecraft.World/net/minecraft/stats/Achievement.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/Header Files/stubs.h" AchievementScreen::AchievementScreen(StatsCounter* statsCounter) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h index 2b4dc034c..71d821b83 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h @@ -1,6 +1,8 @@ #pragma once -#include "../Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.World/net/minecraft/stats/Achievements.h" + class StatsCounter; class AchievementScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp index f6e8efe9c..77a827912 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp @@ -1,13 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "StatsScreen.h" -#include "../../../stats/StatsCounter.h" -#include "../../renderer/entity/ItemRenderer.h" -#include "../Button.h" -#include "../Font.h" -#include "../../Lighting.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/locale/I18n.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/stats/ItemStat.h" +#include "Minecraft.World/net/minecraft/stats/Stat.h" +#include "Minecraft.World/net/minecraft/stats/Stats.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h" +#include "Minecraft.Client/Header Files/stubs.h" + +class Tesselator; const float StatsScreen::SLOT_TEX_SIZE = 128.0f; ItemRenderer* StatsScreen::itemRenderer = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h index dc567006d..fed6a0d93 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h @@ -1,7 +1,14 @@ #pragma once -#include "../Screen.h" -#include "../ScrolledSelectionList.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h" + class ItemStat; +class ItemRenderer; +class StatsCounter; +class Tesselator; class StatsScreen : public Screen { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.cpp index 646a0ffe7..8f2468711 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.cpp @@ -1,8 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "AbstractBeaconButton.h" -#include "../../renderer/Textures.h" -#include "../../Minecraft.h" -#include +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h index 9b7601aa3..a38f1ff82 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h @@ -1,5 +1,5 @@ #pragma once -#include "../Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" class ResourceLocation; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index a94a94d1e..8fed6b02b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -1,14 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "AbstractContainerScreen.h" -#include "../../renderer/entity/ItemRenderer.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "../../Lighting.h" -#include "../../../server/level/GameMode.h" -#include "../../KeyMapping.h" -#include "../../Options.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/KeyMapping.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/Rarity.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.Client/Header Files/stubs.h" ItemRenderer* AbstractContainerScreen::itemRenderer = new ItemRenderer(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h index 462e178d5..315c90704 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h @@ -1,9 +1,15 @@ #pragma once -#include "../Screen.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" + class ItemRenderer; class AbstractContainerMenu; class Slot; class Container; +class ItemInstance; class AbstractContainerScreen : public Screen { protected: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp index ce37dae20..c4a94d513 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconCancelButton.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "BeaconCancelButton.h" #include "BeaconScreen.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp index ef489301b..c9a4cbd47 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconConfirmButton.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "BeaconConfirmButton.h" #include "BeaconScreen.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp index 0752ab159..b1196c70a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "BeaconPowerButton.h" #include "BeaconScreen.h" #include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "../../renderer/Textures.h" -#include "../../resources/ResourceLocation.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp index 9ef73f33c..a85f8700d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -1,20 +1,28 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "BeaconScreen.h" #include "BeaconConfirmButton.h" #include "BeaconCancelButton.h" #include "BeaconPowerButton.h" -#include -#include -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "../../Lighting.h" -#include "../../renderer/Textures.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "../../Minecraft.h" -#include "../../multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractBeaconButton.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes (and iggy too) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h index 072ba6521..4126aabbf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BeaconScreen.h @@ -1,11 +1,16 @@ #pragma once +#include + #include "AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" class BeaconConfirmButton; class BeaconCancelButton; +class BeaconMenu; +class BeaconTileEntity; +class Inventory; class BeaconScreen : public AbstractContainerScreen { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp index ab8c91b2d..8654b4bfb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.cpp @@ -1,15 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "BrewingStandScreen.h" -#include #include #include -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "../../Lighting.h" -#include "../../renderer/Textures.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" + +#include "BrewingStandScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" -#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "../../Minecraft.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h index 0ddc70f02..5a005cff5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/BrewingStandScreen.h @@ -1,9 +1,15 @@ #pragma once +#include + #include "AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +class BrewingStandMenu; +class BrewingStandTileEntity; +class Inventory; + class BrewingStandScreen : public AbstractContainerScreen { public: BrewingStandScreen(std::shared_ptr inventory, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp index c09e0f9ad..3492d0a78 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ContainerScreen.h" -#include "../../renderer/Textures.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/inventory/ContainerMenu.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" ContainerScreen::ContainerScreen(std::shared_ptr inventory, std::shared_ptr container) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.h index fca18c2f3..f3da21f99 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/ContainerScreen.h @@ -1,5 +1,8 @@ #pragma once +#include + #include "AbstractContainerScreen.h" + class Container; class ContainerScreen : public AbstractContainerScreen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp index 52193fd7b..f6101f332 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.cpp @@ -1,9 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "CraftingScreen.h" -#include "../../renderer/Textures.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" + +class Player; #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_CRAFTING_LOCATION = ResourceLocation(TN_GUI_CRAFTING); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.h index 77eb664c7..7d07b6e11 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CraftingScreen.h @@ -1,5 +1,8 @@ #pragma once +#include + #include "AbstractContainerScreen.h" + class Inventory; class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 9f53d6854..6db90e58d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -1,18 +1,26 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "CreativeInventoryScreen.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/SimpleContainer.h" #include "Minecraft.World/net/minecraft/world/inventory/Slot.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "../../Minecraft.h" -#include "../../renderer/Textures.h" -#include "../../renderer/entity/ItemRenderer.h" -#include "../../Lighting.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h" -#include -#include +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#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.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Header Files/stubs.h" // Static member initialization int CreativeInventoryScreen::selectedTabIndex = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h index 96340f2f0..368f6d9dc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -1,13 +1,18 @@ #pragma once +#include +#include + #include "AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "../../../../../Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" class Player; class SimpleContainer; class Inventory; class Slot; +class ItemInstance; +class ItemRenderer; class CreativeInventoryScreen : public AbstractContainerScreen { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp index b14c775ad..7dfd427af 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.cpp @@ -1,10 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "FurnaceScreen.h" -#include "../../renderer/Textures.h" -#include "../../player/LocalPlayer.h" -#include "../Font.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_FURNACE_LOCATION = ResourceLocation(TN_GUI_FURNACE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.h index cdaab078e..237589ec3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/FurnaceScreen.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "AbstractContainerScreen.h" class FurnaceTileEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp index 026573740..d247b7e4b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.cpp @@ -1,11 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "HorseInventoryScreen.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "../../renderer/entity/EntityRenderDispatcher.h" -#include "../../Lighting.h" -#include "../../renderer/Textures.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" #include "Minecraft.World/net/minecraft/world/inventory/HorseInventoryMenu.h" +#include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" + +class EntityHorse; // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing InventoryScreen #ifdef ENABLE_JAVA_GUIS diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h index f1d1bfd02..9c532bb22 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/HorseInventoryScreen.h @@ -1,8 +1,13 @@ #pragma once #include + #include "AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +class Container; +class EntityHorse; +class Inventory; + class HorseInventoryScreen : public AbstractContainerScreen { public: HorseInventoryScreen(std::shared_ptr inventory, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp index 6eba259de..7b6fce1c1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -1,14 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "InventoryScreen.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "../Font.h" -#include "../../renderer/entity/EntityRenderDispatcher.h" -#include "../../Lighting.h" -#include "../../renderer/Textures.h" -#include "../Button.h" -#include "../achievement/AchievementScreen.h" -#include "../achievement/StatsScreen.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" InventoryScreen::InventoryScreen(std::shared_ptr player) : AbstractContainerScreen(player->inventoryMenu) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h index d2a5307c7..78f640e48 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/InventoryScreen.h @@ -1,5 +1,8 @@ #pragma once +#include + #include "AbstractContainerScreen.h" + class Player; class Button; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp index 1b3749cb6..5d983f1ee 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -1,14 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "TextEditScreen.h" -#include "../Button.h" -#include "../../renderer/tileentity/TileEntityRenderDispatcher.h" -#include "../../multiplayer/ClientConnection.h" -#include "../../multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.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" const std::wstring TextEditScreen::allowedChars = SharedConstants::acceptableLetters; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.h index 0c0af219b..8f5aabbb1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.h @@ -1,5 +1,9 @@ #pragma once -#include "../Screen.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" + class SignTileEntity; class TextEditScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp index 101ad8f68..81428eed3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TrapScreen.cpp @@ -1,10 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "TrapScreen.h" -#include "../../player/LocalPlayer.h" -#include "../../renderer/Textures.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/TrapMenu.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_TRAP_LOCATION = ResourceLocation(TN_GUI_TRAP); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp index 9cbd2aa65..ba8dc4f33 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "GuiParticle.h" #include "java/Random.h" +#include "Minecraft.Client/Header Files/stubs.h" Random* GuiParticle::random = new Random(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.cpp index 9ba6e2f30..faf2c90bb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.cpp @@ -1,7 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "GuiParticles.h" #include "GuiParticle.h" -#include "../../renderer/Textures.h" GuiParticles::GuiParticles(Minecraft* mc) { this->mc = mc; } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h index f1dd8e426..ab6dfc265 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h @@ -1,5 +1,7 @@ #pragma once -#include "../GuiComponent.h" +#include + +#include "Minecraft.Client/net/minecraft/client/gui/GuiComponent.h" class GuiParticle; class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp index f2b6bae29..86d4d4c58 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DemoLevel.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" + +class LevelStorage; LevelSettings DemoLevel::DEMO_LEVEL_SETTINGS = LevelSettings(DemoLevel::DEMO_LEVEL_SEED, GameType::SURVIVAL, false, false, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h index b72e01832..31bdf3df3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/level/DemoLevel.h @@ -1,5 +1,14 @@ #pragma once +#include +#include +#include + #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" + +class Dimension; +class LevelSettings; +class LevelStorage; class DemoLevel : public Level { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp index 3e5acb73f..a2cda41d2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.cpp @@ -1,7 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h" +#include +#include +#include + #include "BatModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ambient/Bat.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" BatModel::BatModel() : Model() { texWidth = 64; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.h index 4e58fd0da..15e0be6f7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BatModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class BatModel : public Model { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.cpp index 1f758bf79..bd3290038 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include +#include +#include + #include "BlazeModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" BlazeModel::BlazeModel() : Model() { upperBodyParts = std::vector(12); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.h index 0cc447cee..f3506e3ab 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BlazeModel.h @@ -1,5 +1,9 @@ #pragma once -#include "geom/Model.h" +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class BlazeModel : public Model { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.cpp index f2c7b1327..c2914b36d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.cpp @@ -1,5 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "BoatModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" BoatModel::BoatModel() : Model() { cubes[0] = new ModelPart(this, 0, 8); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.h index e8cc7f2d7..dc4a80a79 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BoatModel.h @@ -1,6 +1,8 @@ #pragma once -#include "geom/Model.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" + +class ModelPart; class BoatModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.cpp index 2cd32730a..b5a994797 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include +#include +#include + #include "BookModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" BookModel::BookModel() { leftLid = (new ModelPart(this))->texOffs(0, 0)->addBox(-6, -5, 0, 6, 10, 0); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.h index 4ef9c5ff1..0d08c6241 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/BookModel.h @@ -1,6 +1,8 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class BookModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.cpp index 406a021b9..9f00bb80f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "ChestModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" ChestModel::ChestModel() { lid = ((new ModelPart(this, 0, 0)))->setTexSize(64, 64); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.h index c26e82be9..f5864e7a5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ChestModel.h @@ -1,8 +1,9 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" class Cube; +class ModelPart; class ChestModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.cpp index 3d34ab139..5d60b0a18 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include +#include +#include + #include "ChickenModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" ChickenModel::ChickenModel() : Model() { int yo = 16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.h index 87a130607..34f9f5ec8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ChickenModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class ChickenModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.cpp index 19b03d482..1bec3b31b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/CowModel.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "CowModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" CowModel::CowModel() : QuadrupedModel(12, 0) { head = new ModelPart(this, 0, 0); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.cpp index 1451b9d69..98a287026 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include +#include +#include + #include "CreeperModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" // 4J - added void CreeperModel::_init(float g) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.h index 7ebe59de2..512a4d761 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/CreeperModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class CreeperModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.cpp index 8bfe3a8c3..5cc33731b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/EndermanModel.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "EndermanModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" EndermanModel::EndermanModel() : HumanoidModel(0, -14, 64, 32) { carrying = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.cpp index 1668368b5..30d2f6630 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.cpp @@ -1,8 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "java/Random.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" #include "GhastModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" GhastModel::GhastModel() : Model() { int yoffs = -16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.h index ab7c6a823..8f822a5a2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/GhastModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class GhastModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp index 2cc16c302..21ceadebb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.cpp @@ -1,8 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "HumanoidModel.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h index 6f452966c..37f1164a6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h @@ -1,5 +1,8 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/Header Files/SkinBox.h" + +class ModelPart; class HumanoidModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.cpp index ccb1131ff..276ec5ea2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/LargeChestModel.cpp @@ -1,6 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "LargeChestModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" LargeChestModel::LargeChestModel() { lid = ((new ModelPart(this, 0, 0)))->setTexSize(128, 64); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp index 9a8d6c0d9..48f88e185 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.cpp @@ -1,8 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include + #include "LavaSlimeModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" LavaSlimeModel::LavaSlimeModel() { for (int i = 0; i < BODYCUBESLENGTH; i++) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h index ae5e4babd..89af592a2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class LavaSlimeModel : public Model { static const int BODYCUBESLENGTH = 8; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.cpp index aee2acf53..83e22fdad 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "LeashKnotModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" LeashKnotModel::LeashKnotModel() { _init(0, 0, 32, 32); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h index 9eedff3b5..42e3aded8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class LeashKnotModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.cpp index 7d0b2df80..9f0285ae5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "MinecartModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" MinecartModel::MinecartModel() : Model() { cubes[0] = new ModelPart(this, 0, 10); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.h index 6f3d13b3a..b023a8057 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/MinecartModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class MinecartModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp index fe4bb5d98..fe4f07a96 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.cpp @@ -1,8 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" #include "ModelHorse.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" ModelHorse::ModelHorse() { texWidth = 128; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.h b/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.h index 768a86e79..956b44ef7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ModelHorse.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class ModelHorse : public Model { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp index c0ee84ba8..cab74a860 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.cpp @@ -1,8 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "OcelotModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" const float OcelotModel::xo = 0; const float OcelotModel::yo = 16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.h index b5447f840..10efd9f11 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/OcelotModel.h @@ -1,6 +1,8 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class OcelotModel : public Model { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.cpp index b6c866e5c..bffb5e164 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/PigModel.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "PigModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" PigModel::PigModel() : QuadrupedModel(6, 0) { head->texOffs(16, 16)->addBox(-2.0f, 0.0f, -9.0f, 4, 3, 1, 0.0f); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp index e30a668c0..f8eb90600 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.cpp @@ -1,9 +1,12 @@ -#include "Vertex.h" -#include "Polygon.h" #include #include #include +#include "Vertex.h" +#include "Polygon.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" + _Polygon::_Polygon(const std::span vertices) : vertexCount(vertices.size()), vertices(vertices.begin(), vertices.end()) {} diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h index 68e3c1e0b..0d13bf529 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h @@ -2,10 +2,13 @@ #include #include + #include "Vertex.h" -#include "../renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" +class Tesselator; + class _Polygon { public: std::vector vertices; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.cpp index 3c9f8398a..e68e3f20e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "QuadrupedModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" QuadrupedModel::QuadrupedModel(int legSize, float g) : Model() { yHeadOffs = 8; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h index b890269fe..81178035a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class QuadrupedModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp index d5b2a52a6..141fe23c6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepFurModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include + #include "SheepFurModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" +#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" SheepFurModel::SheepFurModel() : QuadrupedModel(12, 0) { headXRot = 0.0f; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp index 208c0a04a..66e65ba04 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SheepModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include + #include "SheepModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" +#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" SheepModel::SheepModel() : QuadrupedModel(12, 0) { headXRot = 0.0f; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.cpp index afe06a020..2631f5b15 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.cpp @@ -1,6 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "SignModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" SignModel::SignModel() { cube = new ModelPart(this, 0, 0); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.h index f637bfa0a..e86ba19c1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SignModel.h @@ -1,8 +1,9 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" class Cube; +class ModelPart; class SignModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.cpp index 3bc6def33..69e3a3d52 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.cpp @@ -1,8 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "SilverfishModel.h" -#include "geom/Cube.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" const int SilverfishModel::BODY_SIZES[BODY_COUNT][3] = { {3, 2, 2}, {4, 3, 2}, {6, 4, 3}, {3, 3, 3}, {2, 2, 3}, {2, 1, 2}, {1, 1, 2}, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.h index 738eddbd9..c2b0fd87c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SilverfishModel.h @@ -1,6 +1,10 @@ #pragma once -#include "geom/Model.h" +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class SilverfishModel : public Model { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.cpp index 29634e164..ec0c9690c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "geom/ModelPart.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "SkeletonHeadModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" void SkeletonHeadModel::_init(int u, int v, int tw, int th) { texWidth = tw; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h index 2edc9bb24..49e14ddb5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h @@ -1,6 +1,8 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class SkeletonHeadModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp index e82f6a3f4..f12d72517 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SkeletonModel.cpp @@ -1,8 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "SkeletonModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h" +#include "Minecraft.Client/net/minecraft/client/model/ZombieModel.h" void SkeletonModel::_init(float g) { arm0 = new ModelPart(this, 24 + 16, 16); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.cpp index 74c576c76..be1ca26cb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.cpp @@ -1,5 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "SkiModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" + +class Entity; SkiModel::SkiModel() { _init(false); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.h index 8680ffc2a..e8886780a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SkiModel.h @@ -1,6 +1,12 @@ #pragma once -#include "geom/Model.h" -#include "geom/ModelPart.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" + +class Entity; +class ModelPart; class SkiModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.cpp index 7b0caabf4..9627f159a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "SlimeModel.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" SlimeModel::SlimeModel(int vOffs) { cube = new ModelPart(this, 0, vOffs); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.h index 8bd09ccfa..ed3815098 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SlimeModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class SlimeModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.cpp index 837a2b5f9..105d914a0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "SnowManModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" SnowManModel::SnowManModel() : Model() { float yOffset = 4; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.h index ce972545c..a52af2ac1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SnowManModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class SnowManModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp index 7abedce76..ec03df2b3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "SpiderModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" SpiderModel::SpiderModel() : Model() { float g = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.h index b5325fbbf..0a7994e9d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class SpiderModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.cpp index 7bd4d0ced..a36c85c99 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "SquidModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" SquidModel::SquidModel() : Model() { int yoffs = -16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.h index f10a0b23a..eb43a72c3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SquidModel.h @@ -1,5 +1,7 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class SquidModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp index 6c15a56d9..2315acebd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "geom/ModelPart.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "VillagerGolemModel.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" VillagerGolemModel::VillagerGolemModel(float g, float yOffset) { int xTexSize = 128; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h index f9c487e71..8c8519257 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h @@ -1,6 +1,6 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.cpp index 0795f82f6..16bddf33a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "VillagerModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" void VillagerModel::_init(float g, float yOffset, int xTexSize, int yTexSize) { head = (new ModelPart(this))->setTexSize(xTexSize, yTexSize); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.h index ee52cb7ae..1b33250ff 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerModel.h @@ -1,6 +1,8 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" + +class ModelPart; class VillagerModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.cpp index 9c3a3856d..7900ed73e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "geom/ModelPart.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "VillagerZombieModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" void VillagerZombieModel::_init(float g, float yOffset, bool isArmor) { delete head; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp index 5de0201f1..3fe915dac 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.cpp @@ -1,8 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "geom/ModelPart.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "WitchModel.h" #include "VillagerModel.h" #include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" WitchModel::WitchModel(float g) : VillagerModel(g, 0, 64, 128) { mole = (new ModelPart(this))->setTexSize(64, 128); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.h index 8ece6b581..2a5199844 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitchModel.h @@ -1,6 +1,8 @@ #pragma once #include "VillagerModel.h" +class ModelPart; + class WitchModel : public VillagerModel { public: bool holdingItem; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp index b8f140965..bc2445561 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "WitherBossModel.h" #include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" WitherBossModel::WitherBossModel() { texWidth = 64; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.h index 817d2ddd0..f7c91b12c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.h @@ -1,6 +1,6 @@ #pragma once -#include "geom/Model.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" class WitherBossModel : public Model { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp index c4749a515..4c5e95d49 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.cpp @@ -1,8 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "WolfModel.h" #include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" WolfModel::WolfModel() { float g = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h index 3ea897519..083ad0e26 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WolfModel.h @@ -1,7 +1,9 @@ #pragma once -#include "geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" #include "Minecraft.World/net/minecraft/world/entity/Mob.h" +class ModelPart; + class WolfModel : public Model { public: ModelPart *head, *body, *leg0, *leg1, *leg2, *leg3; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.cpp index deee14dba..5b16d5909 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/ZombieModel.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "ZombieModel.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32) {} diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp index 1dfbceb7b..3b46f09bc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "DragonModel.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h index 670dcfa1d..af24453ab 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h @@ -1,6 +1,6 @@ #pragma once -#include "../geom/Model.h" -#include "../geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" class DragonModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.cpp index 62a3800c6..2a9bbcbba 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.cpp @@ -1,5 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "EnderCrystalModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" EnderCrystalModel::EnderCrystalModel(float g) { glass = new ModelPart(this, L"glass"); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h index 68bb52d10..6b9ad7c4e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h @@ -1,6 +1,8 @@ #pragma once -#include "../geom/Model.h" -#include "../geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" + +class ModelPart; class EnderCrystalModel : public Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.cpp index c20ffde91..6232d7237 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.cpp @@ -1,9 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Model.h" -#include "ModelPart.h" -#include "../Vertex.h" -#include "Cube.h" #include +#include + +#include "ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/Vertex.h" +#include "Cube.h" +#include "Minecraft.Client/net/minecraft/client/model/Polygon.h" + +class Tesselator; // void Cube::addBox(float x0, float y0, float z0, int w, int h, int d, float g) Cube::Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h index 5ad0aa063..23e7cb17d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h @@ -1,11 +1,17 @@ #pragma once #include #include +#include + #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" -#include "../Vertex.h" -#include "../Polygon.h" +#include "Minecraft.Client/net/minecraft/client/model/Vertex.h" +#include "Minecraft.Client/net/minecraft/client/model/Polygon.h" class Model; +class ModelPart; +class Tesselator; +class Vertex; +class _Polygon; class Cube { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.cpp index 10721b929..1a7185ea1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TexOffs.h" #include "Model.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" Model::Model() { riding = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h index ee29f6d20..1904f4556 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h @@ -1,11 +1,19 @@ #pragma once +#include +#include +#include +#include + #include "java/Random.h" -#include "../../../../../Header Files/SkinBox.h" +#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/Header Files/SkinBox.h" + class Mob; class ModelPart; class TexOffs; class LivingEntity; +class Entity; class Model { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.cpp index 3b1f04986..70f00fd7c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.cpp @@ -1,7 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "TexOffs.h" #include "ModelPart.h" #include "Cube.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" const float ModelPart::RAD = (180.0f / std::numbers::pi); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h index 293b7f194..b086141f7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h @@ -1,11 +1,16 @@ #pragma once +#include +#include + #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" -#include "../Vertex.h" -#include "../Polygon.h" +#include "Minecraft.Client/net/minecraft/client/model/Vertex.h" +#include "Minecraft.Client/net/minecraft/client/model/Polygon.h" #include "Model.h" -#include "../../../../../Header Files/SkinBox.h" +#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/Header Files/SkinBox.h" class Cube; +class Model; class ModelPart { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.cpp index 9c84c06a7..454db3b31 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/TexOffs.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TexOffs.h" TexOffs::TexOffs(int x, int y) : x(x), y(y) {} \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp index 7d807a6b7..f45b89859 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp @@ -5,13 +5,13 @@ #include #include "MultiPlayerLevel.h" #include "MultiPlayerLocalPlayer.h" -#include "../../stats/StatsCounter.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "ReceivingLevelScreen.h" -#include "../player/RemotePlayer.h" +#include "Minecraft.Client/net/minecraft/client/player/RemotePlayer.h" #include "DisconnectedScreen.h" -#include "../particle/TakeAnimationParticle.h" -#include "../particle/CritParticle.h" -#include "../User.h" +#include "Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/CritParticle.h" +#include "Minecraft.Client/net/minecraft/client/User.h" #include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" @@ -39,17 +39,17 @@ #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/Pos.h" #include "Minecraft.Client/Common/Source Files/Network/Socket.h" -#include "../Minecraft.h" -#include "../ProgressRenderer.h" -#include "../renderer/LevelRenderer.h" -#include "../Options.h" -#include "../../server/MinecraftServer.h" -#include "../ClientConstants.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" #include "Minecraft.World/Header Files/SoundTypes.h" -#include "../skins/TexturePackRepository.h" -#include "../gui/MerchantScreen.h" -#include "../../../../Common/Source Files/UI/UI.h" -#include "../skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h" +#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" ClientConnection::ClientConnection(Minecraft* minecraft, const std::wstring& ip, int port) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp index ced8fb729..5c75a08a7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.cpp @@ -1,11 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "ConnectScreen.h" #include "ClientConnection.h" -#include "../title/TitleScreen.h" -#include "../gui/Button.h" -#include "../Minecraft.h" -#include "../User.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/User.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" ConnectScreen::ConnectScreen(Minecraft* minecraft, const std::wstring& ip, int port) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h index b0baab5e5..33322914d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h @@ -1,5 +1,8 @@ #pragma once -#include "../gui/Screen.h" +#include + +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" + class ClientConnection; class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp index edad74798..85762c2d2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.cpp @@ -1,8 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "DisconnectedScreen.h" -#include "../title/TitleScreen.h" -#include "../gui/Button.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" DisconnectedScreen::DisconnectedScreen(const std::wstring& title, const std::wstring reason, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.h index c3b84068d..b2c4ff6fc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/DisconnectedScreen.h @@ -1,5 +1,7 @@ #pragma once -#include "../gui/Screen.h" +#include + +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" class DisconnectedScreen : public Screen { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index 549933646..9fcc914f8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -1,14 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "MultiPlayerChunkCache.h" -#include "../../server/level/ServerChunkCache.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "java/Arrays.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../../server/MinecraftServer.h" -#include "../../server/level/ServerLevel.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelType.h" +#include "Minecraft.World/net/minecraft/world/level/LightLayer.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) { XZSIZE = level->dimension->getXZSize(); // 4J Added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h index 71bdc67f7..a3b92dc5d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.h @@ -1,10 +1,17 @@ #pragma once #include +#include +#include + #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class ServerChunkCache; +class Level; +class LevelChunk; // 4J - various alterations here to make this thread safe, and operate as a // fixed sized cache diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index e6e3886b4..6688f1684 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -1,17 +1,34 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "MultiPlayerGameMode.h" -#include "../../server/level/CreativeMode.h" #include "MultiPlayerLocalPlayer.h" #include "MultiPlayerLevel.h" -#include "../Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "ClientConnection.h" -#include "../renderer/LevelRenderer.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#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/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/TileItem.h" +#include "Minecraft.World/net/minecraft/world/item/WeaponItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "java/Class.h" MultiPlayerGameMode::MultiPlayerGameMode(Minecraft* minecraft, ClientConnection* connection) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h index c255c7b36..354c3eaae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h @@ -1,8 +1,18 @@ #pragma once -#include "../../server/level/GameMode.h" +#include + +#include "Minecraft.Client/net/minecraft/server/level/GameMode.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" + class ClientConnection; class GameType; class Vec3; +class Entity; +class Level; +class Minecraft; +class Player; +class Tutorial; class MultiPlayerGameMode { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 1dda463c3..d3869c9fc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -1,20 +1,43 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include +#include +#include +#include +#include +#include + #include "MultiPlayerLevel.h" #include "MultiPlayerLocalPlayer.h" #include "ClientConnection.h" #include "MultiPlayerChunkCache.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "../../server/MinecraftServer.h" -#include "../../server/level/ServerLevel.h" -#include "../Minecraft.h" -#include "../particle/FireworksParticles.h" -#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" #include "java/JavaMath.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" +#include "Minecraft.World/net/minecraft/world/level/GameRules.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#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 "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" + +class LevelSettings; +class Scoreboard; MultiPlayerLevel::ResetInfo::ResetInfo(int x, int y, int z, int tile, int data) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h index 0872cf8fe..af2754c1d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h @@ -1,12 +1,23 @@ #pragma once +#include +#include +#include +#include +#include + #include "Minecraft.World/ConsoleHelpers/HashExtension.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" #include "java/JavaIntHash.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" class ClientConnection; class MultiPlayerChunkCache; +class LevelSettings; +class Minecraft; +class Scoreboard; class MultiPlayerLevel : public Level { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index cb72cb1d8..af3b24815 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -1,19 +1,38 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "java/JavaMath.h" +#include + #include "MultiPlayerLocalPlayer.h" #include "ClientConnection.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "../player/Input.h" -#include "../renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/player/Input.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerClosePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" +#include "Minecraft.World/net/minecraft/stats/Stat.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" + +class User; // 4J added for testing #if defined(STRESS_TEST_MOVE) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h index 18c5b5c7b..ee38b103d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h @@ -1,11 +1,19 @@ #pragma once #include -#include "../player/LocalPlayer.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" class ClientConnection; class Minecraft; class Level; +class Stat; +class User; // #define STRESS_TEST_MOVE diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp index 71d9ce8e0..30de3e4c4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.cpp @@ -1,7 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "ReceivingLevelScreen.h" #include "ClientConnection.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" ReceivingLevelScreen::ReceivingLevelScreen(ClientConnection* connection) { tickCount = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.h index c49884eda..e59509222 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ReceivingLevelScreen.h @@ -1,5 +1,5 @@ #pragma once -#include "../gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" class ClientConnection; class ReceivingLevelScreen : public Screen { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp index 42c89c637..2eac00b58 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.cpp @@ -1,9 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "BreakingItemParticle.h" -#include "../renderer/Tesselator.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" + +class Level; +class Textures; void BreakingItemParticle::_init(Item* item, Textures* textures, int data) { this->setTex(textures, item->getIcon(data)); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h index 7fd7e5aab..c8e6978b2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h @@ -1,5 +1,10 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Item; +class Level; +class Textures; class BreakingItemParticle : public Particle { // virtual eINSTANCEOF GetType(); // 4J-IB/JEV TODO needs implementation diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp index f0c45e2b5..9704fdf6a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "BubbleParticle.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" BubbleParticle::BubbleParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h index 18ad2f785..ad9436128 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class BubbleParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp index 36f69aaa7..05afcf6d6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.cpp @@ -1,9 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "CritParticle.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" void CritParticle::_init(Level* level, std::shared_ptr entity, ePARTICLE_TYPE type) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h index 22ae938dd..88532bb6f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "Particle.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "java/Class.h" class Entity; +class Level; class CritParticle : public Particle { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.cpp index 79a91be92..2826e2a7d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "CritParticle2.h" #include "java/JavaMath.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; void CritParticle2::_init(double xa, double ya, double za, float scale) { xd *= 0.1f; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.h index 10fdffcb1..7777d21e3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle2.h @@ -1,6 +1,9 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class CritParticle2 : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp index a3fad3228..4e249c7c3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp @@ -1,6 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/JavaMath.h" #include "DragonBreathParticle.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" + +class Level; void DragonBreathParticle::init(Level* level, double x, double y, double z, double xa, double ya, double za, float scale) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h index dfb9cf2f2..0c5fed34e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class DragonBreathParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp index ad70defba..ea5b3945f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp @@ -1,10 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "java/JavaMath.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "DripParticle.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" DripParticle::DripParticle(Level* level, double x, double y, double z, Material* material) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.h index 7c0b62364..1c251a656 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.h @@ -1,6 +1,7 @@ #pragma once #include "Particle.h" +#include "java/Class.h" class Level; class Material; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp index d73f741a0..7dff4eea5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp @@ -1,6 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/JavaMath.h" #include "EnchantmentTableParticle.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" EchantmentTableParticle::EchantmentTableParticle(Level* level, double x, double y, double z, double xd, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h index 334655d5f..9dafb5f6b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h @@ -1,6 +1,7 @@ #pragma once #include "Particle.h" +#include "java/Class.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp index d5545ae98..03e8d64fe 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp @@ -1,7 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "EnderParticle.h" #include "java/JavaMath.h" #include "java/Random.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; // 4J Stu - This class was originally "PortalParticle" but I have split the two // uses of the particle End creatures/items (e.g. EnderMan, EyeOfEnder, etc) use diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.h index 5da1cf44d..4e078b2f2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; // 4J Stu - This class was originally "PortalParticle" but I have split the two // uses of the particle End creatures/items (e.g. EnderMan, EyeOfEnder, etc) use diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp index 25873ee2c..0e77cb60c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp @@ -1,7 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ExplodeParticle.h" #include "java/JavaMath.h" #include "java/Random.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; ExplodeParticle::ExplodeParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h index 6bace3ea0..22b88382c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class ExplodeParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp index 8ea22b88d..89dcbce5c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp @@ -1,8 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include +#include +#include +#include + #include "FireworksParticles.h" -#include "../renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/item/FireworksItem.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "nbt/Tag.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" FireworksParticles::FireworksStarter::FireworksStarter( Level* level, double x, double y, double z, double xd, double yd, double zd, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h index a86a68d82..89ccf0b81 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Particle.h" #include "nbt/CompoundTag.h" +#include "java/Class.h" class ParticleEngine; +class CompoundTag; +class Level; +template class ListTag; class FireworksParticles { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.cpp index 0601ca8b5..12f3d393a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/JavaMath.h" #include "java/Random.h" #include "FlameParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; FlameParticle::FlameParticle(Level* level, double x, double y, double z, double xd, double yd, double zd) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.h index a0fb9f691..3d492d71d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FlameParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class FlameParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp index 6d73fc6af..b1ee3c205 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.cpp @@ -1,10 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "FootstepParticle.h" -#include "../renderer/Textures.h" -#include "../renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "../resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" ResourceLocation FootstepParticle::FOOTPRINT_LOCATION = ResourceLocation(TN_MISC_FOOTSTEP); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h index 6f2b745a1..239a369c0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h @@ -1,6 +1,10 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + class Textures; +class Level; +class ResourceLocation; class FootstepParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.cpp index 6e98503e7..c5c5a0be4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.cpp @@ -1,5 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "HeartParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; // 4J - added void HeartParticle::init(Level* level, double x, double y, double z, double xa, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.h index 9c9ef358f..e4ec9c39a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HeartParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class HeartParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp index 36bcf60ba..9f057a2a1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp @@ -1,10 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "HugeExplosionParticle.h" #include "java/Random.h" -#include "../renderer/Textures.h" -#include "../renderer/Tesselator.h" -#include "../Lighting.h" -#include "../resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" + +class Level; ResourceLocation HugeExplosionParticle::EXPLOSION_LOCATION = ResourceLocation(TN_MISC_EXPLOSION); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h index 8afab6869..3a683680e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h @@ -1,6 +1,11 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; +class ResourceLocation; +class Textures; class HugeExplosionParticle : public Particle { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp index c2a4b609c..5cc73ddbe 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "HugeExplosionSeedParticle.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level* level, double x, double y, double z, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h index 0ed0b9e33..ac6d92be3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h @@ -1,6 +1,9 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class HugeExplosionSeedParticle : public Particle { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp index 3b1c6e764..a4bef5bdc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp @@ -1,8 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "LavaParticle.h" #include "java/JavaMath.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" LavaParticle::LavaParticle(Level* level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.h index de5f4f4b5..35acc40b2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class LavaParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp index d661b8a7b..f9bf0c2f8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp @@ -1,8 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "NetherPortalParticle.h" #include "java/JavaMath.h" #include "java/Random.h" -#include "../Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; // 4J Stu - This class was originally "PortalParticle" but I have split the two // uses of the particle Only the nether portal uses this particle diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h index a053d356e..87322f396 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; // 4J Stu - This class was originally "PortalParticle" but I have split the two // uses of the particle Only the nether portal uses this particle diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp index 1385de622..f8e60c08f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp @@ -1,6 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include + #include "NoteParticle.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; void NoteParticle::init(Level* level, double x, double y, double z, double xa, double ya, double za, float scale) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.h index 75af522d5..4e9b01c8d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class NoteParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp index bf96905d3..9dfb1aadf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.cpp @@ -1,10 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Particle.h" -#include "../renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" + +class Level; +class Textures; /* protected int tex; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h index 76375a1e1..594da9370 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h @@ -1,11 +1,17 @@ #pragma once +#include +#include + #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/Header Files/ParticleTypes.h" #include "ParticleEngine.h" + class Tesselator; class CompoundTag; class Icon; +class Level; +class Textures; class Particle : public Entity { protected: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp index 87ca06d70..cf5f1273f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp @@ -1,17 +1,25 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "ParticleEngine.h" #include "Particle.h" -#include "../renderer/Textures.h" -#include "../renderer/texture/TextureAtlas.h" -#include "../renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "TerrainParticle.h" -#include "../resources/ResourceLocation.h" -#include "../Camera.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/Camera.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "java/Class.h" +#include "java/Random.h" ResourceLocation ParticleEngine::PARTICLES_LOCATION = ResourceLocation(TN_PARTICLES); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h index 2a9c7f8b2..86f06d6db 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h @@ -1,10 +1,15 @@ #pragma once +#include +#include +#include + class Particle; class Level; class Textures; class Entity; class Random; +class ResourceLocation; class ParticleEngine { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp index a47903df5..cba1a4320 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.cpp @@ -1,9 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "PlayerCloudParticle.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" PlayerCloudParticle::PlayerCloudParticle(Level* level, double x, double y, double z, double xa, double ya, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.h index 7004eca2f..fccafb432 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/PlayerCloudParticle.h @@ -1,6 +1,9 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class PlayerCloudParticle : public Particle { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.cpp index bf768afb5..545a5ba9b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/JavaMath.h" #include "RedDustParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; void RedDustParticle::init(Level* level, double x, double y, double z, float scale, float rCol, float gCol, float bCol) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h index f5a5cc63c..2282b8b9a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class RedDustParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp index d7e1f3e91..7ef857059 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp @@ -1,6 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/JavaMath.h" #include "SmokeParticle.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; void SmokeParticle::init(Level* level, double x, double y, double z, double xa, double ya, double za, float scale) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h index f1cf05da5..08c07b4c5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class SmokeParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.cpp index 60e36491f..e7fade7b5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/JavaMath.h" #include "SnowShovelParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; void SnowShovelParticle::init(Level* level, double x, double y, double z, double xa, double ya, double za, float scale) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h index 065d45941..7d47e99ae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class SnowShovelParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.cpp index 2332bca7e..111f19e01 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.cpp @@ -1,6 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/JavaMath.h" #include "SpellParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; SpellParticle::SpellParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.h index 29e6d9721..e7e1afe55 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SpellParticle.h @@ -1,6 +1,9 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class SpellParticle : public Particle { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.cpp index 4c786d975..9ee1d931a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.cpp @@ -1,5 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "SplashParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h" + +class Level; SplashParticle::SplashParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.h index 3bcbccab0..0f23126e9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SplashParticle.h @@ -1,5 +1,8 @@ #pragma once #include "WaterDropParticle.h" +#include "java/Class.h" + +class Level; class SplashParticle : public WaterDropParticle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp index e866c214b..435aafef7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp @@ -1,10 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "SuspendedParticle.h" #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "java/JavaMath.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" SuspendedParticle::SuspendedParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h index d3843cc1c..2eb5b5cf9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h @@ -1,6 +1,9 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class SuspendedParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.cpp index 7d485e3f7..1b9cc7f63 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.cpp @@ -1,7 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "SuspendedTownParticle.h" #include "java/Random.h" #include "java/JavaMath.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" + +class Level; SuspendedTownParticle::SuspendedTownParticle(Level* level, double x, double y, double z, double xa, double ya, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h index d443456ec..a2f462659 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h @@ -1,6 +1,9 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class SuspendedTownParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp index 910ab54d0..069497dc8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.cpp @@ -1,9 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "TakeAnimationParticle.h" -#include "../renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Minecraft.World/net/minecraft/util/Mth.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" TakeAnimationParticle::TakeAnimationParticle(Level* level, std::shared_ptr item, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h index d1943b536..4575443a8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Particle.h" +#include "java/Class.h" + class Entity; +class Level; class TakeAnimationParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp index a2f375522..4cc07daa6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.cpp @@ -1,9 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TerrainParticle.h" -#include "../renderer/Tesselator.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" + +class Textures; TerrainParticle::TerrainParticle(Level* level, double x, double y, double z, double xa, double ya, double za, Tile* tile, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h index 28db9b2d8..8d185e70a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h @@ -1,6 +1,12 @@ #pragma once +#include + #include "Particle.h" +#include "java/Class.h" + class Tile; +class Level; +class Textures; class TerrainParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp index 93aa00677..d8f4a976b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.cpp @@ -1,9 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "WaterDropParticle.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" WaterDropParticle::WaterDropParticle(Level* level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h index a1e501a5c..d0d3b9774 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h @@ -1,5 +1,8 @@ #pragma once #include "Particle.h" +#include "java/Class.h" + +class Level; class WaterDropParticle : public Particle { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp index 5e15c6df4..cc3b37694 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/Input.cpp @@ -1,12 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../Minecraft.h" -#include "../../server/level/GameMode.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Input.h" #include "LocalPlayer.h" -#include "../Options.h" +#include "4J_Input.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" Input::Input() { xa = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.h b/minecraft/Minecraft.Client/net/minecraft/client/player/Input.h index fc2dc03dc..7bbf667bf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/Input.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/Input.h @@ -1,5 +1,6 @@ #pragma once class Player; +class LocalPlayer; class Input { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp index 2caab4abd..f4280210c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp @@ -1,66 +1,70 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "LocalPlayer.h" -#include "../gui/inventory/BeaconScreen.h" -#include "../gui/inventory/BrewingStandScreen.h" -#include "../gui/EnchantmentScreen.h" -#include "../gui/HopperScreen.h" -#include "../gui/inventory/HorseInventoryScreen.h" -#include "../gui/MerchantScreen.h" -#include "../gui/RepairScreen.h" -#include "../User.h" -#include "Input.h" -#include "../../stats/StatsCounter.h" -#include "../particle/ParticleEngine.h" -#include "../particle/TakeAnimationParticle.h" -#include "../Options.h" -#include "../gui/inventory/TextEditScreen.h" -#include "../gui/inventory/ContainerScreen.h" -#include "../gui/inventory/CraftingScreen.h" -#include "../gui/inventory/FurnaceScreen.h" -#include "../gui/inventory/TrapScreen.h" +#include +#include +#include +#include +#include -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../../server/level/CreativeMode.h" -#include "../renderer/GameRenderer.h" -#include "../renderer/ItemInHandRenderer.h" +#include "LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/User.h" +#include "Input.h" +#include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "Minecraft.Client/net/minecraft/client/particle/TakeAnimationParticle.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" #include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" -#include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" -#include "nbt/com.mojang.nbt.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "../gui/achievement/AchievementPopup.h" -#include "../particle/CritParticle.h" - +#include "Minecraft.Client/net/minecraft/client/particle/CritParticle.h" // 4J : WESTY : Added for new achievements. #include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/item/MapItem.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" - // 4J Stu - Added for tutorial callbacks -#include "../Minecraft.h" - -#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" -#include "Minecraft.World/net/minecraft/world/entity/item/Boat.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/Pig.h" - -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" - -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" - #include "Minecraft.World/net/minecraft/stats/CommonStats.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/App_structs.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/stats/Achievement.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/stats/Stat.h" +#include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" +#include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/food/FoodConstants.h" +#include "Minecraft.World/net/minecraft/world/food/FoodData.h" +#include "Minecraft.World/net/minecraft/world/item/BowItem.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.World/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user, int dimension) @@ -1204,6 +1208,9 @@ void LocalPlayer::setAndBroadcastCustomCape(std::uint32_t capeId) { // 4J TODO - Remove #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" + +class ModelPart; + void LocalPlayer::mapPlayerChunk(const unsigned int flagTileType) { int cx = this->xChunk; int cz = this->zChunk; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h index d901189b5..299cd42a1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.h @@ -1,8 +1,16 @@ #pragma once #include +#include +#include +#include + #include "Minecraft.World/net/minecraft/util/SmoothFloat.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "java/Class.h" + class Level; class User; class CompoundTag; @@ -13,6 +21,7 @@ class Container; class Input; class Stat; class Minecraft; +class ModelPart; // Time in seconds before the players presence is update to Idle #define PLAYER_IDLE_TIME 300 diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp index 6d5ffbcb2..f8351b68e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.cpp @@ -1,7 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "RemotePlayer.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" + +class Level; RemotePlayer::RemotePlayer(Level* level, const std::wstring& name) : Player(level, name) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h index 8a493feed..e3f9b177b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/RemotePlayer.h @@ -1,8 +1,15 @@ #pragma once +#include + #include "Minecraft.World/net/minecraft/util/SmoothFloat.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "java/Class.h" class Input; +class Level; class RemotePlayer : public Player { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp index 259fe5766..ebd062d56 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "BossMobGuiInfo.h" #include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" float BossMobGuiInfo::healthProgress = 0.0f; int BossMobGuiInfo::displayTicks = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h index 62adb4580..3193b008d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + class BossMob; class BossMobGuiInfo { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp index 20c7a61d0..b59e635a9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp @@ -1,15 +1,28 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Chunk.h" -#include "TileRenderer.h" -#include "tileentity/TileEntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "LevelRenderer.h" -#include "../../../../Header Files/FrameProfiler.h" +#include +#include #include #include +#include +#include +#include + +#include "Chunk.h" +#include "TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "LevelRenderer.h" +#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/Region.h" +#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/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" int Chunk::updates = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h index 3c955216b..b978c7a8d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h @@ -1,12 +1,20 @@ #pragma once -#include "culling/AllowAllCuller.h" +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h" #include "Tesselator.h" #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "LevelRenderer.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" class Level; class TileEntity; class Entity; +class Chunk; +class Culler; class ClipChunk { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp index 39fb071a8..1960a67eb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.cpp @@ -1,7 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DirtyChunkSorter.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Chunk.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" DirtyChunkSorter::DirtyChunkSorter(std::shared_ptr cameraEntity, int playerIndex) // 4J - added player index diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.h index cc5d1aeac..7aeaaaf95 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DirtyChunkSorter.h @@ -1,6 +1,9 @@ #pragma once +#include + class Chunk; class Mob; +class LivingEntity; class DirtyChunkSorter { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp index 57a3ce1e5..dafc56388 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.cpp @@ -1,7 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DistanceChunkSorter.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Chunk.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" DistanceChunkSorter::DistanceChunkSorter(std::shared_ptr player) { ix = -player->x; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.h index 66c38fd3e..f309a09ad 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/DistanceChunkSorter.h @@ -1,4 +1,6 @@ #pragma once +#include + class Entity; class Chunk; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp index 661ffb228..b4dd1292f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.cpp @@ -1,8 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "EntityTileRenderer.h" -#include "tileentity/TileEntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h" EntityTileRenderer* EntityTileRenderer::instance = new EntityTileRenderer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.h index e7cfb7112..fb3b135ae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/EntityTileRenderer.h @@ -1,5 +1,7 @@ #pragma once +#include + class ChestTileEntity; class EnderChestTileEntity; class Tile; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp index 8db981075..7931ed35a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp @@ -1,35 +1,27 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include + #include "GameRenderer.h" #include "ItemInHandRenderer.h" #include "LevelRenderer.h" -#include "culling/Frustum.h" -#include "culling/FrustumCuller.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" #include "Textures.h" #include "Tesselator.h" -#include "../particle/ParticleEngine.h" -#include "../particle/SmokeParticle.h" -#include "../particle/WaterDropParticle.h" -#include "../../server/level/GameMode.h" -#include "../../server/level/CreativeMode.h" -#include "../Lighting.h" -#include "../Options.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../gui/particle/GuiParticles.h" -#include "../multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/WaterDropParticle.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Chunk.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "java/System.h" #include "java/FloatBuffer.h" -#include "Minecraft.World/ConsoleHelpers/ThreadName.h" #include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" @@ -39,18 +31,57 @@ #include "Minecraft.World/net/minecraft/util/SmoothFloat.h" #include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "../Camera.h" +#include "Minecraft.Client/net/minecraft/client/Camera.h" #include "Minecraft.World/Header Files/SoundTypes.h" -#include "../model/HumanoidModel.h" -#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" #include "Minecraft.World/Header Files/compression.h" -#include "../../../../Common/ShutdownManager.h" +#include "Minecraft.Client/Common/ShutdownManager.h" #include "BossMobGuiInfo.h" - -#include "../skins/TexturePackRepository.h" -#include "../skins/TexturePack.h" -#include "texture/TextureAtlas.h" -#include "../../../../Header Files/FrameProfiler.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#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/net/minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#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 "java/Class.h" +#include "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" +#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "Minecraft.Client/Header Files/stubs.h" bool GameRenderer::anaglyph3d = false; int GameRenderer::anaglyphPass = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h index 3121aad5a..a98bf0670 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h @@ -1,4 +1,16 @@ #pragma once +#include +#include +#include +#include +#include + +#include "Minecraft.World/net/minecraft/util/SmoothFloat.h" +#include "Minecraft.World/ConsoleHelpers/C4JThread.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "Minecraft.Client/Common/App_Defines.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" + class Minecraft; class Entity; class Random; @@ -8,11 +20,10 @@ class DataLayer; class SparseLightStorage; class CompressedTileStorage; class SparseDataStorage; - -#include -#include "Minecraft.World/net/minecraft/util/SmoothFloat.h" -#include "Minecraft.World/ConsoleHelpers/C4JThread.h" -#include "../resources/ResourceLocation.h" +class Level; +class LevelRenderer; +class Player; +class ResourceLocation; class GameRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.cpp index da7bcc44b..2d76d1b74 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "HttpTexture.h" HttpTexture::HttpTexture(const std::wstring& _url, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.h index 4737b13f0..aba341884 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/HttpTexture.h @@ -1,4 +1,6 @@ #pragma once +#include + class BufferedImage; class HttpTextureProcessor; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp index 2f89ff525..1299b2d3b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -1,22 +1,47 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "ItemInHandRenderer.h" #include "TileRenderer.h" #include "Tesselator.h" #include "Textures.h" -#include "texture/TextureAtlas.h" -#include "entity/EntityRenderer.h" -#include "entity/PlayerRenderer.h" -#include "entity/EntityRenderDispatcher.h" -#include "../Lighting.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../gui/Minimap.h" -#include "../multiplayer/MultiPlayerLevel.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#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/BowItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" +#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 "java/System.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class EntityRenderer; +class MapItemSavedData; ResourceLocation ItemInHandRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h index 5be62cbbe..f2c7cbd1a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h @@ -1,11 +1,15 @@ #pragma once +#include + class Minecraft; class ItemInstance; class Minimap; class LivingEntity; class TileRenderer; class Tesselator; +class Icon; +class ResourceLocation; class ItemInHandRenderer { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp index c1423406f..2f03a6ae9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp @@ -1,71 +1,111 @@ -#include -#include +#include +#include +#include +#include #include #include - -#include "Minecraft.World/Header Files/stdafx.h" -#include "LevelRenderer.h" #include +#include +#include +#include +#include + +#include "LevelRenderer.h" #include "Textures.h" -#include "texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Tesselator.h" #include "Chunk.h" -#include "entity/EntityRenderDispatcher.h" -#include "tileentity/TileEntityRenderDispatcher.h" -#include "DistanceChunkSorter.h" -#include "DirtyChunkSorter.h" -#include "MobSkinTextureProcessor.h" -#include "../../../../Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" +#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" #include "GameRenderer.h" -#include "../particle/BubbleParticle.h" -#include "../particle/SmokeParticle.h" -#include "../particle/NoteParticle.h" -#include "../particle/NetherPortalParticle.h" -#include "../particle/EnderParticle.h" -#include "../particle/ExplodeParticle.h" -#include "../particle/FlameParticle.h" -#include "../particle/LavaParticle.h" -#include "../particle/FootstepParticle.h" -#include "../particle/SplashParticle.h" -#include "../particle/SmokeParticle.h" -#include "../particle/RedDustParticle.h" -#include "../particle/BreakingItemParticle.h" -#include "../particle/SnowShovelParticle.h" -#include "../particle/BreakingItemParticle.h" -#include "../particle/HeartParticle.h" -#include "../particle/HugeExplosionParticle.h" -#include "../particle/HugeExplosionSeedParticle.h" -#include "../particle/SuspendedParticle.h" -#include "../particle/SuspendedTownParticle.h" -#include "../particle/CritParticle2.h" -#include "../particle/TerrainParticle.h" -#include "../particle/SpellParticle.h" -#include "../particle/DripParticle.h" -#include "../particle/EnchantmentTableParticle.h" -#include "../particle/DragonBreathParticle.h" -#include "../particle/FireworksParticles.h" -#include "../Lighting.h" -#include "../Options.h" -#include "../multiplayer/MultiPlayerChunkCache.h" +#include "Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/NoteParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/EnderParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/FlameParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/LavaParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/FootstepParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/SplashParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/RedDustParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/BreakingItemParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/SnowShovelParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/HeartParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/SuspendedTownParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/CritParticle2.h" +#include "Minecraft.Client/net/minecraft/client/particle/TerrainParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/SpellParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/DripParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.h" +#include "Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.World/Header Files/ParticleTypes.h" -#include "java/IntBuffer.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "java/System.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "../multiplayer/MultiPlayerLocalPlayer.h" -#include "../multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.World/Header Files/SoundTypes.h" -#include "culling/FrustumCuller.h" -#include "../../../../Header Files/FrameProfiler.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" +#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Profile.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" +#include "Minecraft.World/net/minecraft/world/item/DyePowderItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/item/RecordingItem.h" +#include "Minecraft.World/net/minecraft/world/level/BlockDestructionProgress.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/EggTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LeafTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.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/net/minecraft/world/phys/HitResult.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/particle/Particle.h" +#include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "Minecraft.Client/Header Files/stubs.h" + +class Icon; +class ItemInstance; // #define DISABLE_SPU_CODE diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h index e2d7c5f01..a1eadd97c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h @@ -4,11 +4,31 @@ #include "OffsettedRenderList.h" #include "java/JavaIntHash.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" +#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" + +class ClipChunk; +class HitResult; +class Icon; +class ItemInstance; +class LivingEntity; +class Player; +class ResourceLocation; #if !defined(__linux__) #include #endif +#include +#include #include #include +#include +#include +#include +#include +#include + class MultiPlayerLevel; class Textures; class Chunk; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp index ab3e6c130..cca3fc60a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp @@ -1,5 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../Header Files/MemTexture.h" +#include +#include + +#include "Minecraft.Client/Header Files/MemTexture.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" + +class MemTextureProcessor; MemTexture::MemTexture(const std::wstring& _url, std::uint8_t* pbData, std::uint32_t dataBytes, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp index bd84aac72..2bc541b36 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp @@ -1,5 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Header Files/stubs.h" BufferedImage* MobSkinMemTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp index 1f32b9f1c..96db97b86 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp @@ -1,5 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "MobSkinTextureProcessor.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Header Files/stubs.h" BufferedImage* MobSkinTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.cpp index 6dfa7d37d..2f2c6a82a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/OffsettedRenderList.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "java/IntBuffer.h" #include "OffsettedRenderList.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" // 4J added OffsettedRenderList::OffsettedRenderList() { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.cpp index 67229d552..d9a6f51fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Rect2i.cpp @@ -1,4 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Rect2i.h" Rect2i::Rect2i(int x, int y, int width, int height) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp index df8982744..7145c258b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp @@ -1,8 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "Tesselator.h" -#include "java/FloatBuffer.h" -#include "java/IntBuffer.h" -#include "java/ByteBuffer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/Header Files/stubs.h" bool Tesselator::TRIANGLE_MODE = false; bool Tesselator::USE_VBO = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h index 6b213c188..60d7c5b19 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h @@ -1,6 +1,11 @@ #pragma once +#include +#include +#include + class ChunkRebuildData; +class IntBuffer; class Tesselator { // private static bool TRIANGLE_MODE = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp index a2c735d4d..874acd46b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp @@ -1,24 +1,32 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include + #include "Textures.h" -#include "../skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "HttpTexture.h" -#include "../../../../Header Files/MemTexture.h" -#include "java/InputOutputStream/InputStream.h" -#include "java/IntBuffer.h" +#include "Minecraft.Client/Header Files/MemTexture.h" #include "java/ByteBuffer.h" -#include "../skins/TexturePack.h" -#include "../Options.h" -#include "../../../../Header Files/MemTextureProcessor.h" -#include "../../../../Header Files/MobSkinMemTextureProcessor.h" -#include "texture/PreStitchedTextureMap.h" -#include "texture/StitchedTexture.h" -#include "texture/Texture.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/Header Files/MemTextureProcessor.h" +#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "java/Buffer.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" // Linux/PC port: disable mipmapping globally so textures are always sampled // from the full-resolution level 0 with GL_NEAREST, giving pixel-crisp diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h index ad8b6a9a0..aa46ee12b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h @@ -1,5 +1,12 @@ #pragma once +#include +#include +#include +#include +#include + #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" +#include "4J.Render/4J_Render.h" class Icon; class Entity; @@ -11,7 +18,6 @@ class TexturePackRepository; class HttpTextureProcessor; class MemTextureProcessor; class Options; - class IntBuffer; class PreStitchedTextureMap; class ResourceLocation; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp index 1b96b2f0b..877ac5fbb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp @@ -1,19 +1,69 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include #include "TileRenderer.h" -#include #include "GameRenderer.h" -#include "../Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Textures.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/material/net.minecraft.world.level.material.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "Tesselator.h" -#include "../../../../Header Files/FrameProfiler.h" +#include "Minecraft.Client/Header Files/FrameProfiler.h" #include "EntityTileRenderer.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSource.h" +#include "Minecraft.World/net/minecraft/world/level/material/Material.h" +#include "Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BeaconTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BedTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/CauldronTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/CocoaTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ComparatorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DeadBushTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DiodeTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DirectionalTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/DoorTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/EggTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FenceGateTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FenceTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FlowerPotTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/GrassTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/HopperTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/QuartzBlockTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RailTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StainedGlassPaneBlock.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StairTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/StemTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TheEndPortalFrameTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TripWireSourceTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TripWireTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/WallTile.h" +#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" bool TileRenderer::fancy = true; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h index beb3f7728..ab0d34771 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + class Level; class LevelSource; class Tile; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.cpp index 5ee13c54f..4229ae834 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "AllowAllCuller.h" +class AABB; + bool AllowAllCuller::isVisible(AABB* bb) { return true; } bool AllowAllCuller::cubeInFrustum(double x0, double y0, double z0, double x1, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h index 3851d6114..19613c102 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h @@ -1,6 +1,8 @@ #pragma once #include "Culler.h" +class AABB; + class AllowAllCuller { public: virtual bool isVisible(AABB* bb); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.cpp index a2e84f439..b51cf33ae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.cpp @@ -1,7 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "java/FloatBuffer.h" #include "Frustum.h" -#include "../../Camera.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" + +class FrustumData; Frustum* Frustum::frustum = new Frustum(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h index a556a919c..c3c4c86cc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h @@ -1,6 +1,8 @@ #pragma once #include "FrustumData.h" +class FloatBuffer; + class Frustum : public FrustumData { private: static Frustum* frustum; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp index 9d6828b63..95c3e5577 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.cpp @@ -1,5 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "FrustumCuller.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h" +#include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h" FrustumCuller::FrustumCuller() { frustum = Frustum::getFrustum(); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h index d34acd358..1f842adb4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h @@ -1,8 +1,10 @@ #pragma once -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Culler.h" #include "Frustum.h" +class FrustumData; + class FrustumCuller : public Culler { public: FrustumData* frustum; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp index 0c6f2fefd..d6b708f09 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "FrustumData.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" // float** m_Frustum; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h index f18ff4ab9..dd9fde6ac 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Minecraft.World/net/minecraft/world/phys/AABB.h" +class AABB; + class FrustumData { public: // enum FrustumSide diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp index dea9e9be3..8aa86193b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.cpp @@ -1,6 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "ViewportCuller.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" ViewportCuller::Face::Face(double x, double y, double z, float yRot, float xRot) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h index 355de6f6b..f97c3dd8b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/ViewportCuller.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "Culler.h" #include "Minecraft.World/net/minecraft/world/entity/Mob.h" class Mob; +class AABB; +class LivingEntity; + class ViewportCuller : public Culler { private: class Face { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp index 3a01c3651..d8a84e44f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -1,7 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "ArrowRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.h index 5b79a83f7..aff56726a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ArrowRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "EntityRenderer.h" +class ResourceLocation; + class ArrowRenderer : public EntityRenderer { private: static ResourceLocation ARROW_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp index 9007d963e..68f7265f1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.cpp @@ -1,7 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h" +#include +#include + #include "BatRenderer.h" -#include "../../model/BatModel.h" +#include "Minecraft.Client/net/minecraft/client/model/BatModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/ambient/Bat.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation BatRenderer::BAT_LOCATION = ResourceLocation(TN_MOB_BAT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.h index 3006efac6..98a1450b8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BatRenderer.h @@ -2,6 +2,7 @@ #include "MobRenderer.h" class BatModel; +class ResourceLocation; class BatRenderer : public MobRenderer { static ResourceLocation BAT_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp index 09e3deda2..554771f2d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.cpp @@ -1,7 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../model/BlazeModel.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include + +#include "Minecraft.Client/net/minecraft/client/model/BlazeModel.h" #include "BlazeRenderer.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Blaze.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.h index 992e8d04f..b6bb36b4d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BlazeRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "MobRenderer.h" +class ResourceLocation; + class BlazeRenderer : public MobRenderer { private: static ResourceLocation BLAZE_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp index f61779792..99e12f22c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.cpp @@ -1,8 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "BoatRenderer.h" -#include "../../model/BoatModel.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.Client/net/minecraft/client/model/BoatModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Boat.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.h index b1a5c83ce..f7e0958d6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/BoatRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "EntityRenderer.h" +class Model; +class ResourceLocation; + class BoatRenderer : public EntityRenderer { private: static ResourceLocation BOAT_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp index a3cc1ccec..26a98e64c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp @@ -1,5 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "CaveSpiderRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation CaveSpiderRenderer::CAVE_SPIDER_LOCATION = ResourceLocation(TN_MOB_CAVE_SPIDER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.h index 97314abfa..67b04b4bd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CaveSpiderRenderer.h @@ -2,6 +2,7 @@ #include "SpiderRenderer.h" class CaveSpider; +class ResourceLocation; class CaveSpiderRenderer : public SpiderRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp index cf9b9bcb7..2c5d92fad 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.cpp @@ -1,7 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include +#include + #include "ChickenRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Chicken.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.h index a441a3067..7e5e9409b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ChickenRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class ChickenRenderer : public MobRenderer { private: static ResourceLocation CHICKEN_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.cpp index d6223b37b..81f5a0c00 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.cpp @@ -1,5 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "CowRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation CowRenderer::COW_LOCATION = ResourceLocation(TN_MOB_COW); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.h index 4f932c980..11e1e70bd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CowRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class CowRenderer : public MobRenderer { private: static ResourceLocation COW_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp index 073e71522..ca2c8e903 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.cpp @@ -1,8 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "CreeperRenderer.h" -#include "../../model/CreeperModel.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.Client/net/minecraft/client/model/CreeperModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Creeper.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation CreeperRenderer::POWER_LOCATION = ResourceLocation(TN_POWERED_CREEPER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.h index 05651815b..e27ab24ea 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/CreeperRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class CreeperRenderer : public MobRenderer { private: static ResourceLocation POWER_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.cpp index dfe692736..e70de4d7b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.cpp @@ -1,6 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DefaultRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "4J.Render/4J_Render.h" void DefaultRenderer::render(std::shared_ptr entity, double x, double y, double z, float rot, float a) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.h index 81449a59f..c30a97d84 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/DefaultRenderer.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "EntityRenderer.h" class DefaultRenderer : public EntityRenderer { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp index a99420abd..f935b4e3a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../model/dragon/EnderCrystalModel.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystalRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index e39c48586..db83e0d18 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../model/dragon/DragonModel.h" +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "../Tesselator.h" -#include "../../Lighting.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" #include "EnderDragonRenderer.h" -#include "../BossMobGuiInfo.h" +#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" ResourceLocation EnderDragonRenderer::DRAGON_EXPLODING_LOCATION = ResourceLocation(TN_MOB_ENDERDRAGON_SHUFFLE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp index 3ffb686ad..9a4dcb5ef 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -1,9 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "EndermanRenderer.h" -#include "../../model/EndermanModel.h" -#include "../texture/TextureAtlas.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/net/minecraft/client/model/EndermanModel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/EnderMan.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation EndermanRenderer::ENDERMAN_EYES_LOCATION = ResourceLocation(TN_MOB_ENDERMAN_EYES); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.h index 408669205..4df34c0eb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EndermanRenderer.h @@ -1,8 +1,10 @@ #pragma once #include "MobRenderer.h" +#include "java/Random.h" class EnderMan; class EndermanModel; +class ResourceLocation; class EndermanRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index b7009bca6..971b25328 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "EntityRenderDispatcher.h" #include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" #include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" @@ -58,27 +58,27 @@ #include "TntMinecartRenderer.h" #include "MinecartSpawnerRenderer.h" #include "HorseRenderer.h" -#include "../../model/SpiderModel.h" -#include "../../model/PigModel.h" -#include "../../model/SheepModel.h" -#include "../../model/CowModel.h" -#include "../../model/WolfModel.h" -#include "../../model/ChickenModel.h" -#include "../../model/CreeperModel.h" -#include "../../model/SlimeModel.h" -#include "../../model/GhastModel.h" -#include "../../model/SquidModel.h" -#include "../../model/MinecartModel.h" -#include "../../model/BoatModel.h" -#include "../../model/HumanoidModel.h" -#include "../../model/SheepFurModel.h" -#include "../../model/SkeletonModel.h" -#include "../../model/ModelHorse.h" -#include "../../Options.h" +#include "Minecraft.Client/net/minecraft/client/model/SpiderModel.h" +#include "Minecraft.Client/net/minecraft/client/model/PigModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SheepModel.h" +#include "Minecraft.Client/net/minecraft/client/model/CowModel.h" +#include "Minecraft.Client/net/minecraft/client/model/WolfModel.h" +#include "Minecraft.Client/net/minecraft/client/model/ChickenModel.h" +#include "Minecraft.Client/net/minecraft/client/model/CreeperModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SlimeModel.h" +#include "Minecraft.Client/net/minecraft/client/model/GhastModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SquidModel.h" +#include "Minecraft.Client/net/minecraft/client/model/MinecartModel.h" +#include "Minecraft.Client/net/minecraft/client/model/BoatModel.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SheepFurModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SkeletonModel.h" +#include "Minecraft.Client/net/minecraft/client/model/ModelHorse.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "ItemFrameRenderer.h" #include "OcelotRenderer.h" #include "VillagerGolemRenderer.h" -#include "../../model/OcelotModel.h" +#include "Minecraft.Client/net/minecraft/client/model/OcelotModel.h" #include "ZombieRenderer.h" #include "BatRenderer.h" #include "CaveSpiderRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp index ad738e509..a66c0f78b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -1,17 +1,24 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "EntityRenderer.h" #include "EntityRenderDispatcher.h" -#include "../../model/HumanoidModel.h" -#include "../../player/LocalPlayer.h" -#include "../../Options.h" -#include "../texture/TextureAtlas.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Animal.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "java/Class.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation EntityRenderer::SHADOW_LOCATION = ResourceLocation(TN__CLAMP__MISC_SHADOW); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h index f84682d89..a585ed8ed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h @@ -1,10 +1,13 @@ #pragma once -#include "../../model/geom/Model.h" -#include "../TileRenderer.h" -#include "../Tesselator.h" -#include "../Textures.h" -#include "../ItemInHandRenderer.h" -#include "../../resources/ResourceLocation.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" class Tile; class Entity; @@ -12,9 +15,10 @@ class Level; class AABB; class IconRegister; class ResourceLocation; - class EntityRenderDispatcher; class Font; +class Model; +class TileRenderer; // 4J - this was originally a generic of type EntityRenderer class EntityRenderer { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index eaf3a0093..1513b31e5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -1,12 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "ExperienceOrbRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "../Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "java/JavaMath.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION = ResourceLocation(TN_ITEM_EXPERIENCE_ORB); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.h index 7ee5b6a0e..5265164d6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "EntityRenderer.h" +class ResourceLocation; + class ExperienceOrbRenderer : public EntityRenderer { private: static ResourceLocation XP_ORB_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp index 00999b033..a5c426832 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -1,11 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "FallingTileRenderer.h" -#include "../texture/TextureAtlas.h" -#include "../TileRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "EntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/AnvilTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" FallingTileRenderer::FallingTileRenderer() : EntityRenderer() { tileRenderer = new TileRenderer(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.h index ad0e5b4c3..0836ac3b6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FallingTileRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "EntityRenderer.h" +class TileRenderer; + class FallingTileRenderer : public EntityRenderer { private: TileRenderer* tileRenderer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp index e3cf21f83..43b032a89 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FireballRenderer.cpp @@ -1,12 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "FireballRenderer.h" #include "EntityRenderDispatcher.h" -#include "../texture/TextureAtlas.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/phys/AABB.h" +#include "java/Class.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" FireballRenderer::FireballRenderer(float scale) { this->scale = scale; } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp index ff3ff64b3..a06cca3e8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -1,12 +1,20 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "FishingHookRenderer.h" #include "EntityRenderDispatcher.h" -#include "../../Options.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.World/net/minecraft/util/Mth.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation FishingHookRenderer::PARTICLE_LOCATION = ResourceLocation(TN_PARTICLES); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.h index dd9cd4162..fad88240b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/FishingHookRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "EntityRenderer.h" +class ResourceLocation; + class FishingHookRenderer : public EntityRenderer { private: static ResourceLocation PARTICLE_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp index d1d3dd654..f8ccceb28 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.cpp @@ -1,7 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "GhastRenderer.h" -#include "../../model/GhastModel.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.Client/net/minecraft/client/model/GhastModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Ghast.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation GhastRenderer::GHAST_LOCATION = ResourceLocation(TN_MOB_GHAST); ResourceLocation GhastRenderer::GHAST_SHOOTING_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.h index f4a092a12..0b1c40306 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GhastRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "MobRenderer.h" +class ResourceLocation; + class GhastRenderer : public MobRenderer { private: static ResourceLocation GHAST_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.cpp index 6b9d0ce7b..648199ca0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.cpp @@ -1,5 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "GiantMobRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation GiantMobRenderer::ZOMBIE_LOCATION = ResourceLocation(TN_ITEM_ARROWS); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.h index c17f5742c..29fbe82c1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/GiantMobRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class GiantMobRenderer : public MobRenderer { private: static ResourceLocation ZOMBIE_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp index 02559ee7a..23f92f940 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.cpp @@ -1,8 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "HorseRenderer.h" #include "MobRenderer.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation HorseRenderer::HORSE_LOCATION = ResourceLocation(TN_MOB_HORSE_WHITE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.h index 2858652ea..8cca9a9ae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HorseRenderer.h @@ -1,9 +1,15 @@ #pragma once +#include +#include +#include + #include "MobRenderer.h" -#include "../../resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" class EntityHorse; class PathfinderMob; +class Model; +class ResourceLocation; class HorseRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index 0de3fb8a9..977a03264 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -1,14 +1,27 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "HumanoidMobRenderer.h" -#include "../tileentity/SkullTileRenderer.h" -#include "../../model/HumanoidModel.h" -#include "../../model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/item/ArmorItem.h" +#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 "nbt/CompoundTag.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" const std::wstring HumanoidMobRenderer::MATERIAL_NAMES[5] = { L"cloth", L"chain", L"iron", L"diamond", L"gold"}; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h index 30f2c69c4..4425da096 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h @@ -1,9 +1,16 @@ #pragma once +#include +#include +#include + #include "MobRenderer.h" class HumanoidModel; class Giant; class ArmorItem; +class Entity; +class ItemInstance; +class ResourceLocation; class HumanoidMobRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp index 681d634bc..eeccc9f3b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.cpp @@ -1,23 +1,33 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "ItemRenderer.h" -#include "../TileRenderer.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" #include "EntityRenderDispatcher.h" // #include "ItemFrame" #include "ItemFrameRenderer.h" -#include "../texture/TextureAtlas.h" - -#include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../../Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "../texture/custom/CompassTexture.h" -#include "../../gui/Minimap.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h" +#include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/Direction.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/IconRegister.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#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/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class MapItemSavedData; ResourceLocation ItemFrameRenderer::MAP_BACKGROUND_LOCATION = ResourceLocation(TN_MISC_MAPBG); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.h index 02e32a167..d7f2d5a02 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemFrameRenderer.h @@ -1,6 +1,12 @@ #pragma once +#include + #include "EntityRenderer.h" +class Icon; +class ItemFrame; +class ResourceLocation; + class ItemFrameRenderer : public EntityRenderer { private: static ResourceLocation MAP_BACKGROUND_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp index ca9f15ca1..c606835f6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -1,16 +1,36 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "ItemRenderer.h" -#include "../TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" #include "EntityRenderDispatcher.h" #include "java/JavaMath.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "../../Options.h" -#include "../texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#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 "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/gui/Gui.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" + +class ResourceLocation; ItemRenderer::ItemRenderer() : EntityRenderer() { random = new Random(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h index 4f0df8bbf..3baabd89c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h @@ -1,10 +1,17 @@ #pragma once +#include +#include + #include "EntityRenderer.h" class Textures; class ItemInstance; class Random; class ItemEntity; +class Font; +class Icon; +class ResourceLocation; +class Tesselator; class ItemRenderer : public EntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp index 42fd53176..4ac8b435d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp @@ -1,11 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "ItemSpriteRenderer.h" #include "EntityRenderDispatcher.h" -#include "../texture/TextureAtlas.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/PotionItem.h" +#include "Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" ItemSpriteRenderer::ItemSpriteRenderer(Item* sourceItem, int sourceItemAuxValue /*= 0*/) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.h index 5f2b13e42..d287baec2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemSpriteRenderer.h @@ -2,6 +2,8 @@ #include "EntityRenderer.h" class Item; +class Icon; +class Tesselator; class ItemSpriteRenderer : public EntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp index 99c2a80d1..3bf66669e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp @@ -1,7 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "../../model/LavaSlimeModel.h" +#include + +#include "Minecraft.Client/net/minecraft/client/model/LavaSlimeModel.h" #include "LavaSlimeRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation LavaSlimeRenderer::MAGMACUBE_LOCATION = ResourceLocation(TN_MOB_LAVA); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.h index ab8d7d4d4..8a745df9f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LavaSlimeRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "MobRenderer.h" +class ResourceLocation; + class LavaSlimeRenderer : public MobRenderer { private: int modelVersion; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.cpp index d5bfd5760..51f8cfdb4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.cpp @@ -1,6 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "LeashKnotRenderer.h" -#include "../../model/LeashKnotModel.h" +#include "Minecraft.Client/net/minecraft/client/model/LeashKnotModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation LeashKnotRenderer::KNOT_LOCATION = ResourceLocation(TN_ITEM_LEASHKNOT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.h index fbae3a06c..97e2717bc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LeashKnotRenderer.h @@ -2,6 +2,7 @@ #include "EntityRenderer.h" class LeashKnotModel; +class ResourceLocation; class LeashKnotRenderer : public EntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp index 951ef3a75..886373ac0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LightningBoltRenderer.cpp @@ -1,7 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "LightningBoltRenderer.h" -#include "../Tesselator.h" -#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/global/LightningBolt.h" +#include "java/Random.h" void LightningBoltRenderer::render(std::shared_ptr _bolt, double x, double y, double z, float rot, float a) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index 4924d9147..aa983f9d5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -1,13 +1,30 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "LivingEntityRenderer.h" -#include "../../Lighting.h" -#include "../../model/geom/Cube.h" -#include "../../model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Cube.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "EntityRenderDispatcher.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "java/Class.h" +#include "java/Random.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation LivingEntityRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h index a7a9a3e1f..29e37567f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h @@ -1,9 +1,14 @@ #pragma once -#include "../../resources/ResourceLocation.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "EntityRenderer.h" #include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" class LivingEntity; +class Model; +class ResourceLocation; class LivingEntityRenderer : public EntityRenderer { static const int PLAYER_NAME_READABLE_FULLSCREEN = 16; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp index f80a73b63..093491832 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.cpp @@ -1,10 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "MinecartRenderer.h" +#include +#include #include -#include "../../model/MinecartModel.h" -#include "../texture/TextureAtlas.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include + +#include "MinecartRenderer.h" +#include "Minecraft.Client/net/minecraft/client/model/MinecartModel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Tile; ResourceLocation MinecartRenderer::MINECART_LOCATION(TN_ITEM_CART); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h index c53d3e032..197b06742 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "EntityRenderer.h" class Minecart; +class Model; +class ResourceLocation; +class Tile; +class TileRenderer; class MinecartRenderer : public EntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp index a931b47a3..0cf28590f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "MinecartSpawnerRenderer.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "../tileentity/MobSpawnerRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartSpawner.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h" void MinecartSpawnerRenderer::renderMinecartContents( std::shared_ptr cart, float a, Tile* tile, int tileData) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h index af9a0823a..b066cb9ea 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MinecartSpawnerRenderer.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "MinecartRenderer.h" class MinecartSpawner; +class Tile; class MinecartSpawnerRenderer : public MinecartRenderer { protected: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp index d13a11c0d..07e640d1e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp @@ -1,13 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "MobRenderer.h" #include "LivingEntityRenderer.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "EntityRenderDispatcher.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "java/Class.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" + +class Model; MobRenderer::MobRenderer(Model* model, float shadow) : LivingEntityRenderer(model, shadow) {} diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h index 7c1d4ce07..a9148df2f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "LivingEntityRenderer.h" + class Mob; +class Model; // This was used in MobRenderer but lots of code moved to LivingEntity and I // haven't put this back yet diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp index d8950d991..eabe65862 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.cpp @@ -1,10 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../model/geom/ModelPart.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "MushroomCowRenderer.h" -#include "../texture/TextureAtlas.h" -#include "../../model/QuadrupedModel.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/model/QuadrupedModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation MushroomCowRenderer::MOOSHROOM_LOCATION = ResourceLocation(TN_MOB_RED_COW); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.h index 9a5f0ae5f..b2cca6734 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MushroomCowRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class MushroomCowRenderer : public MobRenderer { private: static ResourceLocation MOOSHROOM_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp index f13596896..cad7f1ebb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.cpp @@ -1,6 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "OcelotRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Ocelot.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation OcelotRenderer::CAT_BLACK_LOCATION = ResourceLocation(TN_MOB_CAT_BLACK); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.h index 23e64b92a..482db193f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/OcelotRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class OcelotRenderer : public MobRenderer { private: static ResourceLocation CAT_BLACK_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp index 3445354f8..ef5420532 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -1,10 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "PaintingRenderer.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/Painting.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation PaintingRenderer::PAINTING_LOCATION(TN_ART_KZ); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.h index 31a5574b2..3b55c13fd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PaintingRenderer.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "EntityRenderer.h" class Painting; class Random; +class ResourceLocation; class PaintingRenderer : public EntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp index 219b10029..b4144c158 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.cpp @@ -1,6 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "PigRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Pig.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation PigRenderer::PIG_LOCATION = ResourceLocation(TN_MOB_PIG); ResourceLocation PigRenderer::SADDLE_LOCATION = ResourceLocation(TN_MOB_SADDLE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.h index d91a1c6da..ee6dbe152 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PigRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class PigRenderer : public MobRenderer { private: static ResourceLocation PIG_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp index e02d79b92..980d2ed74 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -1,18 +1,39 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include + #include "PlayerRenderer.h" -#include "../tileentity/SkullTileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h" #include "HumanoidMobRenderer.h" -#include "../../model/HumanoidModel.h" -#include "../../model/geom/ModelPart.h" -#include "../../player/LocalPlayer.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#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/ArmorItem.h" +#include "Minecraft.World/net/minecraft/world/item/BowItem.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/UseAnim.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "java/Class.h" +#include "nbt/CompoundTag.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] = { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h index eb2c77ff1..4681b2799 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h @@ -1,8 +1,15 @@ #pragma once +#include +#include + #include "MobRenderer.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +#include "Minecraft.World/x64headers/extraX64.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h" class HumanoidModel; +class LivingEntity; +class ResourceLocation; class PlayerRenderer : public LivingEntityRenderer { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp index 5c5548eb1..d277acdf4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.cpp @@ -1,7 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "SheepRenderer.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation SheepRenderer::SHEEP_LOCATION = ResourceLocation(TN_MOB_SHEEP); ResourceLocation SheepRenderer::SHEEP_FUR_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.h index 50c829b2c..db8a23050 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SheepRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class SheepRenderer : public MobRenderer { private: static ResourceLocation SHEEP_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.cpp index ebdade3c0..d97d84023 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.cpp @@ -1,7 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "SilverfishRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "../../model/SilverfishModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SilverfishModel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation SilverfishRenderer::SILVERFISH_LOCATION(TN_MOB_SILVERFISH); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.h index dddae6f4a..f16387bdb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SilverfishRenderer.h @@ -2,6 +2,7 @@ #include "MobRenderer.h" class Silverfish; +class ResourceLocation; class SilverfishRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp index ae035edf2..767d10ebf 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.cpp @@ -1,7 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "SkeletonRenderer.h" -#include "../../model/SkeletonModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SkeletonModel.h" #include "Minecraft.World/net/minecraft/world/entity/monster/Skeleton.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation SkeletonRenderer::SKELETON_LOCATION = ResourceLocation(TN_MOB_SKELETON); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.h index e7f88883b..263544652 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SkeletonRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "HumanoidMobRenderer.h" +class ResourceLocation; + class SkeletonRenderer : public HumanoidMobRenderer { private: static ResourceLocation SKELETON_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp index 094bb2827..1d46dcdeb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.cpp @@ -1,6 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "SlimeRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Slime.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation SlimeRenderer::SLIME_LOCATION = ResourceLocation(TN_MOB_SLIME); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.h index 5f6fa397e..3972e6d54 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SlimeRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class SlimeRenderer : public MobRenderer { private: Model* armor; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp index 498731f74..a0faa6323 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.cpp @@ -1,11 +1,20 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../model/SnowManModel.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "../../model/geom/ModelPart.h" +#include + +#include "Minecraft.Client/net/minecraft/client/model/SnowManModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "EntityRenderDispatcher.h" #include "SnowManRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h" +#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.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation SnowManRenderer::SNOWMAN_LOCATION = ResourceLocation(TN_MOB_SNOWMAN); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.h index 800766688..47f6975b9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SnowManRenderer.h @@ -2,6 +2,7 @@ #include "MobRenderer.h" class SnowManModel; +class ResourceLocation; class SnowManRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp index c9483e590..7400d86bd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.cpp @@ -1,7 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "SpiderRenderer.h" -#include "../../model/SpiderModel.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include "Minecraft.Client/net/minecraft/client/model/SpiderModel.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Spider.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation SpiderRenderer::SPIDER_LOCATION = ResourceLocation(TN_MOB_SPIDER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h index 6c413c303..c7b2f6a53 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SpiderRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "MobRenderer.h" +class ResourceLocation; + class SpiderRenderer : public MobRenderer { private: static ResourceLocation SPIDER_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp index df7152417..69112e1bc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.cpp @@ -1,6 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "SquidRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Squid.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation SquidRenderer::SQUID_LOCATION = ResourceLocation(TN_MOB_SQUID); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.h index c57da408c..b3466c98c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/SquidRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class SquidRenderer : public MobRenderer { private: static ResourceLocation SQUID_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp index 18d49b41a..eb9d85376 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntMinecartRenderer.cpp @@ -1,7 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "TntMinecartRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MinecartRenderer.h" void TntMinecartRenderer::renderMinecartContents( std::shared_ptr _cart, float a, Tile* tile, int tileData) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp index 89e3b5278..673429f3d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.cpp @@ -1,9 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "TntRenderer.h" -#include "../texture/TextureAtlas.h" -#include "../TileRenderer.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" TntRenderer::TntRenderer() { renderer = new TileRenderer(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.h index c966df159..73b4a631b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/TntRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "EntityRenderer.h" +class TileRenderer; + class TntRenderer : public EntityRenderer { private: TileRenderer* renderer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp index b650fa436..9e3f54adb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp @@ -1,10 +1,22 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "../../model/VillagerGolemModel.h" -#include "../../model/geom/ModelPart.h" -#include "../texture/TextureAtlas.h" +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "VillagerGolemRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.h" +#include "Minecraft.World/net/minecraft/world/level/tile/PlantTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation VillagerGolemRenderer::GOLEM_LOCATION = ResourceLocation(TN_MOB_VILLAGER_GOLEM); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.h index 50891b542..6f7cbc8b8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerGolemRenderer.h @@ -3,6 +3,7 @@ #include "MobRenderer.h" class VillagerGolemModel; +class ResourceLocation; class VillagerGolemRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp index 1e877d926..825793f47 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.cpp @@ -1,7 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "../../model/VillagerModel.h" +#include + +#include "Minecraft.Client/net/minecraft/client/model/VillagerModel.h" #include "VillagerRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/npc/Villager.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation VillagerRenderer::VILLAGER_LOCATION = ResourceLocation(TN_MOB_VILLAGER_VILLAGER); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.h index b40e6cf21..ac39c42bb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/VillagerRenderer.h @@ -2,6 +2,7 @@ #include "MobRenderer.h" class VillagerModel; +class ResourceLocation; class VillagerRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp index 01f563ae7..bfe2b991c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.cpp @@ -1,9 +1,25 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "EntityRenderDispatcher.h" #include "WitchRenderer.h" -#include "../../model/WitchModel.h" -#include "../../model/geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.Client/net/minecraft/client/model/WitchModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/item/BowItem.h" +#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.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation WitchRenderer::WITCH_LOCATION = ResourceLocation(TN_MOB_WITCH); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.h index 217e4de23..b77f28bbc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitchRenderer.h @@ -2,6 +2,7 @@ #include "MobRenderer.h" class WitchModel; +class ResourceLocation; class WitchRenderer : public MobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp index a03b2fdf4..0105c46e3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "WitherBossRenderer.h" -#include "../../model/WitherBossModel.h" +#include "Minecraft.Client/net/minecraft/client/model/WitherBossModel.h" #include "MobRenderer.h" #include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" -#include "../BossMobGuiInfo.h" +#include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" ResourceLocation WitherBossRenderer::WITHER_ARMOR_LOCATION = ResourceLocation(TN_MOB_WITHER_ARMOR); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp index 2d4a4e491..84eac6db9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.cpp @@ -1,7 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "WitherSkullRenderer.h" -#include "../../model/SkeletonHeadModel.h" +#include "Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h" #include "Minecraft.World/net/minecraft/world/entity/projectile/WitherSkull.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation WitherSkullRenderer::WITHER_ARMOR_LOCATION( TN_MOB_WITHER_INVULNERABLE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.h index 2c002ed3e..9ab3dc2f1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherSkullRenderer.h @@ -2,6 +2,7 @@ #include "EntityRenderer.h" class SkeletonHeadModel; +class ResourceLocation; class WitherSkullRenderer : public EntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp index 017e60ffb..33d3a0c5b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.cpp @@ -1,7 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "WolfRenderer.h" -#include "../../multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Sheep.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/Wolf.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" + +class Model; ResourceLocation* WolfRenderer::WOLF_LOCATION = new ResourceLocation(TN_MOB_WOLF); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.h index a89b6d8ce..9ac352e43 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WolfRenderer.h @@ -1,6 +1,9 @@ #pragma once #include "MobRenderer.h" +class Model; +class ResourceLocation; + class WolfRenderer : public MobRenderer { private: static ResourceLocation* WOLF_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp index 451be499d..7f2080a08 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.cpp @@ -1,8 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../model/ZombieModel.h" -#include "../../model/VillagerZombieModel.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/ZombieModel.h" +#include "Minecraft.Client/net/minecraft/client/model/VillagerZombieModel.h" #include "ZombieRenderer.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/monster/Zombie.h" +#include "java/Class.h" +#include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation ZombieRenderer::ZOMBIE_PIGMAN_LOCATION(TN_MOB_PIGZOMBIE); ResourceLocation ZombieRenderer::ZOMBIE_LOCATION(TN_MOB_ZOMBIE); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.h index 25f3008b8..5f5ad5ba6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ZombieRenderer.h @@ -1,8 +1,12 @@ #pragma once +#include + #include "HumanoidMobRenderer.h" class VillagerZombieModel; class Zombie; +class HumanoidModel; +class ResourceLocation; class ZombieRenderer : public HumanoidMobRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index 2c4dd2c0e..af792bf8d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -1,23 +1,27 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "java/ByteBuffer.h" -#include "../../Minecraft.h" -#include "../LevelRenderer.h" -#include "../entity/EntityRenderDispatcher.h" -#include "Stitcher.h" -#include "StitchSlot.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "StitchedTexture.h" #include "Texture.h" -#include "TextureHolder.h" #include "TextureManager.h" -#include "../../skins/TexturePack.h" -#include "../../skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "PreStitchedTextureMap.h" #include "SimpleIcon.h" -#include "custom/CompassTexture.h" -#include "custom/ClockTexture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" + +class Stitcher; +class TextureHolder; const std::wstring PreStitchedTextureMap::NAME_MISSING_TEXTURE = L"missingno"; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h index 3f664726a..185727215 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h @@ -1,11 +1,16 @@ #pragma once +#include +#include +#include + #include "Minecraft.World/net/minecraft/world/IconRegister.h" class Icon; class StitchedTexture; class Texture; class BufferedImage; +class TexturePack; // 4J Added this class to stop having to do texture stitching at runtime class PreStitchedTextureMap : public IconRegister { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.cpp index b708a2499..0ca238693 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "SimpleIcon.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" SimpleIcon::SimpleIcon(const std::wstring& name, const std::wstring& filename, float U0, float V0, float U1, float V1) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h index c46c9a49b..8c7d64b89 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h @@ -1,5 +1,7 @@ #pragma once -#include "Minecraft.World/Header Files/stdafx.h" +#include + +#include "Minecraft.Client/Header Files/stdafx.h" #include "StitchedTexture.h" // 4J Added this class to store the uv data that we have pre-calculated and diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp index f93728bd7..0cb1f6e22 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp @@ -1,4 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "TextureHolder.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "StitchSlot.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.h index b9725d674..b99ac46a4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + class TextureHolder; class StitchSlot { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp index a65bdc1af..af993dbd4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp @@ -1,10 +1,14 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Texture.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "custom/ClockTexture.h" -#include "custom/CompassTexture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h" #include "StitchedTexture.h" #include "TextureManager.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "java/InputOutputStream/BufferedReader.h" StitchedTexture* StitchedTexture::create(const std::wstring& name) { // TODO: Generalize? diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h index b40302ebb..2e15c2f7e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h @@ -1,7 +1,15 @@ #pragma once +#include +#include +#include +#include +#include + #include "Minecraft.World/net/minecraft/world/Icon.h" + class Texture; +class BufferedReader; class StitchedTexture : public Icon { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.cpp index 90a5277dc..01278e2ee 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.cpp @@ -1,10 +1,12 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "StitchSlot.h" #include "Texture.h" #include "TextureHolder.h" #include "TextureManager.h" -#include "StitchedTexture.h" #include "Stitcher.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" void Stitcher::_init(const std::wstring& name, int maxWidth, int maxHeight, bool forcePowerOfTwo, int forcedScale) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.h index bb7aebb14..b4e0ff062 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Stitcher.h @@ -1,8 +1,14 @@ #pragma once +#include +#include +#include +#include + +#include "TextureHolder.h" + class StitchSlot; class Texture; -#include "TextureHolder.h" class Stitcher { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp index 45d004ec8..d4a0620b9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp @@ -1,8 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "java/ByteBuffer.h" -#include "../Rect2i.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Rect2i.h" #include "TextureManager.h" #include "Texture.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Buffer.h" #define MAX_MIP_LEVELS 5 diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h index e40981560..a31edba45 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + class Rect2i; class ByteBuffer; class BufferedImage; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.cpp index 3779f38c6..ccf90bd2d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TextureAtlas.h" -#include "../../resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" ResourceLocation TextureAtlas::LOCATION_BLOCKS = ResourceLocation(TN_TERRAIN); ResourceLocation TextureAtlas::LOCATION_ITEMS = ResourceLocation(TN_GUI_ITEMS); \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp index 3cf48ceee..bb9847cd2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp @@ -1,4 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "Stitcher.h" #include "Texture.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.h index 5215b7ffd..87b473890 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.h @@ -1,5 +1,7 @@ #pragma once +#include + class Texture; class TextureHolder // implements Comparable { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp index d37ee51d7..8d1315a13 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp @@ -1,11 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "Stitcher.h" #include "Texture.h" -#include "../../skins/TexturePack.h" -#include "../../skins/TexturePackRepository.h" -#include "../../Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "TextureManager.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/File.h" TextureManager* TextureManager::instance = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h index cf1f96b12..66e4ae8e1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h @@ -1,8 +1,13 @@ #pragma once +#include +#include +#include + class Texture; class Stitcher; class TexturePack; +class BufferedImage; class TextureManager { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp index cee5e686f..86af3ab7d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp @@ -1,19 +1,28 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "../../Minecraft.h" -#include "../LevelRenderer.h" -#include "../entity/EntityRenderDispatcher.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Stitcher.h" #include "StitchSlot.h" #include "StitchedTexture.h" #include "Texture.h" #include "TextureHolder.h" #include "TextureManager.h" -#include "../../skins/TexturePack.h" -#include "../../skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "TextureMap.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/Icon.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "java/InputOutputStream/BufferedReader.h" +#include "java/InputOutputStream/InputStream.h" +#include "java/InputOutputStream/InputStreamReader.h" const std::wstring TextureMap::NAME_MISSING_TEXTURE = L"missingno"; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h index b0f08280b..acd9a350c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.h @@ -1,10 +1,15 @@ #pragma once +#include +#include +#include + #include "Minecraft.World/net/minecraft/world/IconRegister.h" class StitchedTexture; class Texture; class BufferedImage; +class Icon; class TextureMap : public IconRegister { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp index f892ef1cc..803d470cd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.cpp @@ -1,11 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../Minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "../../../multiplayer/MultiPlayerLocalPlayer.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "java/JavaMath.h" -#include "../Texture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" #include "ClockTexture.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" ClockTexture::ClockTexture() : StitchedTexture(L"clock", L"clock") { rot = rota = 0.0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h index 9ec172d93..de6caf9f2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h @@ -1,5 +1,5 @@ #pragma once -#include "../StitchedTexture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" class ClockTexture : public StitchedTexture { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp index 5b3a70ea6..b6af2d4ba 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.cpp @@ -1,11 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../Minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "../../../multiplayer/MultiPlayerLocalPlayer.h" +#include +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "java/JavaMath.h" -#include "../Texture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" #include "CompassTexture.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" CompassTexture* CompassTexture::instance = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h index cdad3280f..cdc9774be 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h @@ -1,5 +1,7 @@ #pragma once -#include "../StitchedTexture.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.h" + +class Level; class CompassTexture : public StitchedTexture { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp index 96aa640b5..fe1fa332e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.cpp @@ -1,8 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include +#include +#include +#include + #include "BeaconRenderer.h" -#include "../Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation BeaconRenderer::BEAM_LOCATION = ResourceLocation(TN_MISC_BEACON_BEAM); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.h index d7994913a..738ff6d92 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/BeaconRenderer.h @@ -2,6 +2,7 @@ #include "TileEntityRenderer.h" class BeaconTileEntity; +class ResourceLocation; class BeaconRenderer : public TileEntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp index 923b75618..b6d728f40 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.cpp @@ -1,11 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include + #include "ChestRenderer.h" -#include "../../model/ChestModel.h" -#include "../../model/LargeChestModel.h" -#include "../../model/geom/ModelPart.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/level/Calendar.h" +#include "Minecraft.Client/net/minecraft/client/model/ChestModel.h" +#include "Minecraft.Client/net/minecraft/client/model/LargeChestModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/level/tile/ChestTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.h index 4a28aec0d..511e01f4d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/ChestRenderer.h @@ -2,6 +2,7 @@ #include "TileEntityRenderer.h" class ChestModel; +class ResourceLocation; class ChestRenderer : public TileEntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp index 289e613a2..7e423eeed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp @@ -1,8 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../model/BookModel.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/BookModel.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "EnchantTableRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation EnchantTableRenderer::BOOK_LOCATION = ResourceLocation(TN_ITEM_BOOK); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h index 5bf2487fd..9659eec50 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h @@ -2,6 +2,7 @@ #include "TileEntityRenderer.h" class BookModel; +class ResourceLocation; class EnchantTableRenderer : public TileEntityRenderer { friend class CXuiCtrlEnchantmentBook; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp index d0c8936bd..593d31b86 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp @@ -1,7 +1,15 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../../model/geom/ModelPart.h" +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "EnderChestRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/EnderChestTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.Client/net/minecraft/client/model/ChestModel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation EnderChestRenderer::ENDER_CHEST_LOCATION = ResourceLocation(TN_TILE_ENDER_CHEST); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.h index 46ee5aa62..7c90f322b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/EnderChestRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "TileEntityRenderer.h" -#include "../../model/ChestModel.h" +#include "Minecraft.Client/net/minecraft/client/model/ChestModel.h" + +class ResourceLocation; class EnderChestRenderer : public TileEntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp index 7f898c87a..bff619a1c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp @@ -1,9 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "MobSpawnerRenderer.h" -#include "TileEntityRenderDispatcher.h" -#include "../entity/EntityRenderDispatcher.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" void MobSpawnerRenderer::render(std::shared_ptr _spawner, double x, double y, double z, float a, bool setColor, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h index 4bc455e3e..d127e9210 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h @@ -1,7 +1,12 @@ #pragma once +#include +#include +#include + #include "TileEntityRenderer.h" class BaseMobSpawner; +class Entity; class MobSpawnerRenderer : public TileEntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp index e2422111f..d730c5eae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp @@ -1,12 +1,20 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "PistonPieceRenderer.h" -#include "../../Lighting.h" -#include "../Tesselator.h" -#include "../texture/TextureAtlas.h" -#include "../TileRenderer.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.Client/net/minecraft/client/Lighting.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" +#include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J.Render/4J_Render.h" +#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/level/tile/entity/TileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation PistonPieceRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.h index a74bcbbe3..a1f78709d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/PistonPieceRenderer.h @@ -3,6 +3,7 @@ class PistonPieceEntity; class TileRenderer; +class ResourceLocation; class PistonPieceRenderer : public TileEntityRenderer { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp index 4bb380dcd..d70225bf9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "SignRenderer.h" -#include "../../model/SignModel.h" -#include "../../model/geom/ModelPart.h" +#include "Minecraft.Client/net/minecraft/client/model/SignModel.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index 9e204ee2c..c2b747941 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -1,10 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "SkullTileRenderer.h" -#include "../../model/SkeletonHeadModel.h" -#include "../entity/PlayerRenderer.h" +#include "Minecraft.Client/net/minecraft/client/model/SkeletonHeadModel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/SkullTileEntity.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/world/level/tile/SkullTile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" SkullTileRenderer* SkullTileRenderer::instance = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h index 31837fa62..b8cd9b7f0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SkullTileRenderer.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "TileEntityRenderer.h" class SkeletonHeadModel; +class ResourceLocation; class SkullTileRenderer : public TileEntityRenderer { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp index 249073ca4..008bcaaca 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp @@ -1,11 +1,19 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "java/Random.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "../Tesselator.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "TileEntityRenderDispatcher.h" -#include "../../Camera.h" +#include "Minecraft.Client/net/minecraft/client/Camera.h" #include "java/FloatBuffer.h" #include "TheEndPortalRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" +#include "java/System.h" +#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" ResourceLocation TheEndPortalRenderer::END_SKY_LOCATION = ResourceLocation(TN_MISC_TUNNEL); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h index ef7b1bda1..f44da035f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TheEndPortalRenderer.h @@ -2,6 +2,10 @@ #include "TileEntityRenderer.h" +class FloatBuffer; +class Random; +class ResourceLocation; + class TheEndPortalRenderer : public TileEntityRenderer { private: static ResourceLocation END_SKY_LOCATION; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp index d155ba9f6..174d8d3dc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp @@ -1,10 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "TileEntityRenderDispatcher.h" #include "TileEntityRenderer.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/PistonPieceTileEntity.h" #include "SignRenderer.h" #include "MobSpawnerRenderer.h" #include "PistonPieceRenderer.h" @@ -14,6 +12,14 @@ #include "SkullTileRenderer.h" #include "EnderChestRenderer.h" #include "BeaconRenderer.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" + +class Font; +class Textures; TileEntityRenderDispatcher* TileEntityRenderDispatcher::instance = nullptr; double TileEntityRenderDispatcher::xOff = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h index 3177a0243..a6acf1170 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h @@ -1,10 +1,18 @@ #pragma once -#include "../Textures.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "java/JavaIntHash.h" +#include "java/Class.h" + class Mob; class Level; class TileEntityRenderer; class TileEntity; +class Font; +class LivingEntity; +class Textures; class TileEntityRenderDispatcher { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp index 3b367ef7a..7d4bb4463 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TileEntityRenderer.h" #include "TileEntityRenderDispatcher.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" void TileEntityRenderer::bindTexture(ResourceLocation* location) { Textures* t = tileEntityRenderDispatcher->textures; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h index d5436e945..c58dc3e5d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderer.h @@ -1,11 +1,15 @@ #pragma once -#include "../Textures.h" -#include "../../resources/ResourceLocation.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" class TileEntityRenderDispatcher; class TileEntity; class Level; class Font; +class ResourceLocation; class TileEntityRenderer { protected: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h b/minecraft/Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h index f33416e3a..6a7802a19 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h @@ -1,5 +1,5 @@ #pragma once -#include "../renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" typedef std::vector<_TEXTURE_NAME> textureNameArray; class ResourceLocation { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp index a9813cc44..6f51ca3a7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp @@ -1,10 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../renderer/Textures.h" -#include "AbstractTexturePack.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include +#include +#include -#include +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" +#include "AbstractTexturePack.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/File.h" +#include "java/InputOutputStream/BufferedReader.h" +#include "java/InputOutputStream/FileInputStream.h" +#include "java/InputOutputStream/InputStream.h" +#include "java/InputOutputStream/InputStreamReader.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File* file, const std::wstring& name, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h index 3bdd333e2..eedf82cc3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h @@ -1,8 +1,14 @@ #pragma once +#include +#include + #include "TexturePack.h" class BufferedImage; +class ColourTable; +class File; +class InputStream; class AbstractTexturePack : public TexturePack { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp index 5ecdfb498..365780486 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp @@ -1,23 +1,40 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../../../Common/Source Files/DLC/DLCGameRulesFile.h" -#include "../../../../Common/Source Files/DLC/DLCGameRulesHeader.h" -#include "../../../../Common/Source Files/DLC/DLCGameRules.h" -#include "DLCTexturePack.h" -#include "../../../../Common/Source Files/DLC/DLCColourTableFile.h" -#include "../../../../Common/Source Files/DLC/DLCUIDataFile.h" -#include "../../../../Common/Source Files/DLC/DLCTextureFile.h" -#include "../../../../Common/Source Files/DLC/DLCLocalisationFile.h" -#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/Header Files/PortableFileIO.h" -#include "../../../../Common/Source Files/Localisation/StringTable.h" -#include "../../../../Common/Source Files/DLC/DLCAudioFile.h" - #include #include +#include +#include + +#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" +#include "DLCTexturePack.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h" +#include "Minecraft.World/Header Files/PortableFileIO.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h" +#include "4J_Profile.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/File.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #if defined(_WINDOWS64) -#include "../../../../Windows64/XML/ATGXmlParser.h" -#include "../../../../Windows64/XML/xmlFilesCallback.h" +#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" +#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" #endif namespace { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h index d6508a6eb..6c3209b12 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h @@ -1,9 +1,16 @@ #pragma once +#include +#include + #include "AbstractTexturePack.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" class DLCPack; class StringTable; +class ArchiveFile; +class TexturePack; class DLCTexturePack : public AbstractTexturePack { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp index f195ab91b..0be022ba6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "DefaultTexturePack.h" -#include "../renderer/Textures.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" DefaultTexturePack::DefaultTexturePack() diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.cpp index e48d2cb34..9fa3e317d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.cpp @@ -1,5 +1,8 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "FileTexturePack.h" +#include "java/File.h" +#include "Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h" + +class TexturePack; FileTexturePack::FileTexturePack(std::uint32_t id, File* file, TexturePack* fallback) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.h index 6db1ca759..293c52da6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/FileTexturePack.h @@ -1,9 +1,14 @@ #pragma once +#include +#include + #include "AbstractTexturePack.h" + // class ZipFile; class BufferedImage; class File; class Textures; +class TexturePack; class FileTexturePack : public AbstractTexturePack { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.cpp index 841b022e7..d16dc119c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.cpp @@ -1,5 +1,9 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "FolderTexturePack.h" +#include "java/File.h" +#include "java/InputOutputStream/InputStream.h" +#include "Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.h" + +class TexturePack; FolderTexturePack::FolderTexturePack(std::uint32_t id, const std::wstring& name, File* folder, TexturePack* fallback) diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.h index 362434ec6..c78ec2f64 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/FolderTexturePack.h @@ -1,7 +1,13 @@ #pragma once +#include +#include + #include "AbstractTexturePack.h" +class File; +class TexturePack; + class FolderTexturePack : public AbstractTexturePack { private: bool bUILoaded; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.cpp index 4a08592ac..ea85e368b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "TexturePack.h" std::wstring TexturePack::getPath( @@ -10,7 +9,7 @@ std::wstring TexturePack::getPath( // Make the content package point to to the UPDATE: drive is needed wDrive = L"Common\\res\\TitleUpdate\\"; } else { - wDrive = L"Common/"; + wDrive = L"Minecraft.Client/Common/"; } return wDrive; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.h index 052b7edff..3d1122952 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePack.h @@ -1,12 +1,17 @@ #pragma once #include +#include -#include "../../../../Common/App_enums.h" +#include "Minecraft.Client/Common/App_enums.h" class InputStream; class Minecraft; class ArchiveFile; +class BufferedImage; +class ColourTable; +class DLCPack; +class Textures; class TexturePack { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp index 7fedade65..f814eb169 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "TexturePackRepository.h" #include "DefaultTexturePack.h" #include "FileTexturePack.h" #include "FolderTexturePack.h" #include "DLCTexturePack.h" -#include "../Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "java/File.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "../gui/Minimap.h" +#include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" TexturePack* TexturePackRepository::DEFAULT_TEXTURE_PACK = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp index 58d88a949..166ee4536 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp @@ -1,18 +1,23 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../gui/Button.h" -#include "../gui/OptionsScreen.h" -#include "../gui/SelectWorldScreen.h" -#include "../gui/JoinMultiplayerScreen.h" -#include "../renderer/Tesselator.h" -#include "../renderer/Textures.h" -#include "../Options.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/client/gui/Button.h" +#include "Minecraft.Client/net/minecraft/client/gui/OptionsScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h" +#include "Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h" +#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" -#include "java/System.h" #include "java/Random.h" -#include #include "TitleScreen.h" +#include "4J.Render/4J_Render.h" +#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/locale/Language.h" +#include "java/InputOutputStream/BufferedReader.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/InputStreamReader.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" Random* TitleScreen::random = new Random(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.h index 14b643c3f..d556e6bc4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.h @@ -1,5 +1,8 @@ #pragma once -#include "../gui/Screen.h" +#include + +#include "Minecraft.Client/net/minecraft/client/gui/Screen.h" + class Random; class Button; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.cpp b/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.cpp index cb78b1d58..13eaafa19 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.cpp @@ -1,6 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "ConsoleInput.h" +class ConsoleInputSource; + ConsoleInput::ConsoleInput(const std::wstring& msg, ConsoleInputSource* source) { this->msg = msg; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.h b/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.h index 4b0d36fbe..ac86606cd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInput.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "ConsoleInputSource.h" +class ConsoleInputSource; + class ConsoleInput { public: std::wstring msg; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.cpp b/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.cpp index 7767e82d4..e69de29bb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/DispenserBootstrap.cpp @@ -1 +0,0 @@ -#include "Minecraft.World/Header Files/stdafx.h" \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index 966e57b7c..4cbe29d2f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp @@ -1,21 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -// #include "../client/Minecraft.h" +#include "Minecraft.Client/Header Files/stdafx.h" +// #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include #include #include #include "ConsoleInput.h" -#include "level/DerivedServerLevel.h" +#include "Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h" #include "DispenserBootstrap.h" -#include "level/EntityTracker.h" +#include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" #include "MinecraftServer.h" -#include "../client/Options.h" +#include "Minecraft.Client/net/minecraft/client/Options.h" #include "PlayerList.h" -#include "level/ServerChunkCache.h" -#include "network/ServerConnection.h" -#include "level/ServerLevel.h" -#include "level/ServerLevelListener.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" +#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h" #include "Settings.h" #include "Minecraft.World/net/minecraft/commands/Command.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" @@ -36,19 +36,19 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" #include "Minecraft.Client/Common/Source Files/Network/Socket.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "../client/ProgressRenderer.h" -#include "level/ServerPlayer.h" -#include "../client/renderer/GameRenderer.h" +#include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" #include "Minecraft.World/ConsoleHelpers/ThreadName.h" #include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" #include "Minecraft.World/Header Files/compression.h" -#include "../../../Common/ShutdownManager.h" -#include "../../../Common/Source Files/UI/All Platforms/UIStructs.h" -#include "commands/ServerCommandDispatcher.h" +#include "Minecraft.Client/Common/ShutdownManager.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h" #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" -#include "level/PlayerChunkMap.h" +#include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp index 2862f2aae..2b89587d9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp @@ -1,17 +1,17 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include #include "PlayerList.h" -#include "level/PlayerChunkMap.h" +#include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" #include "MinecraftServer.h" #include "Settings.h" -#include "level/ServerLevel.h" -#include "level/ServerChunkCache.h" -#include "level/ServerPlayer.h" -#include "level/ServerPlayerGameMode.h" -#include "network/ServerConnection.h" -#include "network/PendingConnection.h" -#include "network/PlayerConnection.h" -#include "level/EntityTracker.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h" +#include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h" +#include "Minecraft.Client/net/minecraft/server/network/PendingConnection.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" #include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.cpp b/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.cpp index c21be5daf..2a5f30833 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" - #include "ServerScoreboard.h" +class Packet; + ServerScoreboard::ServerScoreboard(MinecraftServer* server) { this->server = server; } diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h b/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h index cf61a0d17..d284c2afe 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/ServerScoreboard.h @@ -1,5 +1,10 @@ #pragma once +#include +#include +#include +#include + #include "Minecraft.World/net/minecraft/world/scores/Scoreboard.h" class MinecraftServer; @@ -7,6 +12,7 @@ class ScoreboardSaveData; class Score; class Objective; class PlayerTeam; +class Packet; class ServerScoreboard : public Scoreboard { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp b/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp index b579a7a9a..1aa13c156 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "Settings.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/Settings.h b/minecraft/Minecraft.Client/net/minecraft/server/Settings.h index cacdd6857..e18595cd0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/Settings.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/Settings.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + class File; class Settings { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp index baae9a46f..cc020a9fb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.cpp @@ -1,11 +1,21 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../MinecraftServer.h" -#include "../PlayerList.h" -#include "../level/ServerPlayer.h" -#include "Minecraft.World/net/minecraft/commands/net.minecraft.commands.h" -#include "Minecraft.World/net/minecraft/commands/common/net.minecraft.commands.common.h" +#include +#include + +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "TeleportCommand.h" #include "ServerCommandDispatcher.h" +#include "Minecraft.World/net/minecraft/commands/Command.h" +#include "Minecraft.World/net/minecraft/commands/CommandSender.h" +#include "Minecraft.World/net/minecraft/commands/common/DefaultGameModeCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/EnchantItemCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/ExperienceCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/GameModeCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/GiveItemCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/KillCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/TimeCommand.h" +#include "Minecraft.World/net/minecraft/commands/common/ToggleDownfallCommand.h" ServerCommandDispatcher::ServerCommandDispatcher() { addCommand(new TimeCommand()); diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h index 323f28d50..56ef82c6b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "Minecraft.World/net/minecraft/commands/CommandDispatcher.h" #include "Minecraft.World/net/minecraft/commands/AdminLogCommand.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" class ServerCommandDispatcher : public CommandDispatcher, public AdminLogCommand { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp index 68b9c1bf8..a8c429b1d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.cpp @@ -1,13 +1,18 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../MinecraftServer.h" -#include "../PlayerList.h" -#include "../level/ServerPlayer.h" -#include "../network/PlayerConnection.h" -#include "Minecraft.World/net/minecraft/commands/net.minecraft.commands.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include + +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "TeleportCommand.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "java/Class.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" EGameCommand TeleportCommand::getId() { return eGameCommand_Teleport; } diff --git a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h index dd0efd466..0fbed9eec 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/commands/TeleportCommand.h @@ -1,6 +1,12 @@ #pragma once +#include +#include + #include "Minecraft.World/net/minecraft/commands/Command.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" class TeleportCommand : public Command { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp index 5566c414c..1105d8e51 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "CreativeMode.h" -#include "../../client/User.h" -#include "../../client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/User.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp index c4ee41290..5e078643d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "DemoMode.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp index f13604fa6..5c713d8bc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.cpp @@ -1,7 +1,11 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "DerivedServerLevel.h" #include "Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h" #include "Minecraft.World/net/minecraft/world/level/storage/DerivedLevelData.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" + +class LevelSettings; +class LevelStorage; +class MinecraftServer; DerivedServerLevel::DerivedServerLevel( MinecraftServer* server, std::shared_ptr levelStorage, diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h b/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h index 72e63880d..c46f2a053 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/DerivedServerLevel.h @@ -1,6 +1,13 @@ #pragma once +#include +#include + #include "ServerLevel.h" +class LevelSettings; +class LevelStorage; +class MinecraftServer; + class DerivedServerLevel : public ServerLevel { public: DerivedServerLevel(MinecraftServer* server, diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp index 83aec65e8..d4555a8c9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "EntityTracker.h" -#include "../MinecraftServer.h" -#include "../PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "TrackedEntity.h" #include "ServerPlayer.h" #include "ServerLevel.h" @@ -18,7 +18,7 @@ #include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" #include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "../network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" EntityTracker::EntityTracker(ServerLevel* level) { this->level = level; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp index bfd3ef029..aea33b70e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "GameMode.h" -#include "../../client/player/LocalPlayer.h" -#include "../../client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp index edd27eb76..33a3b58df 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp @@ -1,17 +1,30 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include +#include + #include "PlayerChunkMap.h" -#include "../network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "ServerLevel.h" #include "ServerChunkCache.h" #include "ServerPlayer.h" -#include "../MinecraftServer.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" -#include "java/System.h" -#include "../PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityAreaPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChunkVisibilityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" +#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/tile/entity/TileEntity.h" PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap* pcm) : pos(x, z) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h index 08fc0930f..8e33d6565 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h @@ -1,11 +1,18 @@ #pragma once +#include +#include +#include +#include + #include "java/JavaIntHash.h" #include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" + class ServerPlayer; class ServerLevel; class MinecraftServer; class Packet; class TileEntity; +class LevelChunk; class PlayerChunkMap { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp index 6e4fbd7e5..87fa572ff 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp @@ -1,20 +1,23 @@ -#include -#include +#include +#include +#include +#include -#include "Minecraft.World/Header Files/stdafx.h" #include "ServerChunkCache.h" #include "ServerLevel.h" -#include "../MinecraftServer.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/Pos.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/util/ProgressListener.h" -#include "Minecraft.World/ConsoleHelpers/ThreadName.h" #include "Minecraft.World/Header Files/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h" +#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" ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage, ChunkSource* source) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h index fee7b3a6e..9e60f2197 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h @@ -1,13 +1,22 @@ #pragma once #include +#include +#include +#include +#include + #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "java/File.h" #include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "java/JavaIntHash.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" +#include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" class ServerLevel; +class ChunkStorage; +class LevelChunk; class ServerChunkCache : public ChunkSource { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp index f89ea328a..baf87abdd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp @@ -2,15 +2,15 @@ #include #include -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "ServerLevel.h" -#include "../MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "ServerChunkCache.h" -#include "../PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "ServerPlayer.h" -#include "../network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "EntityTracker.h" -#include "../ServerScoreboard.h" +#include "Minecraft.Client/net/minecraft/server/ServerScoreboard.h" #include "Minecraft.World/net/minecraft/world/scores/ScoreboardSaveData.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" @@ -36,10 +36,10 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" #include "ServerLevelListener.h" #include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" -#include "../../client/skins/TexturePackRepository.h" -#include "../../client/skins/DLCTexturePack.h" +#include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.World/net/minecraft/util/ProgressListener.h" -#include "../../../../Common/ShutdownManager.h" +#include "Minecraft.Client/Common/ShutdownManager.h" #include "PlayerChunkMap.h" std::vector ServerLevel::RANDOM_BONUS_ITEMS; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp index 06470aa56..418729299 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.cpp @@ -1,15 +1,20 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include + #include "ServerLevelListener.h" #include "EntityTracker.h" -#include "../MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "ServerLevel.h" #include "ServerPlayer.h" -#include "../PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "PlayerChunkMap.h" -#include "../network/PlayerConnection.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/LevelSoundPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileDestructionPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" ServerLevelListener::ServerLevelListener(MinecraftServer* server, ServerLevel* level) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h index 4af8d3e1c..fadf66c5f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h @@ -1,5 +1,9 @@ #pragma once +#include + #include "Minecraft.World/net/minecraft/world/level/LevelListener.h" +#include "Minecraft.World/Header Files/ParticleTypes.h" + class Player; class TileEntity; class Entity; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp index da37d5d6b..f55688e24 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "ServerPlayer.h" #include "ServerPlayerGameMode.h" #include "ServerLevel.h" -#include "../MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "EntityTracker.h" -#include "../network/PlayerConnection.h" -#include "../Settings.h" -#include "../PlayerList.h" -#include "../../client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/server/Settings.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" #include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" @@ -31,7 +31,7 @@ #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" -#include "../../client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, const std::wstring& name, diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp index 24e3c149c..d7c40c182 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp @@ -1,17 +1,25 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include + #include "ServerPlayerGameMode.h" #include "ServerLevel.h" #include "ServerPlayer.h" -#include "../network/PlayerConnection.h" -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "../../client/multiplayer/MultiPlayerLevel.h" -#include "../../client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" +#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/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/WeaponItem.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/tile/LevelEvent.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" ServerPlayerGameMode::ServerPlayerGameMode(Level* level) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h index c414defcb..74741f416 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h @@ -1,10 +1,13 @@ #pragma once +#include + class ServerPlayer; class Level; class ItemInstance; class ServerLevel; class GameRulesInstance; class GameType; +class Player; class ServerPlayerGameMode { public: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp index a22b5e9d2..0d5a02378 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "SurvivalMode.h" #include "DemoMode.h" -#include "../../client/renderer/LevelRenderer.h" -#include "../../client/player/LocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" +#include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "../../client/ClientConstants.h" +#include "Minecraft.Client/net/minecraft/client/ClientConstants.h" SurvivalMode::SurvivalMode(Minecraft* minecraft) : GameMode(minecraft) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp index f9a25c177..6b40e460b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp @@ -1,24 +1,63 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include + #include "TrackedEntity.h" #include "ServerPlayer.h" -#include "../network/PlayerConnection.h" +#include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" -#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "../MinecraftServer.h" -#include "ServerLevel.h" -#include "../PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "EntityTracker.h" -#include "PlayerChunkMap.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddExperienceOrbPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddMobPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddPaintingPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MoveEntityPacketSmall.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/RotateHeadPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityDataPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityLinkPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEntityMotionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetEquippedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TeleportEntityPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateAttributesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UpdateMobEffectPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/Creature.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" +#include "Minecraft.World/net/minecraft/world/entity/ItemFrame.h" +#include "Minecraft.World/net/minecraft/world/entity/LeashFenceKnotEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/Mob.h" +#include "Minecraft.World/net/minecraft/world/entity/Painting.h" +#include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" +#include "Minecraft.World/net/minecraft/world/entity/ai/attributes/ServersideAttributeMap.h" +#include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" +#include "Minecraft.World/net/minecraft/world/entity/item/Minecart.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Arrow.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.h" +#include "Minecraft.World/net/minecraft/world/entity/projectile/ThrownPotion.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#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 "java/Class.h" + +class AttributeInstance; +class MobEffectInstance; #ifndef __linux__ #include #endif // __linux__ diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h index 02db083b7..9cb4585c4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.h @@ -1,10 +1,17 @@ #pragma once -class Entity; +#include +#include +#include + // class ServerPlayer; #include "ServerPlayer.h" -class Packet; +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" +class Entity; +class Packet; class EntityTracker; +class PlayerConnection; +class ServerPlayer; #define TRACKED_ENTITY_MINIMUM_VIEW_DISTANCE 4 diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp index c63e95177..caf8cee98 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp @@ -1,20 +1,27 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include #include +#include + #include "PendingConnection.h" #include "PlayerConnection.h" #include "ServerConnection.h" -#include "../level/ServerPlayer.h" -#include "../level/ServerPlayerGameMode.h" -#include "../level/ServerLevel.h" -#include "../PlayerList.h" -#include "../MinecraftServer.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "../Settings.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#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 "java/Random.h" + +class Packet; // #if 0 // #include "PS3/Network/NetworkPlayerSony.h" // #endif diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h index 93b5a4266..e499fc47b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.h @@ -1,10 +1,16 @@ #pragma once +#include +#include + #include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" + class MinecraftServer; class Socket; class LoginPacket; class Connection; class Random; +class Packet; class PendingConnection : public PacketListener { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp index 5112f6644..093bdfcb3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp @@ -1,37 +1,106 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include + #include "PlayerConnection.h" -#include "../level/ServerPlayer.h" -#include "../level/ServerLevel.h" -#include "../level/ServerPlayerGameMode.h" -#include "../PlayerList.h" -#include "../MinecraftServer.h" -#include "Minecraft.World/net/minecraft/commands/net.minecraft.commands.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.World/net/minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" -#include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.World/net/minecraft/world/food/net.minecraft.world.food.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.h" +#include "Minecraft.Client/net/minecraft/server/PlayerList.h" +#include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.World/net/minecraft/Pos.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.Client/Common/Source Files/Network/Socket.h" -#include "Minecraft.World/net/minecraft/stats/Achievements.h" -#include "Minecraft.World/net/minecraft/net.minecraft.h" -#include "../level/EntityTracker.h" #include "ServerConnection.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "java/JavaMath.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/Facing.h" +#include "Minecraft.World/net/minecraft/commands/CommandDispatcher.h" +#include "Minecraft.World/net/minecraft/commands/CommandsEnum.h" +#include "Minecraft.World/net/minecraft/network/Connection.h" +#include "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ClientCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerAckPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ContainerSetSlotPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/CustomPayloadPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/DebugOptionsPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/GameEventPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/InteractPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/KickPlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/MovePlayerPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/Packet.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerActionPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerCommandPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/PlayerInputPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCarriedItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SetCreativeModeSlotPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/SignUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TextureChangePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TexturePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" +#include "Minecraft.World/net/minecraft/network/packet/TradeItemPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/UseItemPacket.h" +#include "Minecraft.World/net/minecraft/world/entity/Entity.h" +#include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" +#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/food/FoodConstants.h" +#include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/CraftingMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" +#include "Minecraft.World/net/minecraft/world/inventory/Slot.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" +#include "Minecraft.World/net/minecraft/world/item/MapItem.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h" +#include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" +#include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipe.h" +#include "Minecraft.World/net/minecraft/world/item/trading/MerchantRecipeList.h" +#include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" +#include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" +#include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" +#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 "java/Class.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/Random.h" +#include "java/System.h" -// 4J Added -#include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "../../client/Options.h" +class SavedData; Random PlayerConnection::random; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h index c1f6b1dd8..d8d4391d5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.h @@ -1,13 +1,23 @@ #pragma once +#include #include -#include "../ConsoleInputSource.h" +#include +#include +#include +#include + +#include "Minecraft.Client/net/minecraft/server/ConsoleInputSource.h" #include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" #include "java/JavaIntHash.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" class MinecraftServer; class Connection; class ServerPlayer; class INetworkPlayer; +class Packet; +class Random; class PlayerConnection : public PacketListener, public ConsoleInputSource { // public static Logger logger = Logger.getLogger("Minecraft"); diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp index a3aafef25..b493543d9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp @@ -1,13 +1,16 @@ -#include "Minecraft.World/Header Files/stdafx.h" -#include "../../client/Options.h" +#include + #include "ServerConnection.h" #include "PendingConnection.h" #include "PlayerConnection.h" -#include "../level/ServerPlayer.h" -#include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" -#include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" -#include "../../client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.World/net/minecraft/network/Connection.h" +#include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" +#include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" ServerConnection::ServerConnection(MinecraftServer* server) { // 4J - added initialiser diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.h b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.h index c5dd92998..69bf97ba4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.h @@ -1,5 +1,10 @@ #pragma once #include +#include +#include +#include +#include + class PendingConnection; class PlayerConnection; class MinecraftServer; diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp index 1576c7c00..1f47a265a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp @@ -1,16 +1,23 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include +#include +#include +#include +#include +#include +#include + #include "StatsCounter.h" #include "Minecraft.World/net/minecraft/stats/Stat.h" #include "Minecraft.World/net/minecraft/stats/Stats.h" #include "Minecraft.World/net/minecraft/stats/Achievement.h" #include "Minecraft.World/net/minecraft/stats/Achievements.h" -#include "../client/player/LocalPlayer.h" - -#include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" - -#include "../../../Common/Source Files/Leaderboards/LeaderboardManager.h" -#include +#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_structs.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.World/net/minecraft/stats/GenericStats.h" +#include "Minecraft.World/net/minecraft/world/item/Item.h" +#include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" Stat** StatsCounter::LARGE_STATS[] = {&Stats::walkOneM, &Stats::swimOneM, &Stats::fallOneM, &Stats::climbOneM, diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.h b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.h index 69c449751..c93d4e5fe 100644 --- a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.h +++ b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.h @@ -1,5 +1,7 @@ #pragma once #include +#include + class Stat; class Achievement; class StatsSyncher; diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.cpp b/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.cpp index 0789220ba..fa2d495d7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.cpp @@ -1,4 +1,3 @@ -#include "Minecraft.World/Header Files/stdafx.h" #include "StatsSyncer.h" // 4J - TODO \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.h b/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.h index 61d59aaf1..293529a2f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.h +++ b/minecraft/Minecraft.Client/net/minecraft/stats/StatsSyncer.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + class File; class StatsCounter; class User;