From 251ec595e869b370da84df387e39dc0f2d3ad0b5 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 31 Mar 2026 21:23:57 -0500 Subject: [PATCH] fix a whole lot of missing includes --- minecraft/Minecraft.Client/Common/Consoles_App.cpp | 1 + .../Common/Source Files/Audio/SoundEngine.h | 2 +- .../Source Files/GameRules/ConsoleGameRulesConstants.h | 2 +- .../GameRules/LevelGeneration/LevelGenerationOptions.cpp | 7 +++++-- .../XboxStructureActionPlaceContainer.cpp | 1 + .../Source Files/Tutorial/Constraints/InputConstraint.cpp | 1 + .../Common/Source Files/Tutorial/Tutorial.cpp | 7 +++++-- .../UI/All Platforms/IUIScene_AbstractContainerMenu.cpp | 7 +++++++ .../Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp | 1 + .../UI/All Platforms/IUIScene_CraftingMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_CreativeMenu.cpp | 5 +++++ .../Source Files/UI/All Platforms/IUIScene_PauseMenu.h | 6 ++++++ .../UI/All Platforms/IUIScene_TradingMenu.cpp | 6 ++++++ .../Source Files/UI/Components/UIComponent_Tooltips.h | 1 + .../Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp | 2 ++ .../Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h | 2 ++ .../UI/Scenes/Frontend Menu screens/UIScene_EULA.h | 4 ++++ .../Frontend Menu screens/UIScene_LeaderboardsMenu.h | 1 + .../Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h | 7 +++++++ .../UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp | 1 + .../Frontend Menu screens/UIScene_NewUpdateMessage.h | 2 ++ .../UI/Scenes/Help & Options/UIScene_HowToPlay.h | 1 + .../In-Game Menu Screens/Containers/UIScene_BeaconMenu.h | 1 + .../Containers/UIScene_EnchantingMenu.h | 1 + .../Containers/UIScene_FireworksMenu.cpp | 1 + .../Containers/UIScene_FurnaceMenu.cpp | 2 ++ .../Containers/UIScene_InventoryMenu.h | 1 + .../Containers/UIScene_TradingMenu.cpp | 1 + .../Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h | 1 + .../UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h | 1 + .../Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp | 4 ++++ .../Common/Source Files/UI/UIController.cpp | 1 + minecraft/Minecraft.Client/Header Files/BufferedImage.h | 1 + minecraft/Minecraft.Client/Header Files/stubs.h | 2 +- minecraft/Minecraft.Client/Linux/LinuxGL.cpp | 2 ++ minecraft/Minecraft.Client/Linux/Stubs/winapi_stubs.h | 4 ++++ minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp | 3 +++ .../Minecraft.Client/net/minecraft/client/Camera.cpp | 4 +--- minecraft/Minecraft.Client/net/minecraft/client/User.h | 1 + .../Minecraft.Client/net/minecraft/client/gui/Gui.cpp | 2 ++ .../Minecraft.Client/net/minecraft/client/gui/Screen.cpp | 1 + .../net/minecraft/client/gui/ScrolledSelectionList.h | 1 + .../net/minecraft/client/model/SpiderModel.cpp | 8 ++++---- .../net/minecraft/client/model/VillagerGolemModel.cpp | 2 +- .../net/minecraft/client/model/WitherBossModel.cpp | 1 + .../net/minecraft/client/renderer/Tesselator.h | 1 + .../net/minecraft/client/renderer/Textures.cpp | 5 +++-- .../client/renderer/entity/EnderCrystalRenderer.cpp | 1 + .../client/renderer/entity/EnderDragonRenderer.cpp | 1 + .../client/renderer/entity/WitherBossRenderer.cpp | 1 + .../net/minecraft/client/renderer/texture/StitchSlot.h | 1 + .../net/minecraft/client/renderer/texture/Texture.h | 1 + .../net/minecraft/client/skins/DefaultTexturePack.h | 6 ++++++ .../net/minecraft/client/skins/TexturePackRepository.cpp | 7 +++++++ .../net/minecraft/client/skins/TexturePackRepository.h | 3 +++ .../net/minecraft/server/MinecraftServer.cpp | 5 +++-- .../Minecraft.Client/net/minecraft/server/PlayerList.cpp | 6 +++++- .../Minecraft.Client/net/minecraft/server/PlayerList.h | 8 ++++++++ .../net/minecraft/server/level/ServerLevel.cpp | 3 +++ .../net/minecraft/server/level/ServerPlayer.cpp | 5 +++++ minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp | 2 +- .../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h | 3 +++ .../ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp | 1 + .../ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h | 2 ++ .../ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h | 1 + .../Minecraft.World/ConsoleHelpers/StringHelpers.cpp | 5 +++++ .../net/minecraft/commands/CommandDispatcher.h | 1 + .../net/minecraft/stats/NumberFormatters.h | 2 ++ .../net/minecraft/world/effect/MobEffect.h | 1 + .../net/minecraft/world/entity/PathfinderMob.cpp | 6 +++--- .../net/minecraft/world/entity/TamableAnimal.cpp | 1 + .../minecraft/world/entity/ai/attributes/Attribute.cpp | 2 ++ .../world/entity/ai/attributes/BaseAttributeMap.h | 1 + .../net/minecraft/world/entity/animal/Animal.cpp | 2 ++ .../world/entity/boss/enderdragon/EnderCrystal.cpp | 1 + .../world/entity/boss/enderdragon/EnderDragon.cpp | 4 +++- .../net/minecraft/world/entity/npc/Villager.cpp | 2 ++ .../net/minecraft/world/entity/projectile/Throwable.cpp | 3 ++- .../net/minecraft/world/inventory/AnimalChest.cpp | 3 ++- .../net/minecraft/world/item/FireworksItem.cpp | 2 ++ .../net/minecraft/world/item/PotionItem.cpp | 2 ++ .../net/minecraft/world/item/SpawnEggItem.cpp | 4 ++++ .../world/item/enchantment/ArrowDamageEnchantment.cpp | 2 ++ .../world/item/enchantment/ArrowInfiniteEnchantment.cpp | 2 ++ .../world/item/enchantment/ArrowKnockbackEnchantment.cpp | 2 ++ .../world/item/enchantment/DamageEnchantment.cpp | 2 ++ .../world/item/enchantment/DigDurabilityEnchantment.cpp | 3 ++- .../world/item/enchantment/DiggingEnchantment.cpp | 2 ++ .../net/minecraft/world/item/enchantment/Enchantment.cpp | 2 ++ .../world/item/enchantment/EnchantmentInstance.cpp | 2 ++ .../world/item/enchantment/FireAspectEnchantment.cpp | 2 ++ .../world/item/enchantment/LootBonusEnchantment.cpp | 2 ++ .../world/item/enchantment/OxygenEnchantment.cpp | 2 ++ .../world/item/enchantment/ProtectionEnchantment.cpp | 2 ++ .../world/item/enchantment/ThornsEnchantment.cpp | 2 ++ .../world/item/enchantment/UntouchingEnchantment.cpp | 2 ++ .../world/item/enchantment/WaterWorkerEnchantment.cpp | 2 ++ .../net/minecraft/world/item/trading/Merchant.h | 4 ++++ .../Minecraft.World/net/minecraft/world/level/Level.h | 2 +- .../world/level/levelgen/feature/EndPodiumFeature.cpp | 2 ++ .../net/minecraft/world/level/saveddata/SavedData.h | 2 ++ .../minecraft/world/level/storage/DirectoryLevelStorage.h | 2 ++ .../net/minecraft/world/level/storage/LevelData.h | 1 + .../minecraft/world/level/storage/LevelStorageSource.h | 2 ++ .../net/minecraft/world/level/storage/PlayerIO.h | 2 ++ .../net/minecraft/world/level/tile/AnvilTile.cpp | 2 ++ .../net/minecraft/world/level/tile/EntityTile.h | 5 +++++ .../net/minecraft/world/level/tile/LeafTile.cpp | 2 ++ .../net/minecraft/world/level/tile/SandStoneTile.cpp | 2 ++ .../net/minecraft/world/level/tile/SaplingPlantTile.cpp | 2 ++ .../minecraft/world/level/tile/SmoothStoneBrickTile.cpp | 2 ++ .../net/minecraft/world/level/tile/StoneMonsterTile.cpp | 2 ++ .../net/minecraft/world/level/tile/StoneSlabTile.cpp | 2 ++ .../net/minecraft/world/level/tile/Tile.cpp | 4 +++- .../net/minecraft/world/level/tile/TreeTile.cpp | 2 ++ .../net/minecraft/world/level/tile/WallTile.cpp | 2 ++ .../net/minecraft/world/level/tile/WoodSlabTile.cpp | 2 ++ .../net/minecraft/world/level/tile/WoodTile.cpp | 2 ++ .../world/level/tile/entity/BeaconTileEntity.cpp | 2 ++ .../minecraft/world/level/tile/entity/BeaconTileEntity.h | 4 ++++ .../world/level/tile/entity/BrewingStandTileEntity.cpp | 2 ++ .../minecraft/world/level/tile/entity/ChestTileEntity.cpp | 2 ++ .../world/level/tile/entity/DropperTileEntity.cpp | 4 ++++ .../level/tile/entity/EnchantmentTableTileEntity.cpp | 2 ++ .../world/level/tile/entity/FurnaceTileEntity.cpp | 2 ++ .../world/level/tile/entity/HopperTileEntity.cpp | 2 ++ .../minecraft/world/level/tile/entity/HopperTileEntity.h | 2 ++ minecraft/java/include/java/Arrays.h | 4 ++++ .../java/include/java/InputOutputStream/OutputStream.h | 3 +++ minecraft/java/src/InputOutputStream/FileOutputStream.cpp | 6 ++++++ minecraft/java/src/Random.cpp | 2 ++ 131 files changed, 305 insertions(+), 31 deletions(-) diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index b6478bef9..bd5d226ae 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -50,6 +50,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "4J_Input.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h index 32914d15f..6b644d2c1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h +++ b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h @@ -8,7 +8,7 @@ using namespace std; #include #include "Minecraft.World/Header Files/SoundTypes.h" -#include "./miniaudio.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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h index fb5766eb6..522b04d66 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h @@ -1,6 +1,6 @@ #pragma once -// #include " +#include "java/InputOutputStream/DataOutputStream.h" class ConsoleGameRules { 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 8c3e9260f..edc15fc66 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -1,9 +1,9 @@ - - #include #include #include +#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/Pos.h" #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" @@ -13,6 +13,9 @@ #include "LevelGenerationOptions.h" #include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" #include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.World/x64headers/extraX64.h" + +#include "4J_Storage.h" JustGrSource::JustGrSource() { m_displayName = L"Default_DisplayName"; 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 8e32b4fd3..8c78b46b3 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 @@ -12,6 +12,7 @@ #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/TileEntity.h" XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() { m_tile = Tile::chest_Id; 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 c02ce0548..e0ce9afbd 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 "InputConstraint.h" #include "4J_Input.h" +#include "4J.Common/4J_InputActions.h" #include "Minecraft.Client/Common/App_enums.h" bool InputConstraint::isMappingConstrained(int iPad, int mapping) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp index caf60c606..463b14a19 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp @@ -1,4 +1,5 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" @@ -20,6 +21,8 @@ #include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHints.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "4J.Common/4J_InputActions.h" + std::vector Tutorial::s_completableTasks; int Tutorial::m_iTutorialHintDelayTime = 14000; @@ -1940,7 +1943,7 @@ Tutorial::~Tutorial() { void Tutorial::debugResetPlayerSavedProgress(int iPad) { GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)ProfileManager.GetGameDefinedProfileData(iPad); - ZeroMemory(pGameSettings->ucTutorialCompletion, + memset(pGameSettings->ucTutorialCompletion, 0, TUTORIAL_PROFILE_STORAGE_BYTES); pGameSettings->uiSpecialTutorialBitmask = 0; } 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 43394a049..55eaaaa41 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,6 @@ +#include +#include "Minecraft.Client/Header Files/stdafx.h" #include "IUIScene_AbstractContainerMenu.h" @@ -8,7 +10,12 @@ #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.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/MultiPlayerGameMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" + #include "4J_Input.h" +#include "4J.Common/4J_InputActions.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 43e8bf6a6..18925c219 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,3 +1,4 @@ +#include "Minecraft.Client/Header Files/stdafx.h" #include "IUIScene_AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" 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 12e205d37..a013c364f 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,13 +1,13 @@ #include "Minecraft.Client/Header Files/stdafx.h" #include "4J.Common/4J_InputActions.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 "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "IUIScene_CraftingMenu.h" #include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA [IUIScene_CraftingMenu::m_iMaxGroup2x2] = { 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 c2b5c7e5d..94d797273 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,3 +1,6 @@ +#include + +#include "Minecraft.Client/Header Files/stdafx.h" #include "IUIScene_CreativeMenu.h" @@ -10,8 +13,10 @@ #include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" #include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/Potion_Macros.h" #include "java/JavaMath.h" +#include "4J.Common/4J_InputActions.h" // 4J JEV - Images for each tab. IUIScene_CreativeMenu::TabSpec** IUIScene_CreativeMenu::specs = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h index d86e71484..9237a09eb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h @@ -1,5 +1,11 @@ #pragma once +#include "Minecraft.Client/Header Files/stdafx.h" + +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "4J_Storage.h" +#include "4J_Profile.h" + class IUIScene_PauseMenu { protected: DLCPack* m_pDLCPack; 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 3747dc4b8..35a77f1b1 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,12 +1,18 @@ +#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.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 "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "IUIScene_TradingMenu.h" +#include "4J.Common/4J_InputActions.h" + IUIScene_TradingMenu::IUIScene_TradingMenu() { m_validOffersCount = 0; m_selectedSlot = 0; 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 f35c8f3d8..ca60ba7d6 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 @@ -10,6 +10,7 @@ #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 "4J.Common/4J_InputActions.h" class UILayer; 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 f53086a23..a7e6cb461 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 @@ -6,6 +6,8 @@ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Linux_App.h" +#include "4J.Common/4J_InputActions.h" + class UILayer; const wchar_t* 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 e95095a77..9617c2204 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,8 @@ #pragma once #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" class UIScene_DLCOffersMenu : public UIScene { private: 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 69aaa4465..f7ea08ffd 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,5 +1,9 @@ #pragma once +#include + +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class UIScene_EULA : public UIScene { 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 6da07aded..9eab05da1 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 @@ -2,6 +2,7 @@ #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h" class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener { 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 1f752a824..b2f8555b8 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,7 +1,14 @@ #pragma once +#include +#include + #include "java/File.h" #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h" + +#include "4J_Storage.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 86426c15a..aa1074002 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 @@ -7,6 +7,7 @@ #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_MainMenu.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 fa0aa0b21..c7afe7f74 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,8 @@ #pragma once #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" class UIScene_NewUpdateMessage : public UIScene { private: 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 fd0f272f4..79a57141a 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,7 @@ #pragma once #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" class UIScene_HowToPlay : public UIScene { public: 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 712d866a1..47636b577 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 @@ -2,6 +2,7 @@ #include "UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h" #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h" class UIScene_BeaconMenu : public UIScene_AbstractContainerMenu, 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 7b71ea3b7..2155493c2 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 @@ -3,6 +3,7 @@ #include "UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h" #include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.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 5d45339ce..ca7235949 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,3 +1,4 @@ +#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" 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 fc8ea6037..b11be22c1 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 @@ -5,6 +5,8 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_FurnaceMenu.h" +#include "4J_Profile.h" + UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData, UILayer* parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer) { 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 20f00731e..c028c424f 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 @@ -2,6 +2,7 @@ #include "UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.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 c33a46467..d60b275d1 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 @@ -5,6 +5,7 @@ #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 "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_TradingMenu.h" 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 737df782b..fa07498d8 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 @@ -4,6 +4,7 @@ #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" class UIScene_InGameInfoMenu : public UIScene { private: 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 62685c1a0..0248d07b3 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 @@ -4,6 +4,7 @@ #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" class UIScene_TeleportMenu : 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 7468645ef..bd86c17f7 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,7 +1,11 @@ +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_Keyboard.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" + + #define KEYBOARD_DONE_TIMER_ID 0 #define KEYBOARD_DONE_TIMER_TIME 100 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp index 441dc138f..8b9e792bc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp @@ -4,6 +4,7 @@ #include "UI.h" #include "UIScene.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" +#include "Minecraft.Client/Header Files/BufferedImage.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" diff --git a/minecraft/Minecraft.Client/Header Files/BufferedImage.h b/minecraft/Minecraft.Client/Header Files/BufferedImage.h index 4889483de..022a4150b 100644 --- a/minecraft/Minecraft.Client/Header Files/BufferedImage.h +++ b/minecraft/Minecraft.Client/Header Files/BufferedImage.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include class Graphics; diff --git a/minecraft/Minecraft.Client/Header Files/stubs.h b/minecraft/Minecraft.Client/Header Files/stubs.h index 68ff11bf0..63fd7e778 100644 --- a/minecraft/Minecraft.Client/Header Files/stubs.h +++ b/minecraft/Minecraft.Client/Header Files/stubs.h @@ -157,6 +157,7 @@ void glActiveTexture(int); #endif #ifdef __linux__ +#include "java/File.h" class GL11 { public: @@ -217,7 +218,6 @@ public: class ZipEntry {}; class InputStream; -class File; class ZipFile { public: ZipFile(File* file) {} diff --git a/minecraft/Minecraft.Client/Linux/LinuxGL.cpp b/minecraft/Minecraft.Client/Linux/LinuxGL.cpp index 8e9f141ad..031ee5012 100644 --- a/minecraft/Minecraft.Client/Linux/LinuxGL.cpp +++ b/minecraft/Minecraft.Client/Linux/LinuxGL.cpp @@ -1,5 +1,7 @@ #ifdef __linux__ +#include + #include "4J.Render/4J_Render.h" #include "java/IntBuffer.h" #include "java/FloatBuffer.h" diff --git a/minecraft/Minecraft.Client/Linux/Stubs/winapi_stubs.h b/minecraft/Minecraft.Client/Linux/Stubs/winapi_stubs.h index d648892e0..70b1244b3 100644 --- a/minecraft/Minecraft.Client/Linux/Stubs/winapi_stubs.h +++ b/minecraft/Minecraft.Client/Linux/Stubs/winapi_stubs.h @@ -5,10 +5,14 @@ #include #include +#include +#include +#include #include #include #include #include +#include #define TRUE true #define FALSE false diff --git a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp index f28b7cf27..3fede7824 100644 --- a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp +++ b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp @@ -4,6 +4,9 @@ #include #include +#include +#include + #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/x64headers/extraX64.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp index 11aeed1d9..5cb397720 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp @@ -6,9 +6,7 @@ #include "Camera.h" #include "MemoryTracker.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.Client/Linux/Stubs/d3d11_stubs.h" #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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/User.h b/minecraft/Minecraft.Client/net/minecraft/client/User.h index 4eb99a65d..3324d5c48 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/User.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/User.h @@ -2,6 +2,7 @@ #include #include +#include class Tile; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp index 52d60cd37..e7a3aab05 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp @@ -35,7 +35,9 @@ #include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" #include "Minecraft.Client/net/minecraft/client/ClientConstants.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.World/net/minecraft/util/Mth.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "4J.Common/4J_Compat.h" ResourceLocation Gui::PUMPKIN_BLUR_LOCATION = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp index 0dcddf83b..f173d0f4e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp @@ -4,6 +4,7 @@ #include "Minecraft.World/Header Files/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" #include "4J_Profile.h" +#include "4J_Input.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h index 7c7aaf1e4..8c9e2d057 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h @@ -1,6 +1,7 @@ #pragma once #include #include +#include class Button; class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp index ec03df2b3..bbec16586 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/SpiderModel.cpp @@ -129,13 +129,13 @@ void SpiderModel::setupAnim(float time, float r, float bob, float yRot, -((float)cosf(time * 0.6662f * 2 + std::numbers::pi * 2 * 3 / 4.0f) * 0.4f) * r; float s0 = - abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 0 / 4.0f) * 0.4f) * r; + std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 0 / 4.0f) * 0.4f) * r; float s1 = - abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 2 / 4.0f) * 0.4f) * r; + std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 2 / 4.0f) * 0.4f) * r; float s2 = - abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 1 / 4.0f) * 0.4f) * r; + std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 1 / 4.0f) * 0.4f) * r; float s3 = - abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 3 / 4.0f) * 0.4f) * r; + std::abs((float)sinf(time * 0.6662f + std::numbers::pi * 2 * 3 / 4.0f) * 0.4f) * r; leg0->yRot += +c0; leg1->yRot += -c0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp index 2315acebd..da0116c4a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/VillagerGolemModel.cpp @@ -86,6 +86,6 @@ void VillagerGolemModel::prepareMobModel(std::shared_ptr mob, } float VillagerGolemModel::triangleWave(float bob, float period) { - return (abs(fmod(bob, period) - period * 0.5f) - period * 0.25f) / + return (std::abs(fmod(bob, period) - period * 0.5f) - period * 0.25f) / (period * 0.25f); } \ No newline at end of file diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp index ffc81ed36..77aef7fd5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp @@ -1,3 +1,4 @@ +#include #include "WitherBossModel.h" #include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h index 60d7c5b19..465fb1707 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.h @@ -3,6 +3,7 @@ #include #include #include +#include class ChunkRebuildData; class IntBuffer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp index 874acd46b..9ec87a27b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp @@ -1,6 +1,7 @@ #include #include -#include +#include +#include #include #include @@ -460,7 +461,7 @@ void Textures::bindTextureLayers(ResourceLocation* resource) { continue; } - wstring resourceName = wstring(preLoaded[textureName]) + L".png"; + std::wstring resourceName = std::wstring(preLoaded[textureName]) + L".png"; BufferedImage* image = readImage(textureName, resourceName); if (image == nullptr) { continue; 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 8a352b8de..9951cba31 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -1,3 +1,4 @@ +#include #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" 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 363e8656a..0fab71f97 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -1,3 +1,4 @@ +#include #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" 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 01ee94dae..ee098c19e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -1,3 +1,4 @@ +#include #include "WitherBossRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/WitherBossModel.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 b99ac46a4..f8617682a 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,6 @@ #pragma once +#include #include #include 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 a31edba45..e6bc608d3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h @@ -3,6 +3,7 @@ #include #include #include +#include class Rect2i; class ByteBuffer; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h index dde080438..c43d3cb3d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h @@ -1,6 +1,12 @@ #pragma once +#include "Minecraft.Client/Header Files/stdafx.h" + #include "AbstractTexturePack.h" +#include "java/InputOutputStream/InputStream.h" + +#include "strings.h" + class DefaultTexturePack : public AbstractTexturePack { public: DefaultTexturePack(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp index 83147a9c6..5fe347aeb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp @@ -1,3 +1,4 @@ +#include "Minecraft.Client/Header Files/stdafx.h" #include "TexturePackRepository.h" #include "DefaultTexturePack.h" @@ -8,6 +9,12 @@ #include "java/File.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "4J_Input.h" + +#include "strings.h" TexturePack* TexturePackRepository::DEFAULT_TEXTURE_PACK = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h index 5b8bd0d1d..5965b1c28 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h @@ -1,5 +1,8 @@ #pragma once + +#include #include "TexturePack.h" +#include "java/File.h" class Minecraft; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index dc4737759..881ad2d73 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp @@ -1,5 +1,4 @@ - -// #include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include #include @@ -52,6 +51,8 @@ #include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "4J_Input.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.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 86a21d220..b7db8acce 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp @@ -1,5 +1,8 @@ - #include +#include + +#include "Minecraft.Client/Header Files/stdafx.h" + #include "PlayerList.h" #include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" #include "MinecraftServer.h" @@ -28,6 +31,7 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" // 4J - this class is fairly substantially altered as there didn't seem any // point in porting code for banning, whitelisting, ops etc. diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h index 4f1bb4473..ce7eff10d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h @@ -2,7 +2,11 @@ #include #include #include +#include +#include +#include +#include "nbt/CompoundTag.h" #include "4J.Common/4J_Compat.h" class ServerPlayer; @@ -18,6 +22,10 @@ class GameType; class LoginPacket; class Connection; class ServerScoreboard; +class Entity; +class Pos; +class Player; +class Level; class PlayerList { private: diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp index 2aff6b6fc..4e28032ea 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp @@ -2,6 +2,7 @@ #include #include +#include "Minecraft.Client/Header Files/stdafx.h" #include "ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" @@ -45,6 +46,8 @@ #include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" #include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" #include "4J_Input.h" +#include "Minecraft.World/x64headers/extraX64.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" std::vector ServerLevel::RANDOM_BONUS_ITEMS; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp index 02b4080c5..78710bb81 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp @@ -1,4 +1,5 @@ #include +#include #include "ServerPlayer.h" #include "ServerPlayerGameMode.h" @@ -28,6 +29,10 @@ #include "Minecraft.World/net/minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" +#include "Minecraft.Client/net/minecraft/client/Minecraft.h" +#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" + +#include "4J_Input.h" #include "Minecraft.World/net/minecraft/Pos.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp b/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp index d1f482465..d65c9d8f7 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h index 93ae12cd8..25f2c4803 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h @@ -1,5 +1,8 @@ #pragma once +#include +#include "java/File.h" + #include "FileHeader.h" #include "ConsoleSavePath.h" diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index a8afef389..b4f909e93 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -33,6 +33,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" +#include "java/File.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" #include "Minecraft.World/x64headers/extraX64.h" #include "platform/PlatformServices.h" diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h index 1eaeb4cdc..cbfb9f906 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h @@ -1,5 +1,7 @@ #pragma once +#include + class ConsoleSavePath { private: std::wstring path; diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h index 200cf493b..5e9fa22d0 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h @@ -4,6 +4,7 @@ #include "Minecraft.World/ConsoleHelpers/Definitions.h" #include +#include // The first 4 bytes is the location of the header (the header itself is at the // end of the file) Then 4 bytes for the size of the header Then 2 bytes for the diff --git a/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp b/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp index 37e88279c..b9c89c3a6 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp @@ -1,5 +1,10 @@ #include "simdutf.h" +#include +#include +#include +#include + std::wstring toLower(const std::wstring& a) { std::wstring out = std::wstring(a); std::transform(out.begin(), out.end(), out.begin(), ::tolower); diff --git a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h b/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h index 21c6c1150..ba18ac6d9 100644 --- a/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h +++ b/minecraft/Minecraft.World/net/minecraft/commands/CommandDispatcher.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/stats/NumberFormatters.h b/minecraft/Minecraft.World/net/minecraft/stats/NumberFormatters.h index 29a1bba51..7151096af 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/NumberFormatters.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/NumberFormatters.h @@ -1,5 +1,7 @@ #pragma once +#include + // 4J Stu - The java formated numbers based on a local passed in, but I am just // going for a constant format here class NumberFormat { diff --git a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h index 7e0ab7f2f..8b615e785 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h +++ b/minecraft/Minecraft.World/net/minecraft/world/effect/MobEffect.h @@ -4,6 +4,7 @@ #include "Minecraft.Client/Common/App_enums.h" #include +#include class Mob; class MobEffectInstance; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp index 772bbd865..a296d67a2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/PathfinderMob.cpp @@ -319,9 +319,9 @@ void PathfinderMob::tickLeash() { double dy = (leashHolder->y - y) / _distanceTo; double dz = (leashHolder->z - z) / _distanceTo; - xd += dx * abs(dx) * .4; - yd += dy * abs(dy) * .4; - zd += dz * abs(dz) * .4; + xd += dx * std::abs(dx) * .4; + yd += dy * std::abs(dy) * .4; + zd += dz * std::abs(dz) * .4; } if (_distanceTo > 10) { dropLeash(true, true); diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp index d9f3b07d6..2dfc000da 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp @@ -3,6 +3,7 @@ #include "TamableAnimal.h" #include "java/Random.h" #include "nbt/CompoundTag.h" +#include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/entity/EntityEvent.h" #include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp index ae7dae1a7..b91433809 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/Attribute.cpp @@ -1,5 +1,7 @@ #include "Attribute.h" +#include "strings.h" + const int Attribute::AttributeNames[] = { IDS_ATTRIBUTE_NAME_GENERIC_MAXHEALTH, IDS_ATTRIBUTE_NAME_GENERIC_FOLLOWRANGE, diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h index f89182cf6..5eb3c9ecb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/attributes/BaseAttributeMap.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp index 85e11dd84..15d3489ef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Animal.cpp @@ -1,3 +1,4 @@ +#include #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" @@ -11,6 +12,7 @@ #include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" #include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" #include "java/Random.h" #include "Animal.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp index 6291423ac..385c37330 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp @@ -4,6 +4,7 @@ #include "net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystal.h" #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" void EnderCrystal::_init(Level* level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index c5b67d18e..ccf03d75a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -13,9 +13,11 @@ #include "net.minecraft.world.entity.boss.enderdragon.h" #include "Minecraft.World/net/minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" +#include "Minecraft.World/net/minecraft/util/Mth.h" #include "EnderDragon.h" #include #include +#include #define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1 @@ -919,7 +921,7 @@ void EnderDragon::findNewTarget() { // More likely to strafe a player if they are close to the egg, // or there are not many crystals remaining else if (playerNearestToEgg != nullptr && - (random->nextInt(abs(dist) + 2) == 0 || + (random->nextInt(std::abs(dist) + 2) == 0 || random->nextInt(m_remainingCrystalsCount + 2) == 0)) { setSynchedAction(e_EnderdragonAction_StrafePlayer); #if PRINT_DRAGON_STATE_CHANGE_MESSAGES diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp index 1680f7218..386990555 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" #include "Minecraft.World/net/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp index 2ea3313b9..a54c4c63e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp @@ -9,6 +9,7 @@ #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.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/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" @@ -263,7 +264,7 @@ float Throwable::getShadowHeightOffs() { return 0; } std::shared_ptr Throwable::getOwner() { if (owner == nullptr && !ownerName.empty()) { - owner = std::dynamic_pointer_cast(level->getPlayerByName(ownerName)); + owner = level->getPlayerByName(ownerName); } return owner; } diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp index e963ed4dd..f02b6c660 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnimalChest.cpp @@ -1,6 +1,7 @@ - #include "AnimalChest.h" +#include "strings.h" + AnimalChest::AnimalChest(const std::wstring& name, int size) : SimpleContainer(IDS_CONTAINER_ANIMAL, name, false, size) {} diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp index 158a89ac4..8a0b72da3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.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 "net.minecraft.world.item.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp index 7d1a625cd..7751dfb04 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "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/effect/net.minecraft.world.effect.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp index 61c78a207..f62120018 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" @@ -12,6 +14,8 @@ #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" + SpawnEggItem::SpawnEggItem(int id) : Item(id) { setMaxStackSize(16); // 4J-PB brought forward. It is 64 on PC, but we'll // never be able to place that many diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp index 0bd7fe014..bd2f59270 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp @@ -1,5 +1,7 @@ #include "ArrowDamageEnchantment.h" +#include "strings.h" + ArrowDamageEnchantment::ArrowDamageEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::bow) { setDescriptionId(IDS_ENCHANTMENT_ARROW_DAMAGE); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp index 9b1f838c9..028b33ded 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp @@ -1,5 +1,7 @@ #include "ArrowInfiniteEnchantment.h" +#include "strings.h" + ArrowInfiniteEnchantment::ArrowInfiniteEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::bow) { setDescriptionId(IDS_ENCHANTMENT_ARROW_INFINITE); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp index 9cabfe955..13e5c96f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp @@ -1,5 +1,7 @@ #include "ArrowKnockbackEnchantment.h" +#include "strings.h" + ArrowKnockbackEnchantment::ArrowKnockbackEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::bow) { setDescriptionId(IDS_ENCHANTMENT_ARROW_KNOCKBACK); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp index 67aadbd11..f5ed79d21 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DamageEnchantment.cpp @@ -2,6 +2,8 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "DamageEnchantment.h" +#include "strings.h" + const int DamageEnchantment::names[] = {IDS_ENCHANTMENT_DAMAGE_ALL, IDS_ENCHANTMENT_DAMAGE_UNDEAD, IDS_ENCHANTMENT_DAMAGE_ARTHROPODS}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp index 9f81e85bd..6b8f03c5e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp @@ -1,8 +1,9 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "DigDurabilityEnchantment.h" - #include "java/Random.h" +#include "strings.h" + DigDurabilityEnchantment::DigDurabilityEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::digger) { setDescriptionId(IDS_ENCHANTMENT_DURABILITY); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp index d340b6420..a731e740d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/DiggingEnchantment.cpp @@ -1,6 +1,8 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "DiggingEnchantment.h" +#include "strings.h" + DiggingEnchantment::DiggingEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::digger) { setDescriptionId(IDS_ENCHANTMENT_DIGGING); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp index 717f3d501..784cbea84 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp @@ -4,6 +4,8 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Enchantment.h" +#include "strings.h" + // Enchantment *Enchantment::enchantments[256]; std::vector Enchantment::enchantments = std::vector(256); std::vector Enchantment::validEnchantments; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp index bc1ee89b0..9b621c2f1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/EnchantmentInstance.cpp @@ -3,6 +3,8 @@ #include "EnchantmentInstance.h" #include "Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.h" +#include "strings.h" + EnchantmentInstance::EnchantmentInstance(Enchantment* enchantment, int level) : WeighedRandomItem(enchantment->getFrequency()), enchantment(enchantment), diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp index df044bb95..23eaf4cfe 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/FireAspectEnchantment.cpp @@ -1,5 +1,7 @@ #include "FireAspectEnchantment.h" +#include "strings.h" + FireAspectEnchantment::FireAspectEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::weapon) { setDescriptionId(IDS_ENCHANTMENT_FIRE); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp index 1d91f7aa0..87c70ddef 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/LootBonusEnchantment.cpp @@ -1,5 +1,7 @@ #include "LootBonusEnchantment.h" +#include "strings.h" + LootBonusEnchantment::LootBonusEnchantment(int id, int frequency, const EnchantmentCategory* cat) : Enchantment(id, frequency, cat) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp index ca96db2bb..d0fcab355 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/OxygenEnchantment.cpp @@ -1,5 +1,7 @@ #include "OxygenEnchantment.h" +#include "strings.h" + OxygenEnchantment::OxygenEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::armor_head) { setDescriptionId(IDS_ENCHANTMENT_OXYGEN); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp index 4868a0df7..75b036617 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ProtectionEnchantment.cpp @@ -4,6 +4,8 @@ #include "Minecraft.World/net/minecraft/util/Mth.h" #include "ProtectionEnchantment.h" +#include "strings.h" + const int ProtectionEnchantment::names[] = { IDS_ENCHANTMENT_PROTECT_ALL, IDS_ENCHANTMENT_PROTECT_FIRE, IDS_ENCHANTMENT_PROTECT_FALL, IDS_ENCHANTMENT_PROTECT_EXPLOSION, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp index e69e22ae7..42cebc2bf 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/ThornsEnchantment.cpp @@ -4,6 +4,8 @@ #include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "ThornsEnchantment.h" +#include "strings.h" + const float ThornsEnchantment::CHANCE_PER_LEVEl = 0.15f; ThornsEnchantment::ThornsEnchantment(int id, int freq) diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp index 8c7634f14..1e6c3721d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/UntouchingEnchantment.cpp @@ -1,6 +1,8 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "UntouchingEnchantment.h" +#include "strings.h" + UntouchingEnchantment::UntouchingEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::digger) { setDescriptionId(IDS_ENCHANTMENT_UNTOUCHING); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp index 31f2d4cd5..3227f7bc6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp @@ -1,5 +1,7 @@ #include "WaterWorkerEnchantment.h" +#include "strings.h" + WaterWorkerEnchantment::WaterWorkerEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::armor_head) { setDescriptionId(IDS_ENCHANTMENT_WATER_WORKER); diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/trading/Merchant.h b/minecraft/Minecraft.World/net/minecraft/world/item/trading/Merchant.h index 8c9e74f04..65cb6f347 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/trading/Merchant.h +++ b/minecraft/Minecraft.World/net/minecraft/world/item/trading/Merchant.h @@ -1,8 +1,12 @@ #pragma once +#include +#include + class MerchantRecipeList; class MerchantRecipe; class Player; +class ItemInstance; class Merchant { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h index 916a2f0e2..e8d13494a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h @@ -1,7 +1,7 @@ #pragma once #include -#include +// #include #include #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp index 2ff47ca60..68d67f04b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp @@ -1,3 +1,5 @@ +#include + #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h index 0571bf103..5f7b59d41 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "java/Class.h" class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h index 300f83db7..42aaf63ee 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h @@ -31,6 +31,8 @@ #include #include "java/File.h" +#include "nbt/CompoundTag.h" + #include "LevelStorage.h" #include "PlayerIO.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h index 78ae54a83..94aaf0eb4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelData.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "Minecraft.World/net/minecraft/world/level/GameRules.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h index a314162c5..0adfc2cd2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h @@ -1,5 +1,7 @@ #pragma once +#include +#include class LevelSummary; class ProgressListener; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h index 7a99033ba..5667b3b8b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h @@ -1,5 +1,7 @@ #pragma once +#include "nbt/CompoundTag.h" + // If we have more than MAX_PLAYER_DATA_SAVES player.dat's then we delete the // oldest ones This value can be no higher than MAXIMUM_MAP_SAVE_DATA/3 (3 being // the number of dimensions in future versions) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp index abce792ee..56f83aa7c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/AnvilTile.cpp @@ -7,6 +7,8 @@ #include "AnvilTile.h" #include "Minecraft.World/net/minecraft/util/Mth.h" +#include "strings.h" + const unsigned int AnvilTile::ANVIL_NAMES[ANVIL_NAMES_LENGTH] = { IDS_TILE_ANVIL_INTACT, IDS_TILE_ANVIL_SLIGHTLYDAMAGED, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EntityTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EntityTile.h index b92471121..08149c272 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EntityTile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EntityTile.h @@ -1,5 +1,10 @@ #pragma once +#include + +class TileEntity; +class Level; + class EntityTile { public: virtual std::shared_ptr newTileEntity(Level* level) = 0; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp index 7a9d50fb9..e4dad50ed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp @@ -7,6 +7,8 @@ #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "strings.h" + const unsigned int LeafTile::LEAF_NAMES[LEAF_NAMES_LENGTH] = { IDS_TILE_LEAVES_OAK, IDS_TILE_LEAVES_SPRUCE, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp index a2c693c18..04c725998 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SandStoneTile.cpp @@ -3,6 +3,8 @@ #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "SandStoneTile.h" +#include "strings.h" + const std::wstring SandStoneTile::TEXTURE_TOP = L"sandstone_top"; const std::wstring SandStoneTile::TEXTURE_BOTTOM = L"sandstone_bottom"; const std::wstring SandStoneTile::TEXTURE_NAMES[] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp index 4f311915d..89aef28aa 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SaplingPlantTile.cpp @@ -5,6 +5,8 @@ #include "SaplingPlantTile.h" +#include "strings.h" + int Sapling::SAPLING_NAMES[SAPLING_NAMES_SIZE] = { IDS_TILE_SAPLING_OAK, IDS_TILE_SAPLING_SPRUCE, IDS_TILE_SAPLING_BIRCH, IDS_TILE_SAPLING_JUNGLE}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp index a63da52d4..dfe23070a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SmoothStoneBrickTile.cpp @@ -1,6 +1,8 @@ #include "SmoothStoneBrickTile.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "strings.h" + const std::wstring SmoothStoneBrickTile::TEXTURE_NAMES[] = { L"", L"mossy", L"cracked", L"carved"}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp index 50a472813..f2443d7ff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "net.minecraft.world.level.tile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp index a22687daf..e2c08a480 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneSlabTile.cpp @@ -4,6 +4,8 @@ #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "StoneSlabTile.h" +#include "strings.h" + const unsigned int StoneSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = { IDS_TILE_STONESLAB_STONE, IDS_TILE_STONESLAB_SAND, IDS_TILE_STONESLAB_WOOD, IDS_TILE_STONESLAB_COBBLE, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp index 23ec28cf3..336c837ae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp @@ -1,3 +1,5 @@ +#include + #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" @@ -15,8 +17,8 @@ #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" +#include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Tile.h" -#include std::wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile."; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp index 3792d965a..c0dc3104c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TreeTile.cpp @@ -6,6 +6,8 @@ #include "TreeTile.h" +#include "strings.h" + const unsigned int TreeTile::TREE_NAMES[TreeTile::TREE_NAMES_LENGTH] = { IDS_TILE_LOG_OAK, IDS_TILE_LOG_SPRUCE, IDS_TILE_LOG_BIRCH, IDS_TILE_LOG_JUNGLE}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp index 64e527390..82887ebae 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WallTile.cpp @@ -5,6 +5,8 @@ #include "Minecraft.World/net/minecraft/net.minecraft.h" #include "WallTile.h" +#include "strings.h" + const float WallTile::WALL_WIDTH = 3.0f / 16.0f; const float WallTile::WALL_HEIGHT = 13.0f / 16.0f; const float WallTile::POST_WIDTH = 4.0f / 16.0f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp index fb2dfd3b1..812c8c27b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodSlabTile.cpp @@ -6,6 +6,8 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" +#include "strings.h" + const unsigned int WoodSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = { IDS_TILE_STONESLAB_OAK, IDS_TILE_STONESLAB_SPRUCE, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp index 9e245ba5c..d0fbc1166 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WoodTile.cpp @@ -6,6 +6,8 @@ #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" +#include "strings.h" + const unsigned int WoodTile::WOOD_NAMES[WOOD_NAMES_LENGTH] = { IDS_TILE_OAKWOOD_PLANKS, IDS_TILE_SPRUCEWOOD_PLANKS, diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 5a1ef47b7..db3d34b29 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h index e0f1a6732..3f7c700d7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.h @@ -1,6 +1,10 @@ #pragma once + #include "TileEntity.h" #include "Minecraft.World/net/minecraft/world/Container.h" +#include "Minecraft.World/net/minecraft/SharedConstants.h" + +class MobEffect; class BeaconTileEntity : public TileEntity, public Container { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index 1c0cae62c..86dfed6b2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "nbt/com.mojang.nbt.h" #include "BrewingStandTileEntity.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp index 1a715f136..db6ebc3b8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp index e0aedaa9a..27044d872 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -1,3 +1,7 @@ +#include "Minecraft.World/Header Files/stdafx.h" + +#include +#include #include "DropperTileEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index c49bf69b7..2c91b4df6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -1,5 +1,7 @@ #include +#include "Minecraft.World/Header Files/stdafx.h" + #include "EnchantmentTableTileEntity.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index e1a198508..3c5375de8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 5cb8c6c17..c45b3d55b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -1,3 +1,5 @@ +#include "Minecraft.World/Header Files/stdafx.h" + #include "Minecraft.World/net/minecraft/net.minecraft.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" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h index 34ea01306..d0274225c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h @@ -3,6 +3,8 @@ #include "TileEntity.h" #include "Hopper.h" +class ItemEntity; + class HopperTileEntity : public TileEntity, public Hopper { public: eINSTANCEOF GetType() { return eTYPE_HOPPERTILEENTITY; } diff --git a/minecraft/java/include/java/Arrays.h b/minecraft/java/include/java/Arrays.h index 2992c8758..eb7d5b937 100644 --- a/minecraft/java/include/java/Arrays.h +++ b/minecraft/java/include/java/Arrays.h @@ -1,6 +1,10 @@ #pragma once #include +#include +#include + +class Biome; class Arrays { public: diff --git a/minecraft/java/include/java/InputOutputStream/OutputStream.h b/minecraft/java/include/java/InputOutputStream/OutputStream.h index b56c1443d..5ba23fb0a 100644 --- a/minecraft/java/include/java/InputOutputStream/OutputStream.h +++ b/minecraft/java/include/java/InputOutputStream/OutputStream.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + // 4J Stu - Represents Java standard lib abstract class OutputStream { diff --git a/minecraft/java/src/InputOutputStream/FileOutputStream.cpp b/minecraft/java/src/InputOutputStream/FileOutputStream.cpp index dbda13443..1f8da9112 100644 --- a/minecraft/java/src/InputOutputStream/FileOutputStream.cpp +++ b/minecraft/java/src/InputOutputStream/FileOutputStream.cpp @@ -1,6 +1,12 @@ +#include +#include +#include + #include "java/File.h" #include "java/InputOutputStream/FileOutputStream.h" +#include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h" // 4jcraft TODO + // Creates a file output stream to write to the file represented by the // specified File object. A new FileDescriptor object is created to represent // this file connection. First, if there is a security manager, its checkWrite diff --git a/minecraft/java/src/Random.cpp b/minecraft/java/src/Random.cpp index ddfec411c..69309cec0 100644 --- a/minecraft/java/src/Random.cpp +++ b/minecraft/java/src/Random.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include // for int64_t