From 6eb277c9aa342f0d487038de4e662924ebd0f0dd Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Wed, 1 Apr 2026 18:02:06 -0500 Subject: [PATCH] run IWYU on entire codebase --- targets/4J.Input/4J_Input.cpp | 11 +- targets/4J.Profile/4J_Profile.h | 2 + targets/4J.Render/4J_Render.cpp | 18 +- targets/4J.Render/4J_Render.h | 5 +- targets/4J.Storage/4J_Storage.cpp | 1 + targets/4J.Storage/4J_Storage.h | 1 + .../Minecraft.Client/Common/Consoles_App.cpp | 105 +++++---- .../Common/src/Audio/Consoles_SoundEngine.cpp | 2 - .../Common/src/Audio/SoundEngine.cpp | 14 +- .../Common/src/Audio/SoundEngine.h | 1 - .../Common/src/Colours/ColourTable.cpp | 5 +- .../Common/src/ConsoleGameMode.cpp | 1 - .../Common/src/DLC/DLCAudioFile.cpp | 4 +- .../Common/src/DLC/DLCCapeFile.cpp | 2 +- .../Common/src/DLC/DLCColourTableFile.cpp | 2 +- .../Common/src/DLC/DLCGameRulesHeader.cpp | 3 +- .../Common/src/DLC/DLCLocalisationFile.cpp | 2 +- .../Common/src/DLC/DLCManager.cpp | 13 +- .../Common/src/DLC/DLCPack.cpp | 6 +- .../Common/src/DLC/DLCSkinFile.cpp | 6 +- .../Common/src/DLC/DLCSkinFile.h | 1 + .../Common/src/DLC/DLCTextureFile.h | 1 + .../Common/src/DLC/DLCUIDataFile.cpp | 2 +- .../Common/src/GameRules/GameRuleManager.cpp | 24 +- .../Common/src/GameRules/GameRuleManager.h | 9 + .../ApplySchematicRuleDefinition.cpp | 5 +- .../ApplySchematicRuleDefinition.h | 1 - .../LevelGeneration/BiomeOverride.cpp | 2 +- .../ConsoleGenerateStructure.cpp | 3 +- .../LevelGeneration/ConsoleSchematicFile.cpp | 5 +- .../LevelGeneration/ConsoleSchematicFile.h | 2 +- .../LevelGenerationOptions.cpp | 33 ++- .../LevelGeneration/LevelGenerationOptions.h | 7 + .../LevelGeneration/LevelGenerators.cpp | 1 - .../LevelGeneration/StartFeature.cpp | 2 +- .../XboxStructureActionGenerateBox.cpp | 2 +- .../XboxStructureActionPlaceBlock.cpp | 2 +- .../XboxStructureActionPlaceContainer.cpp | 5 +- .../XboxStructureActionPlaceSpawner.cpp | 5 +- .../src/GameRules/LevelRules/LevelRules.cpp | 2 - .../AddEnchantmentRuleDefinition.cpp | 4 +- .../RuleDefinitions/AddItemRuleDefinition.cpp | 4 +- .../CollectItemRuleDefinition.cpp | 5 +- .../CompleteAllRuleDefinition.cpp | 5 +- .../CompoundGameRuleDefinition.cpp | 5 +- .../RuleDefinitions/GameRuleDefinition.cpp | 2 - .../RuleDefinitions/GameRuleDefinition.h | 1 + .../RuleDefinitions/LevelRuleset.cpp | 4 +- .../NamedAreaRuleDefinition.cpp | 4 +- .../UpdatePlayerRuleDefinition.cpp | 5 +- .../RuleDefinitions/UseTileRuleDefinition.cpp | 4 +- .../src/GameRules/LevelRules/Rules/GameRule.h | 1 - .../src/Leaderboards/LeaderboardManager.cpp | 3 - .../Common/src/Localisation/StringTable.cpp | 1 - .../Common/src/Network/GameNetworkManager.cpp | 36 ++- .../Common/src/Network/GameNetworkManager.h | 9 + .../Common/src/Network/NetworkPlayerQNet.cpp | 2 - .../Network/PlatformNetworkManagerStub.cpp | 4 +- .../Common/src/Network/Socket.cpp | 4 +- .../Common/src/Network/Socket.h | 1 + .../Common/src/Trial/TrialMode.cpp | 1 - .../Tutorial/Constraints/AreaConstraint.cpp | 2 +- .../Constraints/ChangeStateConstraint.cpp | 2 +- .../Tutorial/Constraints/InputConstraint.cpp | 1 - .../Common/src/Tutorial/FullTutorial.cpp | 42 +++- .../Common/src/Tutorial/FullTutorial.h | 1 + .../Common/src/Tutorial/FullTutorialMode.cpp | 3 +- .../Common/src/Tutorial/Hints/AreaHint.cpp | 3 +- .../src/Tutorial/Hints/DiggerItemHint.cpp | 11 +- .../src/Tutorial/Hints/DiggerItemHint.h | 2 + .../src/Tutorial/Hints/LookAtEntityHint.cpp | 3 +- .../src/Tutorial/Hints/LookAtTileHint.cpp | 3 +- .../src/Tutorial/Hints/TakeItemHint.cpp | 3 +- .../src/Tutorial/Hints/TutorialHint.cpp | 1 - .../Common/src/Tutorial/Tasks/AreaTask.cpp | 3 +- .../Common/src/Tutorial/Tasks/AreaTask.h | 1 + .../Common/src/Tutorial/Tasks/ChoiceTask.cpp | 3 +- .../Tutorial/Tasks/CompleteUsingItemTask.cpp | 2 +- .../src/Tutorial/Tasks/ControllerTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/CraftTask.cpp | 3 +- .../Common/src/Tutorial/Tasks/CraftTask.h | 1 + .../Tutorial/Tasks/FullTutorialActiveTask.cpp | 3 +- .../src/Tutorial/Tasks/HorseChoiceTask.cpp | 3 +- .../Common/src/Tutorial/Tasks/InfoTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/PickupTask.h | 1 + .../Tutorial/Tasks/ProcedureCompoundTask.cpp | 1 + .../src/Tutorial/Tasks/ProgressFlagTask.h | 1 + .../src/Tutorial/Tasks/RideEntityTask.cpp | 2 +- .../src/Tutorial/Tasks/RideEntityTask.h | 1 + .../Common/src/Tutorial/Tasks/StatTask.cpp | 2 +- .../src/Tutorial/Tasks/TutorialTask.cpp | 1 - .../Common/src/Tutorial/Tasks/UseItemTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/UseItemTask.h | 1 + .../Common/src/Tutorial/Tasks/UseTileTask.cpp | 2 +- .../Common/src/Tutorial/Tasks/UseTileTask.h | 1 + .../src/Tutorial/Tasks/XuiCraftingTask.h | 1 + .../Common/src/Tutorial/Tutorial.cpp | 51 ++++- .../Common/src/Tutorial/Tutorial.h | 14 ++ .../Common/src/Tutorial/TutorialMode.cpp | 5 +- .../src/UI/All Platforms/ArchiveFile.cpp | 2 - .../IUIScene_AbstractContainerMenu.cpp | 28 ++- .../IUIScene_AbstractContainerMenu.h | 4 + .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 21 +- .../src/UI/All Platforms/IUIScene_AnvilMenu.h | 3 + .../UI/All Platforms/IUIScene_BeaconMenu.cpp | 3 +- .../UI/All Platforms/IUIScene_BrewingMenu.cpp | 2 +- .../All Platforms/IUIScene_ContainerMenu.cpp | 2 +- .../All Platforms/IUIScene_CraftingMenu.cpp | 28 ++- .../UI/All Platforms/IUIScene_CraftingMenu.h | 4 + .../All Platforms/IUIScene_CreativeMenu.cpp | 44 +++- .../UI/All Platforms/IUIScene_CreativeMenu.h | 9 + .../All Platforms/IUIScene_EnchantingMenu.cpp | 3 +- .../All Platforms/IUIScene_FireworksMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_FurnaceMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_HopperMenu.cpp | 2 +- .../IUIScene_HorseInventoryMenu.cpp | 2 +- .../All Platforms/IUIScene_InventoryMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_PauseMenu.cpp | 20 +- .../src/UI/All Platforms/IUIScene_PauseMenu.h | 2 + .../UI/All Platforms/IUIScene_TradingMenu.cpp | 21 +- .../UI/All Platforms/IUIScene_TradingMenu.h | 10 + .../src/UI/Components/UIComponent_Chat.cpp | 5 +- .../Components/UIComponent_DebugUIConsole.cpp | 1 - .../UIComponent_DebugUIMarketingGuide.cpp | 2 +- .../src/UI/Components/UIComponent_Logo.cpp | 1 - .../Components/UIComponent_MenuBackground.cpp | 3 +- .../UI/Components/UIComponent_Panorama.cpp | 5 +- .../UIComponent_PressStartToPlay.cpp | 10 +- .../Components/UIComponent_PressStartToPlay.h | 8 + .../UI/Components/UIComponent_Tooltips.cpp | 7 +- .../Components/UIComponent_TutorialPopup.cpp | 18 +- .../UI/Components/UIComponent_TutorialPopup.h | 13 ++ .../Common/src/UI/Components/UIScene_HUD.cpp | 23 +- .../Common/src/UI/Components/UIScene_HUD.h | 9 + .../Common/src/UI/Controls/UIControl.cpp | 2 + .../Common/src/UI/Controls/UIControl_Base.cpp | 2 +- .../Controls/UIControl_BeaconEffectButton.cpp | 2 +- .../Controls/UIControl_BeaconEffectButton.h | 2 + .../src/UI/Controls/UIControl_BitmapIcon.cpp | 2 +- .../src/UI/Controls/UIControl_BitmapIcon.h | 2 + .../src/UI/Controls/UIControl_Button.cpp | 3 +- .../Common/src/UI/Controls/UIControl_Button.h | 2 + .../src/UI/Controls/UIControl_ButtonList.cpp | 3 +- .../src/UI/Controls/UIControl_ButtonList.h | 2 + .../src/UI/Controls/UIControl_CheckBox.cpp | 3 +- .../src/UI/Controls/UIControl_CheckBox.h | 2 + .../src/UI/Controls/UIControl_Cursor.cpp | 2 +- .../Common/src/UI/Controls/UIControl_Cursor.h | 2 + .../src/UI/Controls/UIControl_DLCList.cpp | 4 +- .../src/UI/Controls/UIControl_DLCList.h | 1 + .../UI/Controls/UIControl_DynamicLabel.cpp | 3 +- .../src/UI/Controls/UIControl_DynamicLabel.h | 1 + .../UI/Controls/UIControl_EnchantmentBook.cpp | 5 +- .../UI/Controls/UIControl_EnchantmentBook.h | 2 + .../Controls/UIControl_EnchantmentButton.cpp | 7 +- .../UI/Controls/UIControl_EnchantmentButton.h | 1 + .../src/UI/Controls/UIControl_HTMLLabel.cpp | 3 +- .../src/UI/Controls/UIControl_HTMLLabel.h | 2 + .../src/UI/Controls/UIControl_Label.cpp | 3 +- .../Common/src/UI/Controls/UIControl_Label.h | 2 + .../UI/Controls/UIControl_LeaderboardList.cpp | 2 +- .../UI/Controls/UIControl_LeaderboardList.h | 2 + .../UI/Controls/UIControl_MinecraftHorse.cpp | 4 +- .../UI/Controls/UIControl_MinecraftHorse.h | 2 + .../UI/Controls/UIControl_MinecraftPlayer.cpp | 5 +- .../UI/Controls/UIControl_MinecraftPlayer.h | 2 + .../src/UI/Controls/UIControl_PlayerList.cpp | 4 +- .../src/UI/Controls/UIControl_PlayerList.h | 1 + .../Controls/UIControl_PlayerSkinPreview.cpp | 6 +- .../UI/Controls/UIControl_PlayerSkinPreview.h | 2 + .../src/UI/Controls/UIControl_Progress.cpp | 3 +- .../src/UI/Controls/UIControl_Progress.h | 2 + .../src/UI/Controls/UIControl_SaveList.cpp | 4 +- .../src/UI/Controls/UIControl_SaveList.h | 1 + .../src/UI/Controls/UIControl_Slider.cpp | 4 +- .../Common/src/UI/Controls/UIControl_Slider.h | 2 + .../src/UI/Controls/UIControl_SlotList.cpp | 2 +- .../src/UI/Controls/UIControl_SlotList.h | 2 + .../Controls/UIControl_SpaceIndicatorBar.cpp | 3 +- .../UI/Controls/UIControl_SpaceIndicatorBar.h | 3 +- .../src/UI/Controls/UIControl_TextInput.cpp | 3 +- .../src/UI/Controls/UIControl_TextInput.h | 2 + .../UI/Controls/UIControl_TexturePackList.cpp | 3 +- .../UI/Controls/UIControl_TexturePackList.h | 2 + .../src/UI/Controls/UIControl_Touch.cpp | 1 + .../Common/src/UI/Controls/UIControl_Touch.h | 2 + .../Debug/UIScene_DebugCreateSchematic.cpp | 7 +- .../UI/Scenes/Debug/UIScene_DebugOptions.cpp | 3 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 8 +- .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 9 +- .../IUIScene_StartGame.cpp | 5 +- .../UIScene_CreateWorldMenu.cpp | 29 ++- .../UIScene_CreateWorldMenu.h | 12 + .../UIScene_DLCMainMenu.cpp | 12 +- .../UIScene_DLCMainMenu.h | 8 + .../UIScene_DLCOffersMenu.cpp | 17 +- .../UIScene_DLCOffersMenu.h | 8 + .../Frontend Menu screens/UIScene_EULA.cpp | 18 +- .../Frontend Menu screens/UIScene_EULA.h | 4 + .../Frontend Menu screens/UIScene_Intro.cpp | 5 +- .../UIScene_JoinMenu.cpp | 29 ++- .../Frontend Menu screens/UIScene_JoinMenu.h | 8 + .../UIScene_LaunchMoreOptionsMenu.cpp | 21 +- .../UIScene_LaunchMoreOptionsMenu.h | 8 + .../UIScene_LeaderboardsMenu.cpp | 44 ++-- .../UIScene_LeaderboardsMenu.h | 11 + .../UIScene_LoadMenu.cpp | 28 ++- .../Frontend Menu screens/UIScene_LoadMenu.h | 11 + .../UIScene_LoadOrJoinMenu.cpp | 37 +++- .../UIScene_LoadOrJoinMenu.h | 9 + .../UIScene_MainMenu.cpp | 31 ++- .../Frontend Menu screens/UIScene_MainMenu.h | 9 + .../UIScene_NewUpdateMessage.cpp | 17 +- .../UIScene_NewUpdateMessage.h | 6 + .../UIScene_SaveMessage.cpp | 14 +- .../UIScene_SaveMessage.h | 7 + .../UIScene_TrialExitUpsell.cpp | 11 +- .../UIScene_TrialExitUpsell.h | 5 + .../Help & Options/UIScene_ControlsMenu.cpp | 18 +- .../Help & Options/UIScene_ControlsMenu.h | 8 + .../Scenes/Help & Options/UIScene_Credits.cpp | 12 +- .../Scenes/Help & Options/UIScene_Credits.h | 8 + .../UIScene_HelpAndOptionsMenu.cpp | 10 +- .../UIScene_HelpAndOptionsMenu.h | 6 + .../Help & Options/UIScene_HowToPlay.cpp | 17 +- .../Scenes/Help & Options/UIScene_HowToPlay.h | 6 + .../Help & Options/UIScene_HowToPlayMenu.cpp | 12 +- .../Help & Options/UIScene_HowToPlayMenu.h | 6 + .../UIScene_LanguageSelector.cpp | 13 +- .../Help & Options/UIScene_LanguageSelector.h | 6 + .../Help & Options/UIScene_ReinstallMenu.cpp | 8 +- .../Help & Options/UIScene_ReinstallMenu.h | 6 + .../UIScene_SettingsAudioMenu.cpp | 12 +- .../UIScene_SettingsAudioMenu.h | 6 + .../UIScene_SettingsControlMenu.cpp | 12 +- .../UIScene_SettingsControlMenu.h | 6 + .../UIScene_SettingsGraphicsMenu.cpp | 16 +- .../UIScene_SettingsGraphicsMenu.h | 6 + .../Help & Options/UIScene_SettingsMenu.cpp | 10 +- .../Help & Options/UIScene_SettingsMenu.h | 7 + .../UIScene_SettingsOptionsMenu.cpp | 19 +- .../UIScene_SettingsOptionsMenu.h | 6 + .../Help & Options/UIScene_SettingsUIMenu.cpp | 14 +- .../Help & Options/UIScene_SettingsUIMenu.h | 6 + .../Help & Options/UIScene_SkinSelectMenu.cpp | 23 +- .../Help & Options/UIScene_SkinSelectMenu.h | 11 + .../UIScene_AbstractContainerMenu.cpp | 23 +- .../UIScene_AbstractContainerMenu.h | 7 + .../Containers/UIScene_AnvilMenu.cpp | 26 ++- .../Containers/UIScene_AnvilMenu.h | 8 + .../Containers/UIScene_BeaconMenu.cpp | 22 +- .../Containers/UIScene_BeaconMenu.h | 9 + .../Containers/UIScene_BrewingStandMenu.cpp | 7 +- .../Containers/UIScene_ContainerMenu.cpp | 7 +- .../Containers/UIScene_CreativeMenu.cpp | 10 +- .../Containers/UIScene_DispenserMenu.cpp | 7 +- .../Containers/UIScene_EnchantingMenu.cpp | 21 +- .../Containers/UIScene_EnchantingMenu.h | 8 + .../Containers/UIScene_FireworksMenu.cpp | 18 +- .../Containers/UIScene_FireworksMenu.h | 8 + .../Containers/UIScene_FurnaceMenu.cpp | 18 +- .../Containers/UIScene_FurnaceMenu.h | 9 + .../Containers/UIScene_HopperMenu.cpp | 7 +- .../Containers/UIScene_HorseInventoryMenu.cpp | 9 +- .../Containers/UIScene_InventoryMenu.cpp | 26 ++- .../Containers/UIScene_InventoryMenu.h | 8 + .../Containers/UIScene_TradingMenu.cpp | 26 ++- .../Containers/UIScene_TradingMenu.h | 6 + .../UIScene_CraftingMenu.cpp | 25 ++- .../UIScene_CraftingMenu.h | 10 + .../UIScene_DeathMenu.cpp | 18 +- .../In-Game Menu Screens/UIScene_DeathMenu.h | 6 + .../In-Game Menu Screens/UIScene_EndPoem.cpp | 20 +- .../In-Game Menu Screens/UIScene_EndPoem.h | 8 + .../UIScene_InGameHostOptionsMenu.cpp | 20 +- .../UIScene_InGameHostOptionsMenu.h | 6 + .../UIScene_InGameInfoMenu.cpp | 24 +- .../UIScene_InGameInfoMenu.h | 8 + .../UIScene_InGamePlayerOptionsMenu.cpp | 22 +- .../UIScene_InGamePlayerOptionsMenu.h | 8 + .../UIScene_PauseMenu.cpp | 24 +- .../In-Game Menu Screens/UIScene_PauseMenu.h | 7 + .../UIScene_SignEntryMenu.cpp | 16 +- .../UIScene_SignEntryMenu.h | 6 + .../UIScene_TeleportMenu.cpp | 20 +- .../UIScene_TeleportMenu.h | 6 + .../UI/Scenes/UIScene_ConnectingProgress.cpp | 16 +- .../UI/Scenes/UIScene_ConnectingProgress.h | 7 + .../UI/Scenes/UIScene_FullscreenProgress.cpp | 21 +- .../UI/Scenes/UIScene_FullscreenProgress.h | 9 + .../Common/src/UI/Scenes/UIScene_Keyboard.cpp | 12 +- .../Common/src/UI/Scenes/UIScene_Keyboard.h | 7 + .../src/UI/Scenes/UIScene_MessageBox.cpp | 12 +- .../Common/src/UI/Scenes/UIScene_MessageBox.h | 8 + .../src/UI/Scenes/UIScene_QuadrantSignin.cpp | 14 +- .../src/UI/Scenes/UIScene_QuadrantSignin.h | 7 + .../Common/src/UI/Scenes/UIScene_Timer.cpp | 2 +- .../Common/src/UI/UIBitmapFont.cpp | 2 + .../Common/src/UI/UIController.cpp | 50 ++++- .../Common/src/UI/UIController.h | 12 + .../Common/src/UI/UIGroup.cpp | 4 +- .../Common/src/UI/UILayer.cpp | 7 +- .../Common/src/UI/UIScene.cpp | 12 +- .../Minecraft.Client/Common/src/UI/UIScene.h | 1 - .../Common/src/UI/UIString.cpp | 2 - .../Common/src/UI/UITTFFont.cpp | 2 +- .../Minecraft.Client/Linux/Iggy/gdraw/gdraw.c | 2 +- targets/Minecraft.Client/Linux/LinuxGL.cpp | 6 +- targets/Minecraft.Client/Linux/Linux_App.cpp | 3 +- .../Linux/Linux_Minecraft.cpp | 40 ++-- .../Linux/Linux_UIController.cpp | 5 +- .../Linux/Stubs/winapi_stubs.h | 3 + .../Linux/linux_game_stubs.cpp | 4 - targets/Minecraft.Client/include/stubs.h | 2 + .../Minecraft.Client/src/BufferedImage.cpp | 3 +- .../Minecraft.Client/src/Extrax64Stubs.cpp | 2 - targets/console_helpers/src/C4JThread.cpp | 4 +- .../console_helpers/src/PerformanceTimer.cpp | 1 + targets/console_helpers/src/StringHelpers.cpp | 3 + targets/console_helpers/src/compression.cpp | 4 - .../InputOutputStream/BufferedOutputStream.h | 1 - .../java/InputOutputStream/DataInputStream.h | 1 + .../java/InputOutputStream/DataOutputStream.h | 1 + .../java/InputOutputStream/FileOutputStream.h | 1 + .../InputOutputStream/InputStreamReader.h | 1 + targets/java/include/java/JavaMath.h | 4 + targets/java/src/ByteBuffer.cpp | 2 - targets/java/src/File.cpp | 3 - .../src/InputOutputStream/BufferedReader.cpp | 3 + .../ByteArrayInputStream.cpp | 2 - .../InputOutputStream/DataOutputStream.cpp | 2 - .../InputOutputStream/FileOutputStream.cpp | 1 + targets/java/src/JavaMath.cpp | 2 + targets/java/src/system.cpp | 6 +- targets/minecraft/Pos.cpp | 2 - targets/minecraft/SharedConstants.cpp | 2 - targets/minecraft/client/Camera.cpp | 3 +- targets/minecraft/client/ClientConstants.cpp | 1 - targets/minecraft/client/GuiMessage.cpp | 2 - targets/minecraft/client/MemoryTracker.cpp | 1 - targets/minecraft/client/Minecraft.cpp | 105 ++++++--- targets/minecraft/client/Minecraft.h | 18 +- targets/minecraft/client/gui/ChatScreen.cpp | 2 +- .../minecraft/client/gui/ConfirmScreen.cpp | 2 +- .../minecraft/client/gui/ControlsScreen.cpp | 2 +- .../client/gui/CreateWorldScreen.cpp | 5 +- targets/minecraft/client/gui/DeathScreen.cpp | 2 +- targets/minecraft/client/gui/Font.cpp | 2 - targets/minecraft/client/gui/Gui.cpp | 51 +++-- targets/minecraft/client/gui/Gui.h | 7 + .../minecraft/client/gui/InBedChatScreen.cpp | 2 +- .../client/gui/JoinMultiplayerScreen.cpp | 2 +- targets/minecraft/client/gui/Minimap.cpp | 3 +- .../minecraft/client/gui/OptionsScreen.cpp | 2 +- targets/minecraft/client/gui/PauseScreen.cpp | 4 +- .../client/gui/RenameWorldScreen.cpp | 2 +- targets/minecraft/client/gui/Screen.cpp | 3 +- .../client/gui/ScreenSizeCalculator.cpp | 1 - .../client/gui/ScrolledSelectionList.h | 1 - .../client/gui/SelectWorldScreen.cpp | 6 +- .../minecraft/client/gui/SelectWorldScreen.h | 1 + .../client/gui/TradeSwitchButton.cpp | 2 +- .../client/gui/VideoSettingsScreen.cpp | 2 +- .../gui/achievement/AchievementScreen.cpp | 2 +- .../gui/inventory/AbstractContainerScreen.h | 1 + .../gui/inventory/BeaconCancelButton.cpp | 2 +- .../gui/inventory/BeaconConfirmButton.cpp | 2 +- .../gui/inventory/BeaconPowerButton.cpp | 2 +- .../client/gui/inventory/BeaconScreen.cpp | 5 +- .../gui/inventory/BrewingStandScreen.cpp | 2 +- .../client/gui/inventory/ContainerScreen.cpp | 2 +- .../client/gui/inventory/CraftingScreen.cpp | 2 +- .../gui/inventory/CreativeInventoryScreen.cpp | 5 +- .../client/gui/inventory/FurnaceScreen.cpp | 2 +- .../gui/inventory/HorseInventoryScreen.cpp | 5 +- .../client/gui/inventory/InventoryScreen.cpp | 3 +- .../client/gui/inventory/RepairScreen.cpp | 2 +- .../client/gui/inventory/TrapScreen.cpp | 2 +- targets/minecraft/client/level/DemoLevel.cpp | 1 + targets/minecraft/client/level/DemoLevel.h | 1 - targets/minecraft/client/model/CowModel.cpp | 2 +- .../minecraft/client/model/EndermanModel.cpp | 2 +- .../minecraft/client/model/HumanoidModel.cpp | 2 - targets/minecraft/client/model/PigModel.cpp | 2 +- .../minecraft/client/model/SheepFurModel.cpp | 2 +- targets/minecraft/client/model/SheepModel.cpp | 2 +- .../minecraft/client/model/SkeletonModel.cpp | 2 +- targets/minecraft/client/model/Vertex.cpp | 2 + .../client/model/VillagerZombieModel.cpp | 3 +- .../client/model/WitherBossModel.cpp | 3 + .../minecraft/client/model/WitherBossModel.h | 4 + .../minecraft/client/model/ZombieModel.cpp | 3 +- .../client/model/dragon/DragonModel.cpp | 13 +- .../client/model/dragon/DragonModel.h | 2 + targets/minecraft/client/model/geom/Model.cpp | 1 - .../minecraft/client/model/geom/ModelPart.cpp | 3 +- .../client/multiplayer/ClientConnection.cpp | 209 +++++++++++++++--- .../client/multiplayer/ClientConnection.h | 13 ++ .../multiplayer/MultiPlayerChunkCache.cpp | 1 + .../multiplayer/MultiPlayerGameMode.cpp | 4 +- .../client/multiplayer/MultiPlayerLevel.cpp | 7 +- .../client/multiplayer/MultiPlayerLevel.h | 1 - .../multiplayer/MultiPlayerLocalPlayer.cpp | 4 +- .../multiplayer/MultiPlayerLocalPlayer.h | 1 + .../client/particle/BreakingItemParticle.cpp | 4 +- .../client/particle/BubbleParticle.cpp | 5 +- .../client/particle/CritParticle.cpp | 5 +- .../client/particle/DripParticle.cpp | 5 +- .../client/particle/FireworksParticles.cpp | 5 +- .../client/particle/FireworksParticles.h | 1 + .../client/particle/FootstepParticle.cpp | 6 +- .../client/particle/HugeExplosionParticle.cpp | 4 +- .../particle/HugeExplosionSeedParticle.cpp | 4 +- .../client/particle/LavaParticle.cpp | 2 +- .../minecraft/client/particle/Particle.cpp | 5 +- .../client/particle/PlayerCloudParticle.cpp | 2 +- .../client/particle/SuspendedParticle.cpp | 5 +- .../client/particle/TakeAnimationParticle.cpp | 6 +- .../client/particle/TerrainParticle.cpp | 4 +- .../client/particle/WaterDropParticle.cpp | 5 +- .../minecraft/client/player/LocalPlayer.cpp | 11 +- .../minecraft/client/player/RemotePlayer.cpp | 6 +- targets/minecraft/client/renderer/Chunk.cpp | 7 +- targets/minecraft/client/renderer/Chunk.h | 2 +- .../client/renderer/GameRenderer.cpp | 11 +- .../minecraft/client/renderer/GameRenderer.h | 1 - .../client/renderer/ItemInHandRenderer.cpp | 6 - .../client/renderer/LevelRenderer.cpp | 8 +- .../minecraft/client/renderer/LevelRenderer.h | 1 - .../minecraft/client/renderer/Tesselator.cpp | 2 - .../minecraft/client/renderer/Tesselator.h | 1 - .../minecraft/client/renderer/Textures.cpp | 5 +- targets/minecraft/client/renderer/Textures.h | 1 + .../client/renderer/TileRenderer.cpp | 8 +- .../client/renderer/culling/FrustumCuller.cpp | 2 +- .../client/renderer/entity/ArrowRenderer.cpp | 3 +- .../client/renderer/entity/BatRenderer.cpp | 2 +- .../client/renderer/entity/BlazeRenderer.cpp | 2 +- .../client/renderer/entity/BoatRenderer.cpp | 3 +- .../renderer/entity/CaveSpiderRenderer.cpp | 2 +- .../renderer/entity/ChickenRenderer.cpp | 3 +- .../client/renderer/entity/CowRenderer.cpp | 2 +- .../renderer/entity/CreeperRenderer.cpp | 5 +- .../renderer/entity/EnderCrystalRenderer.cpp | 8 +- .../renderer/entity/EnderCrystalRenderer.h | 1 + .../renderer/entity/EnderDragonRenderer.cpp | 16 +- .../renderer/entity/EnderDragonRenderer.h | 1 + .../renderer/entity/EndermanRenderer.cpp | 5 +- .../entity/EntityRenderDispatcher.cpp | 42 ++-- .../renderer/entity/EntityRenderDispatcher.h | 13 ++ .../client/renderer/entity/EntityRenderer.cpp | 4 +- .../renderer/entity/ExperienceOrbRenderer.cpp | 3 +- .../renderer/entity/FallingTileRenderer.cpp | 8 +- .../renderer/entity/FireballRenderer.cpp | 3 +- .../renderer/entity/FishingHookRenderer.cpp | 3 +- .../client/renderer/entity/GhastRenderer.cpp | 2 +- .../renderer/entity/GiantMobRenderer.cpp | 2 +- .../client/renderer/entity/HorseRenderer.cpp | 2 +- .../renderer/entity/HumanoidMobRenderer.cpp | 2 +- .../client/renderer/entity/ItemRenderer.cpp | 10 +- .../renderer/entity/ItemSpriteRenderer.cpp | 5 +- .../renderer/entity/LavaSlimeRenderer.cpp | 2 +- .../renderer/entity/LeashKnotRenderer.cpp | 5 +- .../renderer/entity/LightningBoltRenderer.cpp | 3 +- .../renderer/entity/LivingEntityRenderer.cpp | 3 +- .../entity/MinecartSpawnerRenderer.cpp | 2 +- .../client/renderer/entity/MobRenderer.cpp | 3 +- .../renderer/entity/MushroomCowRenderer.cpp | 5 +- .../client/renderer/entity/OcelotRenderer.cpp | 2 +- .../renderer/entity/PaintingRenderer.cpp | 4 +- .../client/renderer/entity/PigRenderer.cpp | 2 +- .../client/renderer/entity/PlayerRenderer.cpp | 3 +- .../client/renderer/entity/PlayerRenderer.h | 1 + .../client/renderer/entity/SheepRenderer.cpp | 2 +- .../renderer/entity/SilverfishRenderer.cpp | 2 +- .../renderer/entity/SkeletonRenderer.cpp | 2 +- .../client/renderer/entity/SlimeRenderer.cpp | 5 +- .../renderer/entity/SnowManRenderer.cpp | 2 +- .../client/renderer/entity/SpiderRenderer.cpp | 5 +- .../client/renderer/entity/SquidRenderer.cpp | 2 +- .../renderer/entity/TntMinecartRenderer.cpp | 5 +- .../client/renderer/entity/TntRenderer.cpp | 3 +- .../renderer/entity/VillagerGolemRenderer.cpp | 5 +- .../renderer/entity/VillagerRenderer.cpp | 2 +- .../client/renderer/entity/WitchRenderer.cpp | 2 +- .../renderer/entity/WitherBossRenderer.cpp | 9 + .../renderer/entity/WitherBossRenderer.h | 1 + .../renderer/entity/WitherSkullRenderer.cpp | 3 +- .../client/renderer/entity/WolfRenderer.cpp | 2 +- .../client/renderer/entity/ZombieRenderer.cpp | 3 +- .../renderer/texture/StitchedTexture.cpp | 1 - .../client/renderer/texture/Texture.h | 1 - .../renderer/tileentity/BeaconRenderer.cpp | 3 +- .../renderer/tileentity/ChestRenderer.cpp | 5 +- .../tileentity/EnchantTableRenderer.cpp | 3 +- .../tileentity/EnderChestRenderer.cpp | 3 +- .../tileentity/PistonPieceRenderer.cpp | 3 +- .../renderer/tileentity/SignRenderer.cpp | 21 +- .../client/renderer/tileentity/SignRenderer.h | 2 + .../renderer/tileentity/SkullTileRenderer.cpp | 5 +- .../tileentity/TheEndPortalRenderer.cpp | 3 +- .../tileentity/TileEntityRenderDispatcher.cpp | 3 +- .../client/skins/AbstractTexturePack.cpp | 1 - .../minecraft/client/skins/DLCTexturePack.cpp | 1 - .../client/skins/DefaultTexturePack.cpp | 7 +- .../client/skins/DefaultTexturePack.h | 3 + .../client/skins/TexturePackRepository.cpp | 26 +-- .../client/skins/TexturePackRepository.h | 6 + targets/minecraft/commands/Command.h | 2 +- .../minecraft/commands/CommandDispatcher.cpp | 1 + .../minecraft/commands/CommandDispatcher.h | 1 - .../common/DefaultGameModeCommand.cpp | 2 + .../commands/common/EnchantItemCommand.cpp | 1 + .../commands/common/ExperienceCommand.cpp | 2 + .../commands/common/GameModeCommand.cpp | 2 + .../commands/common/GiveItemCommand.cpp | 1 + .../minecraft/commands/common/KillCommand.cpp | 1 + .../minecraft/commands/common/TimeCommand.cpp | 2 + .../commands/common/ToggleDownfallCommand.cpp | 1 + .../AbstractProjectileDispenseBehavior.cpp | 2 +- .../core/DefaultDispenseItemBehavior.cpp | 1 + .../minecraft/core/ItemDispenseBehaviors.cpp | 4 +- targets/minecraft/locale/I18n.h | 1 - targets/minecraft/network/Connection.cpp | 8 +- targets/minecraft/network/Connection.h | 1 - .../network/packet/AddEntityPacket.h | 1 - .../minecraft/network/packet/AddMobPacket.cpp | 1 - .../minecraft/network/packet/AddMobPacket.h | 2 +- .../network/packet/AddPlayerPacket.cpp | 3 - .../network/packet/AddPlayerPacket.h | 1 + .../network/packet/AwardStatPacket.h | 1 - .../network/packet/BlockRegionUpdatePacket.h | 1 - .../minecraft/network/packet/ChatPacket.cpp | 1 - .../network/packet/ChunkTilesUpdatePacket.h | 1 - .../network/packet/CustomPayloadPacket.h | 1 - .../network/packet/DisconnectPacket.cpp | 2 - .../network/packet/DisconnectPacket.h | 2 + .../network/packet/EntityEventPacket.h | 1 - .../network/packet/ExplodePacket.cpp | 1 + .../network/packet/GameCommandPacket.h | 1 - .../network/packet/GameEventPacket.cpp | 6 +- .../network/packet/GameEventPacket.h | 2 + .../minecraft/network/packet/LoginPacket.cpp | 3 - .../network/packet/MoveEntityPacket.cpp | 1 + .../network/packet/MoveEntityPacketSmall.cpp | 1 + targets/minecraft/network/packet/Packet.cpp | 3 - targets/minecraft/network/packet/Packet.h | 7 + .../network/packet/PacketListener.cpp | 1 + .../network/packet/PreLoginPacket.cpp | 2 +- .../minecraft/network/packet/RespawnPacket.h | 1 - .../network/packet/RotateHeadPacket.cpp | 1 + .../network/packet/SetEntityDataPacket.h | 1 + .../network/packet/SetEntityLinkPacket.cpp | 1 + .../network/packet/SetEntityMotionPacket.cpp | 1 + .../network/packet/SetEquippedItemPacket.cpp | 2 + .../minecraft/network/packet/SetTimePacket.h | 1 - .../network/packet/TeleportEntityPacket.cpp | 1 + .../network/packet/TeleportEntityPacket.h | 1 - .../network/packet/TextureAndGeometryPacket.h | 1 + .../network/packet/TileDestructionPacket.cpp | 1 + .../network/packet/UpdateAttributesPacket.cpp | 1 + .../packet/UpdateGameRuleProgressPacket.h | 1 - .../network/packet/UpdateMobEffectPacket.cpp | 1 + .../network/packet/UseItemPacket.cpp | 1 + targets/minecraft/server/MinecraftServer.cpp | 58 +++-- targets/minecraft/server/MinecraftServer.h | 8 + targets/minecraft/server/PlayerList.cpp | 63 +++++- targets/minecraft/server/PlayerList.h | 3 + .../commands/ServerCommandDispatcher.cpp | 1 + .../server/commands/TeleportCommand.cpp | 2 + .../server/level/DerivedServerLevel.cpp | 2 +- .../minecraft/server/level/EntityTracker.cpp | 24 +- .../minecraft/server/level/PlayerChunkMap.cpp | 2 +- .../minecraft/server/level/PlayerChunkMap.h | 1 - .../server/level/ServerChunkCache.cpp | 6 +- .../minecraft/server/level/ServerLevel.cpp | 79 ++++--- targets/minecraft/server/level/ServerLevel.h | 21 ++ .../server/level/ServerLevelListener.cpp | 1 + .../minecraft/server/level/ServerPlayer.cpp | 109 +++++++-- targets/minecraft/server/level/ServerPlayer.h | 13 ++ .../minecraft/server/level/TrackedEntity.cpp | 8 +- .../minecraft/server/level/TrackedEntity.h | 1 + .../server/network/PendingConnection.cpp | 7 +- .../server/network/PlayerConnection.cpp | 4 +- targets/minecraft/stats/Achievement.cpp | 2 +- targets/minecraft/stats/CommonStats.cpp | 4 +- targets/minecraft/stats/CommonStats.h | 1 - targets/minecraft/stats/GenericStats.h | 1 - targets/minecraft/stats/Stat.h | 2 +- targets/minecraft/stats/Stats.cpp | 2 +- targets/minecraft/stats/Stats.h | 1 + targets/minecraft/stats/StatsCounter.cpp | 2 - targets/minecraft/util/Mth.cpp | 3 - targets/minecraft/util/Mth.h | 2 + targets/minecraft/util/WeighedRandom.cpp | 2 - targets/minecraft/util/WeighedRandom.h | 2 + targets/minecraft/util/WeighedTreasure.cpp | 1 + targets/minecraft/world/CompoundContainer.cpp | 1 + targets/minecraft/world/SimpleContainer.cpp | 1 + targets/minecraft/world/SimpleContainer.h | 2 + .../world/damageSource/CombatEntry.cpp | 2 +- .../world/effect/AbsoptionMobEffect.cpp | 2 +- .../world/effect/HealthBoostMobEffect.cpp | 2 +- targets/minecraft/world/effect/MobEffect.cpp | 37 +++- targets/minecraft/world/effect/MobEffect.h | 1 + targets/minecraft/world/entity/AgeableMob.cpp | 2 +- .../minecraft/world/entity/DelayedRelease.cpp | 1 + targets/minecraft/world/entity/Entity.cpp | 6 - targets/minecraft/world/entity/Entity.h | 6 + targets/minecraft/world/entity/EntityIO.cpp | 73 +++++- targets/minecraft/world/entity/EntityIO.h | 9 + .../minecraft/world/entity/ExperienceOrb.cpp | 2 +- targets/minecraft/world/entity/FlyingMob.cpp | 1 + .../minecraft/world/entity/HangingEntity.cpp | 3 +- targets/minecraft/world/entity/ItemFrame.cpp | 7 +- .../world/entity/LeashFenceKnotEntity.cpp | 3 +- .../minecraft/world/entity/LivingEntity.cpp | 7 +- targets/minecraft/world/entity/LivingEntity.h | 9 + targets/minecraft/world/entity/Mob.cpp | 6 - targets/minecraft/world/entity/Mob.h | 8 + targets/minecraft/world/entity/Painting.cpp | 5 +- .../minecraft/world/entity/PathfinderMob.cpp | 1 + .../minecraft/world/entity/PathfinderMob.h | 1 + .../world/entity/SyncedEntityData.cpp | 4 +- .../minecraft/world/entity/SyncedEntityData.h | 2 +- .../minecraft/world/entity/TamableAnimal.cpp | 1 - .../ai/attributes/AttributeModifier.cpp | 1 + .../entity/ai/attributes/BaseAttribute.cpp | 2 + .../entity/ai/attributes/BaseAttributeMap.cpp | 1 + .../attributes/ModifiableAttributeInstance.h | 1 + .../entity/ai/attributes/RangedAttribute.h | 1 + .../ai/attributes/ServersideAttributeMap.cpp | 1 + .../world/entity/ai/goal/AvoidPlayerGoal.cpp | 1 - .../world/entity/ai/goal/BreakDoorGoal.cpp | 2 +- .../world/entity/ai/goal/BreedGoal.cpp | 1 - .../world/entity/ai/goal/FleeSunGoal.cpp | 1 + .../world/entity/ai/goal/FollowParentGoal.cpp | 1 - .../world/entity/ai/goal/GoalSelector.cpp | 2 - .../ai/goal/LookAtTradingPlayerGoal.cpp | 2 +- .../world/entity/ai/goal/OpenDoorGoal.cpp | 2 +- .../world/entity/ai/goal/PlayGoal.cpp | 1 - .../world/entity/ai/goal/TakeFlowerGoal.cpp | 1 - .../goal/target/DefendVillageTargetGoal.cpp | 2 +- .../ai/goal/target/HurtByTargetGoal.cpp | 3 +- .../target/NearestAttackableTargetGoal.cpp | 3 +- .../entity/ai/navigation/PathNavigation.cpp | 2 +- .../world/entity/ai/util/RandomPos.cpp | 1 + .../world/entity/ai/village/Village.cpp | 5 +- .../world/entity/ai/village/VillageSiege.cpp | 3 +- .../world/entity/ai/village/Villages.cpp | 4 +- .../world/entity/ambient/AmbientCreature.cpp | 2 + .../minecraft/world/entity/ambient/Bat.cpp | 3 +- .../minecraft/world/entity/animal/Animal.cpp | 38 +++- .../minecraft/world/entity/animal/Animal.h | 5 + .../minecraft/world/entity/animal/Chicken.cpp | 2 +- targets/minecraft/world/entity/animal/Cow.cpp | 2 +- .../world/entity/animal/EntityHorse.cpp | 4 +- .../world/entity/animal/EntityHorse.h | 1 - .../world/entity/animal/MushroomCow.cpp | 2 +- .../minecraft/world/entity/animal/Ocelot.cpp | 2 +- targets/minecraft/world/entity/animal/Pig.cpp | 3 +- .../minecraft/world/entity/animal/Sheep.cpp | 3 +- .../minecraft/world/entity/animal/SnowMan.cpp | 2 +- .../minecraft/world/entity/animal/Squid.cpp | 3 +- .../world/entity/animal/VillagerGolem.cpp | 2 +- targets/minecraft/world/entity/animal/Wolf.h | 1 - .../world/entity/boss/MultiEntityMobPart.cpp | 1 + .../entity/boss/enderdragon/EnderCrystal.cpp | 13 +- .../entity/boss/enderdragon/EnderCrystal.h | 3 + .../entity/boss/enderdragon/EnderDragon.cpp | 44 ++-- .../entity/boss/enderdragon/EnderDragon.h | 15 ++ .../world/entity/boss/wither/WitherBoss.cpp | 51 +++-- .../world/entity/boss/wither/WitherBoss.h | 12 + .../world/entity/global/LightningBolt.cpp | 4 +- targets/minecraft/world/entity/item/Boat.cpp | 3 +- .../world/entity/item/FallingTile.cpp | 3 +- .../world/entity/item/ItemEntity.cpp | 5 +- .../minecraft/world/entity/item/Minecart.cpp | 3 - .../minecraft/world/entity/item/Minecart.h | 6 + .../world/entity/item/MinecartChest.cpp | 1 + .../world/entity/item/MinecartContainer.cpp | 21 +- .../world/entity/item/MinecartContainer.h | 7 + .../world/entity/item/MinecartFurnace.cpp | 2 +- .../world/entity/item/MinecartHopper.cpp | 2 - .../world/entity/item/MinecartHopper.h | 7 + .../world/entity/item/MinecartRideable.cpp | 1 + .../world/entity/item/MinecartSpawner.cpp | 1 + .../world/entity/item/MinecartTNT.cpp | 2 +- .../minecraft/world/entity/item/PrimedTnt.cpp | 4 +- .../minecraft/world/entity/monster/Blaze.cpp | 3 +- .../world/entity/monster/CaveSpider.cpp | 2 +- .../world/entity/monster/Creeper.cpp | 3 +- .../world/entity/monster/EnderMan.cpp | 5 +- .../minecraft/world/entity/monster/Ghast.cpp | 3 +- .../minecraft/world/entity/monster/Giant.cpp | 2 +- .../world/entity/monster/LavaSlime.cpp | 3 +- .../world/entity/monster/Monster.cpp | 3 +- .../world/entity/monster/PigZombie.cpp | 3 +- .../world/entity/monster/Silverfish.cpp | 3 +- .../world/entity/monster/Skeleton.cpp | 6 +- .../minecraft/world/entity/monster/Slime.cpp | 2 +- .../minecraft/world/entity/monster/Spider.cpp | 4 +- .../minecraft/world/entity/monster/Witch.cpp | 3 +- .../minecraft/world/entity/monster/Zombie.cpp | 5 +- .../minecraft/world/entity/npc/Villager.cpp | 71 ++++-- targets/minecraft/world/entity/npc/Villager.h | 11 + .../world/entity/player/Inventory.cpp | 20 +- .../minecraft/world/entity/player/Inventory.h | 7 + .../minecraft/world/entity/player/Player.cpp | 11 +- .../minecraft/world/entity/player/Player.h | 1 + .../world/entity/projectile/Arrow.cpp | 3 +- .../entity/projectile/DragonFireball.cpp | 5 +- .../entity/projectile/EyeOfEnderSignal.cpp | 1 + .../world/entity/projectile/Fireball.cpp | 3 +- .../projectile/FireworksRocketEntity.cpp | 2 +- .../world/entity/projectile/FishingHook.cpp | 3 +- .../world/entity/projectile/LargeFireball.cpp | 2 +- .../world/entity/projectile/SmallFireball.cpp | 2 +- .../world/entity/projectile/Snowball.cpp | 2 +- .../world/entity/projectile/Throwable.cpp | 6 +- .../world/entity/projectile/ThrownEgg.cpp | 2 +- .../entity/projectile/ThrownEnderpearl.cpp | 2 +- .../entity/projectile/ThrownExpBottle.cpp | 2 +- .../world/entity/projectile/ThrownPotion.cpp | 4 +- .../world/entity/projectile/WitherSkull.cpp | 3 +- targets/minecraft/world/food/FoodData.cpp | 1 - .../world/inventory/AbstractContainerMenu.cpp | 2 +- .../minecraft/world/inventory/AnimalChest.cpp | 1 + .../minecraft/world/inventory/AnimalChest.h | 2 + .../minecraft/world/inventory/AnvilMenu.cpp | 31 ++- targets/minecraft/world/inventory/AnvilMenu.h | 8 + .../minecraft/world/inventory/ArmorSlot.cpp | 2 +- .../minecraft/world/inventory/BeaconMenu.cpp | 6 +- .../world/inventory/BrewingStandMenu.cpp | 6 +- .../world/inventory/ContainerMenu.cpp | 2 +- .../world/inventory/CraftingContainer.cpp | 2 + .../world/inventory/CraftingContainer.h | 1 + .../world/inventory/CraftingMenu.cpp | 4 +- .../world/inventory/EnchantmentContainer.cpp | 7 +- .../world/inventory/EnchantmentMenu.cpp | 5 +- .../world/inventory/FireworksMenu.cpp | 4 +- .../minecraft/world/inventory/FurnaceMenu.cpp | 4 +- .../world/inventory/FurnaceResultSlot.cpp | 2 +- .../minecraft/world/inventory/HopperMenu.cpp | 3 +- .../world/inventory/HorseInventoryMenu.cpp | 5 +- .../world/inventory/InventoryMenu.cpp | 4 +- .../world/inventory/MerchantContainer.cpp | 1 + .../world/inventory/MerchantMenu.cpp | 3 +- .../world/inventory/MerchantResultSlot.cpp | 2 +- .../inventory/PlayerEnderChestContainer.cpp | 10 +- .../inventory/PlayerEnderChestContainer.h | 2 + .../world/inventory/RepairResultSlot.cpp | 2 +- .../world/inventory/ResultContainer.cpp | 2 + .../minecraft/world/inventory/ResultSlot.cpp | 2 +- targets/minecraft/world/inventory/Slot.cpp | 1 + .../minecraft/world/item/AnvilTileItem.cpp | 2 +- targets/minecraft/world/item/ArmorItem.cpp | 3 +- .../minecraft/world/item/AuxDataTileItem.cpp | 2 +- targets/minecraft/world/item/BedItem.cpp | 2 +- targets/minecraft/world/item/BoatItem.cpp | 22 +- targets/minecraft/world/item/BookItem.cpp | 2 +- targets/minecraft/world/item/BottleItem.cpp | 2 +- targets/minecraft/world/item/BowItem.cpp | 2 +- targets/minecraft/world/item/BowItem.h | 1 + targets/minecraft/world/item/BowlFoodItem.cpp | 2 +- targets/minecraft/world/item/BucketItem.cpp | 2 +- .../world/item/CarrotOnAStickItem.cpp | 2 +- targets/minecraft/world/item/CoalItem.cpp | 11 +- targets/minecraft/world/item/CoalItem.h | 1 + .../minecraft/world/item/ColoredTileItem.cpp | 2 +- targets/minecraft/world/item/DiggerItem.cpp | 3 +- targets/minecraft/world/item/DiggerItem.h | 1 + targets/minecraft/world/item/DoorItem.cpp | 2 +- .../minecraft/world/item/DyePowderItem.cpp | 36 ++- targets/minecraft/world/item/DyePowderItem.h | 5 + targets/minecraft/world/item/EggItem.cpp | 2 +- targets/minecraft/world/item/EmptyMapItem.cpp | 4 +- .../world/item/EnchantedBookItem.cpp | 5 +- .../minecraft/world/item/EnchantedBookItem.h | 1 + targets/minecraft/world/item/EnderEyeItem.cpp | 2 +- .../minecraft/world/item/EnderpearlItem.cpp | 2 +- .../minecraft/world/item/ExperienceItem.cpp | 2 +- .../minecraft/world/item/FireChargeItem.cpp | 2 +- .../world/item/FireworksChargeItem.cpp | 17 +- .../world/item/FireworksChargeItem.h | 7 + .../minecraft/world/item/FireworksItem.cpp | 20 +- targets/minecraft/world/item/FireworksItem.h | 3 + .../minecraft/world/item/FishingRodItem.cpp | 2 +- .../world/item/FlintAndSteelItem.cpp | 2 +- targets/minecraft/world/item/FoodItem.cpp | 2 +- targets/minecraft/world/item/FoodItem.h | 1 + .../minecraft/world/item/GoldenAppleItem.cpp | 13 +- .../minecraft/world/item/GoldenAppleItem.h | 1 + .../world/item/HangingEntityItem.cpp | 21 +- .../minecraft/world/item/HangingEntityItem.h | 1 + targets/minecraft/world/item/HatchetItem.cpp | 2 +- targets/minecraft/world/item/HatchetItem.h | 1 + targets/minecraft/world/item/HoeItem.cpp | 2 +- targets/minecraft/world/item/Item.cpp | 85 ++++++- targets/minecraft/world/item/Item.h | 6 + targets/minecraft/world/item/ItemInstance.cpp | 3 - targets/minecraft/world/item/ItemInstance.h | 6 + targets/minecraft/world/item/LeafTileItem.cpp | 2 +- targets/minecraft/world/item/LeashItem.cpp | 2 +- targets/minecraft/world/item/MapItem.cpp | 5 +- .../minecraft/world/item/MilkBucketItem.cpp | 2 +- targets/minecraft/world/item/MilkBucketItem.h | 1 + targets/minecraft/world/item/MinecartItem.cpp | 2 +- .../world/item/MultiTextureTileItem.cpp | 2 +- targets/minecraft/world/item/NameTagItem.cpp | 2 +- targets/minecraft/world/item/PickaxeItem.cpp | 2 +- targets/minecraft/world/item/PickaxeItem.h | 1 + .../minecraft/world/item/PistonTileItem.cpp | 2 +- .../minecraft/world/item/PlanterTileItem.cpp | 2 +- targets/minecraft/world/item/PotionItem.cpp | 32 ++- targets/minecraft/world/item/PotionItem.h | 9 + .../minecraft/world/item/RecordingItem.cpp | 5 +- targets/minecraft/world/item/RedStoneItem.cpp | 2 +- targets/minecraft/world/item/SaddleItem.cpp | 2 +- targets/minecraft/world/item/SeedFoodItem.cpp | 2 +- targets/minecraft/world/item/ShearsItem.cpp | 2 +- targets/minecraft/world/item/ShovelItem.cpp | 2 +- targets/minecraft/world/item/ShovelItem.h | 1 + targets/minecraft/world/item/SignItem.cpp | 2 +- targets/minecraft/world/item/SkullItem.cpp | 19 +- targets/minecraft/world/item/SkullItem.h | 8 + targets/minecraft/world/item/SnowItem.cpp | 2 +- targets/minecraft/world/item/SnowballItem.cpp | 2 +- targets/minecraft/world/item/SpawnEggItem.cpp | 27 ++- targets/minecraft/world/item/SpawnEggItem.h | 8 + .../world/item/StoneSlabTileItem.cpp | 2 +- targets/minecraft/world/item/TileItem.cpp | 2 +- .../world/item/WaterLilyTileItem.cpp | 2 +- targets/minecraft/world/item/WeaponItem.cpp | 3 +- targets/minecraft/world/item/WeaponItem.h | 1 + targets/minecraft/world/item/WoolTileItem.cpp | 8 +- .../world/item/alchemy/PotionBrewing.cpp | 7 +- .../world/item/crafting/ArmorDyeRecipe.cpp | 5 +- .../minecraft/world/item/crafting/Recipes.cpp | 2 - .../minecraft/world/item/crafting/Recipes.h | 1 + .../world/item/crafting/ShapedRecipy.cpp | 3 +- .../world/item/crafting/ShapelessRecipy.cpp | 4 +- .../world/item/crafting/ShapelessRecipy.h | 1 + .../enchantment/ArrowDamageEnchantment.cpp | 2 + .../item/enchantment/ArrowFireEnchantment.cpp | 2 + .../enchantment/ArrowInfiniteEnchantment.cpp | 2 + .../enchantment/ArrowKnockbackEnchantment.cpp | 2 + .../item/enchantment/DamageEnchantment.cpp | 11 +- .../enchantment/DigDurabilityEnchantment.cpp | 6 +- .../enchantment/DigDurabilityEnchantment.h | 5 + .../item/enchantment/DiggingEnchantment.cpp | 7 +- .../world/item/enchantment/Enchantment.cpp | 26 ++- .../world/item/enchantment/Enchantment.h | 2 + .../item/enchantment/EnchantmentInstance.cpp | 2 +- .../enchantment/FireAspectEnchantment.cpp | 2 + .../item/enchantment/KnockbackEnchantment.cpp | 2 + .../item/enchantment/LootBonusEnchantment.cpp | 2 + .../item/enchantment/LootBonusEnchantment.h | 2 + .../item/enchantment/OxygenEnchantment.cpp | 2 + .../enchantment/ProtectionEnchantment.cpp | 8 +- .../item/enchantment/ThornsEnchantment.cpp | 15 +- .../item/enchantment/ThornsEnchantment.h | 1 + .../enchantment/UntouchingEnchantment.cpp | 7 +- .../enchantment/WaterWorkerEnchantment.cpp | 2 + .../world/item/trading/MerchantRecipe.cpp | 1 + .../minecraft/world/level/BaseMobSpawner.cpp | 3 +- .../minecraft/world/level/BaseMobSpawner.h | 1 + targets/minecraft/world/level/ChunkPos.cpp | 3 - targets/minecraft/world/level/ChunkPos.h | 1 + targets/minecraft/world/level/Explosion.cpp | 7 +- targets/minecraft/world/level/Explosion.h | 1 + targets/minecraft/world/level/Level.cpp | 9 +- targets/minecraft/world/level/Level.h | 1 + targets/minecraft/world/level/MobSpawner.cpp | 3 +- targets/minecraft/world/level/MobSpawner.h | 1 + .../minecraft/world/level/PortalForcer.cpp | 1 + targets/minecraft/world/level/Region.h | 1 + targets/minecraft/world/level/TilePos.cpp | 1 - .../world/level/biome/BeachBiome.cpp | 2 +- targets/minecraft/world/level/biome/Biome.cpp | 2 - targets/minecraft/world/level/biome/Biome.h | 8 + .../world/level/biome/BiomeCache.cpp | 1 + .../minecraft/world/level/biome/BiomeCache.h | 1 - .../world/level/biome/BiomeDecorator.cpp | 3 - .../world/level/biome/BiomeSource.cpp | 19 +- .../minecraft/world/level/biome/BiomeSource.h | 7 + .../world/level/biome/ExtremeHillsBiome.cpp | 1 + .../world/level/biome/FixedBiomeSource.h | 2 +- .../world/level/biome/ForestBiome.cpp | 1 + .../minecraft/world/level/biome/HellBiome.cpp | 1 + .../minecraft/world/level/biome/IceBiome.cpp | 2 + .../world/level/biome/JungleBiome.cpp | 4 +- .../world/level/biome/MushroomIslandBiome.cpp | 2 +- .../world/level/biome/RainforestBiome.cpp | 1 + .../world/level/biome/TaigaBiome.cpp | 1 + .../world/level/biome/TheEndBiome.cpp | 2 +- .../level/biome/TheEndBiomeDecorator.cpp | 16 +- .../world/level/biome/TheEndBiomeDecorator.h | 3 + .../world/level/chunk/BlockReplacements.h | 1 - .../level/chunk/CompressedTileStorage.cpp | 4 +- .../minecraft/world/level/chunk/DataLayer.h | 1 - .../world/level/chunk/EmptyLevelChunk.cpp | 3 +- .../world/level/chunk/EmptyLevelChunk.h | 2 +- .../world/level/chunk/LevelChunk.cpp | 10 +- .../minecraft/world/level/chunk/LevelChunk.h | 1 - .../world/level/chunk/ReadOnlyChunkCache.cpp | 3 +- .../world/level/chunk/ReadOnlyChunkCache.h | 1 - .../world/level/chunk/SparseDataStorage.cpp | 3 - .../world/level/chunk/SparseLightStorage.cpp | 3 - .../world/level/chunk/WaterLevelChunk.cpp | 3 +- .../world/level/chunk/WaterLevelChunk.h | 2 +- .../chunk/storage/McRegionChunkStorage.cpp | 9 +- .../chunk/storage/McRegionChunkStorage.h | 1 - .../level/chunk/storage/OldChunkStorage.cpp | 5 +- .../world/level/chunk/storage/RegionFile.cpp | 4 - .../world/level/chunk/storage/RegionFile.h | 1 - .../level/chunk/storage/RegionFileCache.cpp | 3 +- .../world/level/dimension/Dimension.cpp | 3 +- .../world/level/dimension/Dimension.h | 1 - .../world/level/dimension/HellDimension.cpp | 1 + .../world/level/levelgen/CanyonFeature.h | 2 +- .../level/levelgen/CustomLevelSource.cpp | 7 +- .../world/level/levelgen/CustomLevelSource.h | 1 - .../world/level/levelgen/DungeonFeature.h | 2 +- .../world/level/levelgen/FlatLevelSource.cpp | 8 +- .../world/level/levelgen/FlatLevelSource.h | 2 +- .../level/levelgen/HellFlatLevelSource.cpp | 8 +- .../level/levelgen/HellFlatLevelSource.h | 2 +- .../level/levelgen/HellRandomLevelSource.cpp | 12 +- .../level/levelgen/HellRandomLevelSource.h | 1 - .../world/level/levelgen/LargeCaveFeature.h | 2 +- .../world/level/levelgen/LargeFeature.cpp | 2 - .../world/level/levelgen/LargeFeature.h | 6 + .../level/levelgen/LargeHellCaveFeature.h | 2 +- .../level/levelgen/RandomLevelSource.cpp | 10 +- .../world/level/levelgen/RandomLevelSource.h | 1 - .../levelgen/TheEndLevelRandomLevelSource.cpp | 8 +- .../levelgen/TheEndLevelRandomLevelSource.h | 1 - .../levelgen/feature/BasicTreeFeature.cpp | 6 +- .../level/levelgen/feature/BirchFeature.cpp | 2 +- .../levelgen/feature/EndPodiumFeature.cpp | 5 +- .../levelgen/feature/GroundBushFeature.cpp | 3 - .../levelgen/feature/HugeMushroomFeature.cpp | 2 +- .../levelgen/feature/MegaTreeFeature.cpp | 5 +- .../levelgen/feature/NetherSphereFeature.cpp | 2 + .../level/levelgen/feature/OreFeature.cpp | 3 - .../level/levelgen/feature/SpikeFeature.cpp | 10 +- .../level/levelgen/feature/SpruceFeature.cpp | 2 +- .../level/levelgen/feature/TreeFeature.cpp | 5 +- .../level/levelgen/structure/BoundingBox.cpp | 3 - .../level/levelgen/structure/BoundingBox.h | 5 + .../levelgen/structure/MineShaftPieces.cpp | 4 +- .../levelgen/structure/MineShaftPieces.h | 2 + .../structure/NetherBridgeFeature.cpp | 2 + .../levelgen/structure/NetherBridgeFeature.h | 1 + .../levelgen/structure/NetherBridgePieces.cpp | 4 +- .../levelgen/structure/NetherBridgePieces.h | 1 + .../structure/RandomScatteredLargeFeature.cpp | 1 + .../structure/RandomScatteredLargeFeature.h | 1 + .../structure/ScatteredFeaturePieces.cpp | 3 +- .../structure/ScatteredFeaturePieces.h | 1 + .../levelgen/structure/StrongholdFeature.cpp | 2 +- .../levelgen/structure/StrongholdFeature.h | 2 + .../levelgen/structure/StrongholdPieces.cpp | 4 +- .../levelgen/structure/StrongholdPieces.h | 1 + .../levelgen/structure/StructureFeature.cpp | 2 - .../levelgen/structure/StructureFeature.h | 8 + .../levelgen/structure/StructureFeatureIO.cpp | 1 - .../levelgen/structure/StructureFeatureIO.h | 2 + .../structure/StructureFeatureSavedData.cpp | 1 - .../structure/StructureFeatureSavedData.h | 4 + .../levelgen/structure/StructurePiece.cpp | 1 - .../level/levelgen/structure/StructurePiece.h | 3 + .../levelgen/structure/StructureStart.cpp | 1 + .../levelgen/structure/VillageFeature.cpp | 2 +- .../level/levelgen/structure/VillageFeature.h | 2 + .../levelgen/structure/VillagePieces.cpp | 4 +- .../level/levelgen/structure/VillagePieces.h | 1 + .../world/level/levelgen/synth/FastNoise.h | 1 - .../level/levelgen/synth/ImprovedNoise.h | 1 + .../newbiome/layer/BiomeOverrideLayer.cpp | 4 +- .../level/newbiome/layer/BiomeOverrideLayer.h | 1 - .../world/level/newbiome/layer/Layer.cpp | 2 +- .../world/level/newbiome/layer/Layer.h | 1 - .../minecraft/world/level/pathfinder/Path.cpp | 2 + .../world/level/pathfinder/PathFinder.cpp | 4 +- .../world/level/pathfinder/PathFinder.h | 1 + .../level/saveddata/MapItemSavedData.cpp | 2 +- .../world/level/saveddata/MapItemSavedData.h | 1 - .../world/level/saveddata/SavedData.cpp | 2 - .../world/level/saveddata/SavedData.h | 1 + .../ConsoleSaveFileConverter.cpp | 25 ++- .../ConsoleSaveFileOriginal.cpp | 5 +- .../ConsoleSaveFileSplit.cpp | 5 +- .../storage/ConsoleSaveFileIO/FileHeader.cpp | 4 - .../storage/ConsoleSaveFileIO/FileHeader.h | 1 + .../world/level/storage/DerivedLevelData.h | 1 - .../level/storage/DirectoryLevelStorage.cpp | 10 +- .../level/storage/DirectoryLevelStorage.h | 1 - .../storage/DirectoryLevelStorageSource.h | 1 + .../minecraft/world/level/storage/LevelData.h | 1 - .../level/storage/McRegionLevelStorage.cpp | 1 - .../storage/McRegionLevelStorageSource.cpp | 1 - .../world/level/storage/SavedDataStorage.cpp | 2 +- .../minecraft/world/level/tile/AnvilTile.cpp | 20 +- .../minecraft/world/level/tile/AnvilTile.h | 4 + .../world/level/tile/BaseEntityTile.cpp | 2 +- .../level/tile/BasePressurePlateTile.cpp | 1 + .../world/level/tile/BaseRailTile.cpp | 2 +- .../minecraft/world/level/tile/BeaconTile.cpp | 2 +- .../minecraft/world/level/tile/BedTile.cpp | 22 +- targets/minecraft/world/level/tile/BedTile.h | 4 + .../world/level/tile/BrewingStandTile.cpp | 2 +- .../minecraft/world/level/tile/ButtonTile.cpp | 2 +- .../minecraft/world/level/tile/CactusTile.cpp | 2 +- .../minecraft/world/level/tile/CakeTile.cpp | 2 +- .../minecraft/world/level/tile/ChestTile.cpp | 35 ++- .../minecraft/world/level/tile/ChestTile.h | 3 + .../minecraft/world/level/tile/CocoaTile.cpp | 2 +- .../minecraft/world/level/tile/CocoaTile.h | 1 + .../world/level/tile/CommandBlock.cpp | 4 +- .../world/level/tile/ComparatorTile.cpp | 4 +- .../world/level/tile/DaylightDetectorTile.cpp | 3 +- .../world/level/tile/DetectorRailTile.cpp | 2 +- .../minecraft/world/level/tile/DiodeTile.cpp | 2 +- .../world/level/tile/DispenserTile.cpp | 4 +- .../minecraft/world/level/tile/DoorTile.cpp | 2 +- .../world/level/tile/DropperTile.cpp | 2 +- .../world/level/tile/EnchantmentTableTile.cpp | 2 +- .../world/level/tile/EnderChestTile.cpp | 2 +- .../minecraft/world/level/tile/FarmTile.cpp | 2 +- .../world/level/tile/FenceGateTile.cpp | 2 +- .../minecraft/world/level/tile/FireTile.cpp | 3 +- .../world/level/tile/FlowerPotTile.cpp | 1 + .../world/level/tile/FurnaceTile.cpp | 6 +- .../minecraft/world/level/tile/HopperTile.cpp | 4 +- .../world/level/tile/JukeboxTile.cpp | 5 +- .../minecraft/world/level/tile/LadderTile.cpp | 2 +- .../minecraft/world/level/tile/LeafTile.cpp | 23 +- targets/minecraft/world/level/tile/LeafTile.h | 4 + .../minecraft/world/level/tile/LeverTile.cpp | 2 +- .../minecraft/world/level/tile/LiquidTile.cpp | 4 +- .../world/level/tile/MobSpawnerTile.cpp | 2 +- .../minecraft/world/level/tile/NotGateTile.h | 1 - .../world/level/tile/NoteBlockTile.cpp | 2 +- .../minecraft/world/level/tile/PlantTile.cpp | 2 +- .../minecraft/world/level/tile/PortalTile.cpp | 2 +- .../world/level/tile/PressurePlateTile.cpp | 2 +- .../world/level/tile/QuartzBlockTile.cpp | 13 +- .../world/level/tile/QuartzBlockTile.h | 4 + .../world/level/tile/RedStoneDustTile.cpp | 4 +- .../minecraft/world/level/tile/ReedTile.cpp | 2 +- .../world/level/tile/SandStoneTile.cpp | 9 +- .../world/level/tile/SandStoneTile.h | 3 + .../world/level/tile/SaplingPlantTile.cpp | 19 +- .../world/level/tile/SaplingPlantTile.h | 4 + .../minecraft/world/level/tile/SignTile.cpp | 4 +- .../minecraft/world/level/tile/SkullTile.cpp | 30 ++- .../minecraft/world/level/tile/SkullTile.h | 5 + .../world/level/tile/SmoothStoneBrickTile.cpp | 6 +- .../world/level/tile/SmoothStoneBrickTile.h | 4 + .../world/level/tile/SoulSandTile.cpp | 2 +- .../minecraft/world/level/tile/StairTile.cpp | 2 +- .../world/level/tile/StoneMonsterTile.cpp | 15 +- .../world/level/tile/StoneSlabTile.cpp | 14 +- .../world/level/tile/StoneSlabTile.h | 1 + .../world/level/tile/TallGrassPlantTile.cpp | 25 ++- .../world/level/tile/TallGrassPlantTile.h | 4 + targets/minecraft/world/level/tile/Tile.cpp | 163 ++++++++++++-- targets/minecraft/world/level/tile/Tile.h | 4 + .../world/level/tile/TopSnowTile.cpp | 2 +- .../minecraft/world/level/tile/TorchTile.cpp | 2 +- .../world/level/tile/TrapDoorTile.cpp | 2 +- .../minecraft/world/level/tile/TreeTile.cpp | 12 +- targets/minecraft/world/level/tile/TreeTile.h | 3 + .../world/level/tile/TripWireSourceTile.cpp | 2 +- .../world/level/tile/TripWireTile.cpp | 2 +- .../minecraft/world/level/tile/VineTile.cpp | 2 +- .../minecraft/world/level/tile/WallTile.cpp | 13 +- targets/minecraft/world/level/tile/WallTile.h | 4 + .../world/level/tile/WaterLilyTile.cpp | 2 +- .../minecraft/world/level/tile/WebTile.cpp | 2 +- .../level/tile/WeightedPressurePlateTile.cpp | 2 +- .../world/level/tile/WoodSlabTile.cpp | 12 +- .../minecraft/world/level/tile/WoodTile.cpp | 11 +- targets/minecraft/world/level/tile/WoodTile.h | 3 + .../world/level/tile/WoolCarpetTile.cpp | 2 +- .../level/tile/entity/BeaconTileEntity.cpp | 27 ++- .../level/tile/entity/BeaconTileEntity.h | 6 + .../tile/entity/BrewingStandTileEntity.cpp | 25 ++- .../tile/entity/BrewingStandTileEntity.h | 7 + .../level/tile/entity/ChestTileEntity.cpp | 32 ++- .../world/level/tile/entity/ChestTileEntity.h | 6 + .../level/tile/entity/CommandBlockEntity.cpp | 5 +- .../tile/entity/ComparatorTileEntity.cpp | 2 +- .../entity/DaylightDetectorTileEntity.cpp | 1 + .../level/tile/entity/DispenserTileEntity.cpp | 17 +- .../level/tile/entity/DispenserTileEntity.h | 6 + .../level/tile/entity/DropperTileEntity.cpp | 4 +- .../level/tile/entity/DropperTileEntity.h | 5 + .../entity/EnchantmentTableTileEntity.cpp | 12 +- .../tile/entity/EnchantmentTableTileEntity.h | 4 + .../level/tile/entity/FurnaceTileEntity.cpp | 29 ++- .../level/tile/entity/FurnaceTileEntity.h | 6 + .../level/tile/entity/HopperTileEntity.cpp | 34 ++- .../level/tile/entity/HopperTileEntity.h | 8 + .../tile/entity/MobSpawnerTileEntity.cpp | 2 +- .../level/tile/entity/MusicTileEntity.cpp | 2 +- .../tile/entity/PistonMovingTileEntity.cpp | 2 + .../tile/entity/PistonPieceTileEntity.cpp | 3 +- .../level/tile/entity/SignTileEntity.cpp | 5 +- .../world/level/tile/entity/SignTileEntity.h | 2 + .../level/tile/entity/SkullTileEntity.cpp | 2 +- .../world/level/tile/entity/TileEntity.cpp | 1 - .../level/tile/piston/PistonBaseTile.cpp | 3 - targets/minecraft/world/phys/AABB.cpp | 1 - targets/minecraft/world/phys/AABB.h | 4 + targets/minecraft/world/phys/HitResult.cpp | 1 + targets/minecraft/world/phys/Vec3.cpp | 1 - targets/nbt/include/nbt/NbtIo.h | 7 + targets/nbt/include/nbt/Tag.h | 5 + targets/nbt/src/NbtIo.cpp | 13 +- targets/nbt/src/Tag.cpp | 3 + targets/platform/PlatformServices.cpp | 5 + targets/platform/PlatformServices.h | 5 + 1125 files changed, 5104 insertions(+), 2009 deletions(-) diff --git a/targets/4J.Input/4J_Input.cpp b/targets/4J.Input/4J_Input.cpp index ec298c687..f1732744b 100644 --- a/targets/4J.Input/4J_Input.cpp +++ b/targets/4J.Input/4J_Input.cpp @@ -4,10 +4,19 @@ #include #include #include - +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "../4J.Common/4J_InputActions.h" +#include "../platform/PlatformTypes.h" C_4JInput InputManager; diff --git a/targets/4J.Profile/4J_Profile.h b/targets/4J.Profile/4J_Profile.h index a0e8c2663..3794cfff8 100644 --- a/targets/4J.Profile/4J_Profile.h +++ b/targets/4J.Profile/4J_Profile.h @@ -5,6 +5,8 @@ #include "../4J.Common/4J_Compat.h" #include "../platform/IPlatformProfile.h" +#include "../4J.Common/4J_Compat.h" +#include "../platform/PlatformTypes.h" #define TITLEID_MINECRAFT 0x584111F7 diff --git a/targets/4J.Render/4J_Render.cpp b/targets/4J.Render/4J_Render.cpp index ee3172e5c..6b455606c 100644 --- a/targets/4J.Render/4J_Render.cpp +++ b/targets/4J.Render/4J_Render.cpp @@ -1,6 +1,12 @@ #include "4J_Render.h" #include "gl3_loader.h" +#include "../platform/PlatformTypes.h" +#include "SDL.h" +#include "SDL_error.h" +#include "SDL_events.h" +#include "SDL_stdinc.h" +#include "SDL_video.h" // undefine macros from header to avoid argument mismatch #undef glGenTextures @@ -24,16 +30,15 @@ #define GLM_FORCE_RADIANS #include #include - -#include -#include -#include -#include #include #include #include +#include +#include #include #include +#include +#include C4JRender RenderManager; @@ -44,13 +49,16 @@ C4JRender RenderManager; #ifdef GLES static const char* VERT_SRC = #include "shaders/vertex_es.vert" + ; static const char* FRAG_SRC = #include "shaders/fragment_es.frag" + ; #else static const char* VERT_SRC = #include "shaders/vertex.vert" + ; static const char* FRAG_SRC = #include "shaders/fragment.frag" diff --git a/targets/4J.Render/4J_Render.h b/targets/4J.Render/4J_Render.h index d4a2c2d8c..a6c0c3b11 100644 --- a/targets/4J.Render/4J_Render.h +++ b/targets/4J.Render/4J_Render.h @@ -1,12 +1,11 @@ #pragma once -#include -#include - #include "gl3_loader.h" // NOTE: gl3_loader.h must be included before these two #include #include +#include +#include #include "../platform/IPlatformRender.h" diff --git a/targets/4J.Storage/4J_Storage.cpp b/targets/4J.Storage/4J_Storage.cpp index 37b9d7630..084640d3a 100644 --- a/targets/4J.Storage/4J_Storage.cpp +++ b/targets/4J.Storage/4J_Storage.cpp @@ -1,5 +1,6 @@ #include "4J_Storage.h" +#include #include #include #include diff --git a/targets/4J.Storage/4J_Storage.h b/targets/4J.Storage/4J_Storage.h index 1531740eb..b4286bb25 100644 --- a/targets/4J.Storage/4J_Storage.h +++ b/targets/4J.Storage/4J_Storage.h @@ -8,6 +8,7 @@ #include "../4J.Common/4J_Compat.h" #include "../platform/IPlatformStorage.h" +#include "../4J.Common/4J_Compat.h" class C4JStringTable; diff --git a/targets/Minecraft.Client/Common/Consoles_App.cpp b/targets/Minecraft.Client/Common/Consoles_App.cpp index f66a1469e..e9a170b21 100644 --- a/targets/Minecraft.Client/Common/Consoles_App.cpp +++ b/targets/Minecraft.Client/Common/Consoles_App.cpp @@ -1,5 +1,3 @@ -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" #include "console_helpers/PathHelper.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" @@ -7,44 +5,82 @@ #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/client/renderer/GameRenderer.h" -#include "minecraft/client/renderer/LevelRenderer.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/server/level/GameMode.h" #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/Container.h" -#include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/crafting/Recipy.h" -#include "minecraft/world/level/Level.h" -#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" -#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" #include "minecraft/world/level/tile/entity/HopperTileEntity.h" -#include "minecraft/world/level/tile/entity/SignTileEntity.h" -#include "minecraft/world/phys/AABB.h" -#include "minecraft/world/phys/Vec3.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "4J_Storage.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Common/App_structs.h" +#include "Common/Consoles_App.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "SkinBox.h" +#include "XboxStubs.h" +#include "java/Class.h" +#include "java/File.h" +#include "java/Random.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/world/entity/item/MinecartHopper.h" +#include "minecraft/world/level/tile/Tile.h" +#include "strings.h" #if defined(_WINDOWS64) #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" #endif +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "4J_Input.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" #include "Minecraft_Macros.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/StringHelpers.h" #include "console_helpers/compression.h" -#include "java/InputOutputStream/InputOutputStream.h" -#include "minecraft/client/Minecraft.h" #include "minecraft/client/User.h" #include "minecraft/client/gui/Gui.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" @@ -52,20 +88,22 @@ #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/PlayerList.h" #include "minecraft/server/level/ServerPlayer.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/LevelSettings.h" -#include "minecraft/world/level/storage/LevelData.h" - -#if defined(__linux__) -#include - -#include -#endif -#include -#include - #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" + +class BeaconTileEntity; +class BrewingStandTileEntity; +class DispenserTileEntity; +class EntityHorse; +class FurnaceTileEntity; +class INVITE_INFO; +class Inventory; +class Level; +class LevelChunk; +class LevelGenerationOptions; +class LocalPlayer; +class Merchant; +class ModelPart; +class SignTileEntity; // CMinecraftApp app; unsigned int CMinecraftApp::m_uiLastSignInData = 0; @@ -874,9 +912,6 @@ int CMinecraftApp::OldProfileVersionCallback(void* pParam, // updates app.DebugPrintf( "Don't know what to do with this profile version!\n"); -#if !defined(_CONTENT_PACKAGE) - // __debugbreak(); -#endif GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)pucData; pGameSettings->ucMenuSensitivity = @@ -4420,10 +4455,6 @@ void CMinecraftApp::AddMemoryTextureFile(const std::wstring& wName, ++pData->ucRefCount; return; } - -#if !defined(_CONTENT_PACKAGE) - // wprintf(L"Adding the memory texture file data for %ls\n", wName.c_str()); -#endif // this is a texture (png) file // add this texture to the list of memory texture files - it will then be diff --git a/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp b/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp index 0a7949a1f..57d54565b 100644 --- a/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp +++ b/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp @@ -1,7 +1,5 @@ #include "Consoles_SoundEngine.h" -#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" - bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() { return m_bIsPlayingStreamingCDMusic; } diff --git a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp index c84959936..88394ca1a 100644 --- a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp +++ b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp @@ -3,8 +3,6 @@ #include #include #include -#include -#include #include #include @@ -14,7 +12,9 @@ #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" +#include "Common/App_Defines.h" +#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/C4JThread.h" #include "console_helpers/PathHelper.h" @@ -49,6 +49,7 @@ int strcasecmp(const char* a, const char* b) { #undef STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" + // stb_vorbis leaks single-letter macros (C, L, R, etc.) that collide with // identifiers in other translation units during unity builds. #undef C @@ -355,8 +356,9 @@ int SoundEngine::getMusicID(const std::wstring& name) { return iCD + m_iStream_CD_1; } -void SoundEngine::playStreaming(const wstring& name, float x, float y, float z, - float volume, float pitch, bool bMusicDelay) { +void SoundEngine::playStreaming(const std::wstring& name, float x, float y, + float z, float volume, float pitch, + bool bMusicDelay) { m_StreamingAudioInfo.x = x; m_StreamingAudioInfo.y = y; m_StreamingAudioInfo.z = z; @@ -745,7 +747,7 @@ void SoundEngine::updateMiniAudio() { } } -void SoundEngine::tick(shared_ptr* players, float a) { +void SoundEngine::tick(std::shared_ptr* players, float a) { // update the listener positions int listenerCount = 0; if (players) { diff --git a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h index 7b794afdf..754bcba6a 100644 --- a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h +++ b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h @@ -4,7 +4,6 @@ class Options; class C4JThread; class Random; -using namespace std; #include #include "Minecraft.Client/Common/App_Defines.h" diff --git a/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp b/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp index 018854493..ad08467d1 100644 --- a/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp +++ b/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp @@ -4,13 +4,10 @@ #include #include -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" +#include "Common/App_enums.h" std::unordered_map ColourTable::s_colourNamesMap; diff --git a/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp b/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp index 29ef6ac01..125d5ae46 100644 --- a/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp +++ b/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp @@ -1,6 +1,5 @@ #include "ConsoleGameMode.h" -#include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp index 54b4f2b67..f6bf4b5bd 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp @@ -8,11 +8,9 @@ #include "4J.Render/4J_Render.h" #include "4J_Storage.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #if defined(_WINDOWS64) #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp index 33e73e83a..32bbe15eb 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp @@ -1,8 +1,8 @@ #include "DLCCapeFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" DLCCapeFile::DLCCapeFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Cape, path) {} diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp index 2c1ebb236..e4215b7cd 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp @@ -2,11 +2,11 @@ #include "DLCManager.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" DLCColourTableFile::DLCColourTableFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_ColourTable, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp index 74b4c2144..be3896fa9 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp @@ -3,10 +3,9 @@ #include #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" #include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" class StringTable; diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp index 39009c54e..afb2c3383 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp @@ -1,8 +1,8 @@ #include "DLCLocalisationFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_LocalisationData, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp index 1517d8582..cb9e4af08 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp @@ -1,20 +1,29 @@ #include "DLCManager.h" +#include #include #include #include #include #include #include +#include +#include +#include +#include #include "DLCFile.h" #include "DLCPack.h" -#include "Minecraft.Client/Common/src/UI/UIController.h" -#include "Minecraft.Client/include/stdafx.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePackRepository.h" +#include "4J_Profile.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" // 4jcraft, this is the size of wchar_t on disk // the DLC was created on windows, with wchar_t beeing 2 bytes and UTF-16 diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp index 93ea261b0..ca85c398a 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp @@ -1,7 +1,6 @@ #include "DLCPack.h" #include - #include #include #include @@ -13,17 +12,16 @@ #include "DLCGameRulesFile.h" #include "DLCGameRulesHeader.h" #include "DLCLocalisationFile.h" -#include "DLCSkinFile.h" #include "DLCTextureFile.h" #include "DLCUIDataFile.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { m_dataPath = L""; diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp index 9a4d3987a..e3b2a5725 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp @@ -1,16 +1,14 @@ #include "DLCSkinFile.h" #include +#include #include "4J.Render/4J_Render.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" DLCSkinFile::DLCSkinFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Skin, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h index 0027ce59c..49ce260af 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h +++ b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h @@ -8,6 +8,7 @@ #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/include/SkinBox.h" #include "minecraft/client/model/HumanoidModel.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" class DLCSkinFile : public DLCFile { private: diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h b/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h index b17d3ad9f..b39e04037 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h +++ b/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h @@ -4,6 +4,7 @@ #include "DLCFile.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" class DLCTextureFile : public DLCFile { private: diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp index 3175d72b6..5821e2be2 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp +++ b/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp @@ -1,8 +1,8 @@ #include "DLCUIDataFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" DLCUIDataFile::DLCUIDataFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_UIData, path) { diff --git a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp index ccf6bf80d..6d571eb31 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp @@ -1,16 +1,32 @@ #include "GameRuleManager.h" -#include "ConsoleGameRules.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" +#include +#include +#include +#include +#include + #include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h" #include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" #include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/include/stdafx.h" -#include "console_helpers/StringHelpers.h" #include "console_helpers/compression.h" #include "java/File.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "strings.h" const wchar_t* GameRuleManager::wchTagNameA[] = { L"", // eGameRuleType_Root diff --git a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h index bf4f953c6..e43f62fe4 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h +++ b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h @@ -1,9 +1,15 @@ #pragma once ////using namespace std; +#include +#include +#include +#include + #include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class LevelGenerationOptions; class RootGameRulesDefinition; @@ -16,6 +22,9 @@ class GameRuleDefinition; class DataInputStream; class DataOutputStream; class WstringLookup; +class DLCGameRulesHeader; +class File; +class LevelRuleset; #define GAME_RULE_SAVENAME L"requiredGameRules.grf" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 55871d72b..8a0b0b4ed 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -5,18 +5,15 @@ #include "ConsoleSchematicFile.h" #include "LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/phys/AABB.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" ApplySchematicRuleDefinition::ApplySchematicRuleDefinition( LevelGenerationOptions* levelGenOptions) { diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index f2ca030b6..fe9758eac 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp index c5deab5d0..6aebd7e49 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp @@ -1,10 +1,10 @@ #include "BiomeOverride.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" BiomeOverride::BiomeOverride() { m_tile = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index 041bb3ff4..df282d3a5 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -1,10 +1,8 @@ #include "ConsoleGenerateStructure.h" #include - #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" @@ -18,6 +16,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) { m_x = m_y = m_z = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index b1fa65daa..babd97139 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -2,16 +2,12 @@ #include #include - #include #include #include #include #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/compression.h" #include "java/Class.h" #include "java/InputOutputStream/DataInputStream.h" @@ -33,6 +29,7 @@ #include "nbt/ListTag.h" #include "nbt/NbtIo.h" #include "nbt/Tag.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" ConsoleSchematicFile::ConsoleSchematicFile() { m_xSize = m_ySize = m_zSize = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h index 0b754824b..0bb20ad9e 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -5,7 +5,7 @@ #define XBOX_SCHEMATIC_CURRENT_VERSION 2 #include - +#include #include #include #include diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp index e3ce74fa3..ba5107132 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -1,22 +1,39 @@ #include "LevelGenerationOptions.h" +#include +#include #include #include #include +#include #include "4J_Storage.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" -#include "Minecraft.Client/include/stdafx.h" #include "console_helpers/StringHelpers.h" #include "minecraft/Pos.h" -#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/File.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/phys/AABB.h" +#include "strings.h" JustGrSource::JustGrSource() { m_displayName = L"Default_DisplayName"; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h index d54f1764e..967901ce0 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -4,11 +4,15 @@ // #pragma message("LevelGenerationOptions.h ") #include +#include +#include +#include #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class ApplySchematicRuleDefinition; class LevelChunk; @@ -17,6 +21,9 @@ class ConsoleSchematicFile; class LevelRuleset; class BiomeOverride; class StartFeature; +class DLCPack; +class Pos; +class StringTable; class GrSource { public: diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp index 80a8ef3b0..d54debef9 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp @@ -3,7 +3,6 @@ #include #include "LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h" LevelGenerators::LevelGenerators() {} diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp index 74ee2a363..93b95a463 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp @@ -1,10 +1,10 @@ #include "StartFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" StartFeature::StartFeature() { m_chunkX = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 84d8383cf..75624f2a1 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -1,12 +1,12 @@ #include "XboxStructureActionGenerateBox.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() { m_x0 = m_y0 = m_z0 = m_x1 = m_y1 = m_z1 = m_edgeTile = m_fillTile = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index bc8bddeb8..5cb47f00f 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -1,12 +1,12 @@ #include "XboxStructureActionPlaceBlock.h" #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() { m_x = m_y = m_z = m_tile = m_data = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 8b2419765..2cb2ea7d6 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -1,11 +1,8 @@ #include "XboxStructureActionPlaceContainer.h" #include - #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" @@ -15,6 +12,8 @@ #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() { m_tile = Tile::chest_Id; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 2cff8b3fb..bf4ef4818 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -1,17 +1,16 @@ #include "XboxStructureActionPlaceSpawner.h" #include - #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() { m_tile = Tile::mobSpawner_Id; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp index 1e03d7b23..c79dc4649 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp @@ -1,7 +1,5 @@ #include "LevelRules.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h" - LevelRules::LevelRules() {} void LevelRules::addLevelRule(const std::wstring& displayName, diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 1e3cdc3c5..d666f6c39 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -3,8 +3,6 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" @@ -14,6 +12,8 @@ #include "minecraft/world/item/enchantment/Enchantment.h" #include "minecraft/world/item/enchantment/EnchantmentCategory.h" #include "minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() { m_enchantmentId = m_enchantmentLevel = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index 11c7612ce..5137e938d 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -3,14 +3,14 @@ #include #include "AddEnchantmentRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" AddItemRuleDefinition::AddItemRuleDefinition() { m_itemId = m_quantity = m_auxValue = m_dataTag = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index a62e37786..32045504f 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -1,7 +1,5 @@ #include "CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" @@ -9,6 +7,9 @@ #include "minecraft/network/Connection.h" #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" #include "minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" CollectItemRuleDefinition::CollectItemRuleDefinition() { m_itemId = 0; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index 648409cf2..05b531508 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -4,14 +4,13 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" void CompleteAllRuleDefinition::getChildren( std::vector* children) { diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index 4d56973c3..b72f51a2c 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -1,7 +1,6 @@ #include "CompoundGameRuleDefinition.h" #include - #include #include #include @@ -9,11 +8,13 @@ #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" CompoundGameRuleDefinition::CompoundGameRuleDefinition() { m_lastRuleStatusChanged = nullptr; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 5ba6d6a58..8fd1653d8 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -2,8 +2,6 @@ #include #include - -#include #include #include #include diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index f385ed11c..d620162f0 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index 8998178c3..807eb9e39 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp @@ -1,9 +1,9 @@ #include "LevelRuleset.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" #include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" class AABB; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index 7ed5c479d..fe68485f9 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" NamedAreaRuleDefinition::NamedAreaRuleDefinition() { m_name = L""; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index 0b28964c8..14ffa4e34 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -1,12 +1,9 @@ #include "UpdatePlayerRuleDefinition.h" #include - #include #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" @@ -14,6 +11,8 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/food/FoodData.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() { m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index 9bb1ef2dc..e1ad41799 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -1,10 +1,10 @@ #include "UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" UseTileRuleDefinition::UseTileRuleDefinition() { m_tileId = -1; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h index 193dcc2e2..af85a5fdf 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h +++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h @@ -2,7 +2,6 @@ // using namespace std; #include - #include #include #include diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp index 0da0134de..625792e8c 100644 --- a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp +++ b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp @@ -1,9 +1,6 @@ #include "LeaderboardManager.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = { diff --git a/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp b/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp index 7aed83a75..b96941db2 100644 --- a/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp +++ b/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp @@ -3,7 +3,6 @@ #include #include -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp index 942c6250e..8acd74f4f 100644 --- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp +++ b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp @@ -1,15 +1,17 @@ #include "GameNetworkManager.h" +#include #include #include #include #include +#include +#include +#include +#include #include "4J_Input.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" #include "Socket.h" #include "console_helpers/StringHelpers.h" #include "console_helpers/ThreadName.h" @@ -19,7 +21,6 @@ #include "minecraft/client/User.h" #include "minecraft/client/gui/Gui.h" #include "minecraft/client/multiplayer/ClientConnection.h" -#include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/LevelRenderer.h" #include "minecraft/client/skins/TexturePack.h" @@ -32,9 +33,30 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/item/crafting/FireworksRecipe.h" #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/AABB.h" -#include "minecraft/world/phys/Vec3.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "4J_Storage.h" +#include "Common/App_enums.h" +#include "Common/Consoles_App.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "XboxStubs.h" +#include "java/File.h" +#include "minecraft/network/Connection.h" +#include "minecraft/network/packet/PreLoginPacket.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "strings.h" + +class FriendSessionInfo; +class INVITE_INFO; // Global instance CGameNetworkManager g_NetworkManager; diff --git a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h index e435d9a8e..f847c89b2 100644 --- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h +++ b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h @@ -1,6 +1,9 @@ #pragma once +#include // using namespace std; #include +#include +#include #if !defined(__linux__) #include #endif @@ -8,9 +11,15 @@ #include "PlatformNetworkManagerStub.h" #include "SessionInfo.h" #include "console_helpers/C4JThread.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h" +#include "Minecraft.Client/include/NetTypes.h" class ClientConnection; class Minecraft; +class FriendSessionInfo; +class INVITE_INFO; +class INetworkPlayer; const int NON_QNET_SENDDATA_ACK_REQUIRED = 1; diff --git a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp index 56bd08722..eb8145875 100644 --- a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp +++ b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp @@ -3,8 +3,6 @@ #include #include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/System.h" NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) { diff --git a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp index 0c11914c9..baa366c5a 100644 --- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp +++ b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp @@ -2,16 +2,16 @@ #include #include - #include #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "NetworkPlayerQNet.h" #include "Socket.h" #include "console_helpers/C4JThread.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/include/NetTypes.h" CPlatformNetworkManagerStub* g_pPlatformNetworkManager; diff --git a/targets/Minecraft.Client/Common/src/Network/Socket.cpp b/targets/Minecraft.Client/Common/src/Network/Socket.cpp index e302f47a6..adc7f9f44 100644 --- a/targets/Minecraft.Client/Common/src/Network/Socket.cpp +++ b/targets/Minecraft.Client/Common/src/Network/Socket.cpp @@ -1,17 +1,15 @@ #include "Socket.h" #include - #include #include #include + // 4jcraft TODO #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "minecraft/server/network/ServerConnection.h" class SocketAddress {}; diff --git a/targets/Minecraft.Client/Common/src/Network/Socket.h b/targets/Minecraft.Client/Common/src/Network/Socket.h index fe89f6b67..2ff1d8d11 100644 --- a/targets/Minecraft.Client/Common/src/Network/Socket.h +++ b/targets/Minecraft.Client/Common/src/Network/Socket.h @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef __linux__ #include #include diff --git a/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp b/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp index dd17a0d46..565a2c954 100644 --- a/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp +++ b/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp @@ -1,6 +1,5 @@ #include "TrialMode.h" -#include "Minecraft.Client/Common/src/Trial/TrialMode.h" #include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h" #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp index c0992c8f7..d739473e9 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp index b8fb0c241..4517d23f2 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -3,7 +3,6 @@ #include #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" @@ -15,6 +14,7 @@ #include "minecraft/world/level/LevelSettings.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" ChangeStateConstraint::ChangeStateConstraint( Tutorial* tutorial, eTutorial_State targetState, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp index f45233341..fe0aaf148 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp @@ -2,7 +2,6 @@ #include "4J.Common/4J_InputActions.h" #include "4J_Input.h" -#include "Minecraft.Client/Common/App_enums.h" bool InputConstraint::isMappingConstrained(int iPad, int mapping) { // If it's a menu button, then we ignore all inputs diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp index 8ae9af1da..ac07299da 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp @@ -1,18 +1,40 @@ #include "FullTutorial.h" +#include +#include + #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h" -#include "Minecraft.Client/include/stdafx.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" #include "minecraft/world/item/alchemy/PotionMacros.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/crafting/Recipy.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "strings.h" + +class TutorialConstraint; FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) : Tutorial(iPad, true) { diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h index c7a91226b..243015542 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h @@ -1,5 +1,6 @@ #pragma once #include "Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #define FULL_TUTORIAL_PROGRESS_2_X_2_Crafting 1 #define FULL_TUTORIAL_PROGRESS_3_X_3_Crafting 2 diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp index 4306b7b45..752237ec1 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp @@ -1,10 +1,9 @@ #include "FullTutorialMode.h" #include "FullTutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" +#include "minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "minecraft/client/Minecraft.h" class ClientConnection; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp index d26b599df..488ccee79 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp @@ -2,12 +2,13 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial, eTutorial_State displayState, eTutorial_State completeState, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp index 18da2a552..f5fb02cc4 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp @@ -1,11 +1,14 @@ #include "DiggerItemHint.h" +#include + #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" +#include "java/Class.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/item/ItemInstance.h" +#include "strings.h" DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, int items[], diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h index 11f3109ea..8452848cb 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h @@ -1,9 +1,11 @@ #pragma once #include "TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class DiggerItem; class Level; +class Tutorial; class DiggerItemHint : public TutorialHint { private: diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp index 3517053f0..481967a28 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp @@ -1,7 +1,8 @@ #include "LookAtEntityHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, int titleId, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp index 1ac51a7c3..cb677e8b3 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp @@ -2,9 +2,10 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "minecraft/world/item/Item.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial, int tiles[], unsigned int tilesLength, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp index b9d2f29ae..959fbb05d 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp @@ -2,9 +2,10 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[], unsigned int itemsLength) diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp index 0c4217e59..5274bb17f 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp @@ -1,6 +1,5 @@ #include "TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp index b90103a7b..0a113b80e 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp @@ -3,8 +3,9 @@ #include #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial, std::vector* inConstraints, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h index 8ea5cc20f..aea913ff0 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h @@ -2,6 +2,7 @@ // using namespace std; #include +#include #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "TutorialTask.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp index c2ba8a802..6a5f751f4 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp @@ -5,12 +5,13 @@ #include "4J_Input.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" ChoiceTask::ChoiceTask( Tutorial* tutorial, int descriptionId, int promptId /*= -1*/, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp index 911c833c2..876a0f5e6 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp index 20b43e774..57d3efaef 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp @@ -9,10 +9,10 @@ #include "4J_Input.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp index 45a240f0b..9c5c347ba 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp @@ -1,12 +1,11 @@ #include "CraftTask.h" #include - #include #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; class TutorialConstraint; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h index 797eef27c..97f30531c 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "TutorialTask.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp index d3fe0e43e..05eced5d4 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp @@ -1,7 +1,8 @@ #include "FullTutorialActiveTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" FullTutorialActiveTask::FullTutorialActiveTask( Tutorial* tutorial, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp index 5e186f5a3..c2e026995 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp @@ -2,10 +2,11 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp index 06d8694bd..84703c836 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp @@ -7,12 +7,12 @@ #include "4J_Input.h" #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" InfoTask::InfoTask(Tutorial* tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/, int iMapping /*= 0*/) diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h index 798a9a873..d58b53141 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h @@ -1,5 +1,6 @@ #pragma once #include +#include // using namespace std; #include "TutorialTask.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp index 1f9970de6..9c7accbe9 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp @@ -4,6 +4,7 @@ #include #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" ProcedureCompoundTask::~ProcedureCompoundTask() { for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it) { diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h index 5c78b3a2a..0498d801b 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h @@ -2,6 +2,7 @@ // using namespace std; #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp index c7f4f1158..c485966d3 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; class TutorialConstraint; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h index 529d52d94..944cc10bc 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "TutorialTask.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp index 74a6cb989..21663eadc 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp @@ -1,9 +1,9 @@ #include "StatTask.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/client/Minecraft.h" #include "minecraft/stats/StatsCounter.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp index 1565ad2f1..3276a0a55 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp @@ -3,7 +3,6 @@ #include #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" TutorialTask::TutorialTask(Tutorial* tutorial, int descriptionId, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp index 0da47ee1d..6321858f6 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; class TutorialConstraint; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h index ff4703aa2..6f725a65e 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h @@ -2,6 +2,7 @@ // using namespace std; #include +#include #include "TutorialTask.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp index 49469a07e..f1c17075b 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/level/Level.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; class TutorialConstraint; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h index 18d75a1d6..800f6ec68 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h @@ -2,6 +2,7 @@ // using namespace std; #include +#include #include "TutorialTask.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h index 760b53885..382acb6d5 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "TutorialTask.h" #include "minecraft/world/item/crafting/Recipy.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp index 6a741e1c9..5026d2dbf 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp @@ -1,26 +1,53 @@ #include "Tutorial.h" +#include +#include +#include +#include + #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h" -#include "Minecraft.Client/include/stdafx.h" #include "TutorialMessage.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/client/player/LocalPlayer.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/server/level/SurvivalMode.h" -#include "minecraft/stats/net.minecraft.stats.h" #include "minecraft/world/entity/Entity.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/Level.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Common/App_structs.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "java/Class.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/QuartzBlockTile.h" +#include "minecraft/world/level/tile/SandStoneTile.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/tile/WallTile.h" +#include "strings.h" + +class MobEffect; std::vector Tutorial::s_completableTasks; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h index e23c530f4..52c78c3e4 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h +++ b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h @@ -2,12 +2,26 @@ // using namespace std; #include #include +#include +#include +#include +#include +#include #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "TutorialEnum.h" #include "TutorialMessage.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" + +class Entity; +class ItemInstance; +class MobEffect; +class Tile; +class TutorialConstraint; +class TutorialHint; +class TutorialTask; // #define TUTORIAL_HINT_DELAY_TIME 14000 // How long we should wait from // displaying one hint to the next #define TUTORIAL_DISPLAY_MESSAGE_TIME 7000 diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp index 557e39c6a..eed1199f2 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp +++ b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp @@ -2,17 +2,14 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "console_helpers/PlatformTime.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/stdafx.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" class ClientConnection; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp index 5c6e6b536..382856c07 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp @@ -1,11 +1,9 @@ #include "ArchiveFile.h" #include - #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/PortableFileIO.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 7e4880381..8f7feaf8e 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -1,20 +1,38 @@ #include "IUIScene_AbstractContainerMenu.h" +#include #include +#include +#include +#include #include "4J.Common/4J_InputActions.h" #include "4J_Input.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/include/stdafx.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "minecraft/world/phys/Vec3.h" +#include "4J_Render.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Rarity.h" +#include "minecraft/world/item/crafting/ArmorRecipes.h" +#include "minecraft/world/item/crafting/FurnaceRecipes.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "strings.h" IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu() { m_menu = nullptr; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h index 70bc0e5eb..a90dd0125 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h @@ -1,7 +1,11 @@ #pragma once +#include +#include + #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "UIStructs.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" class HtmlString; class ItemInstance; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp index dcf019aef..75d22cf9c 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -1,12 +1,25 @@ #include "IUIScene_AnvilMenu.h" -#include "Minecraft.Client/include/stdafx.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include +#include + #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/AnvilMenu.h" +#include "minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "strings.h" IUIScene_AnvilMenu::IUIScene_AnvilMenu() { m_inventory = nullptr; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h index e64ae39ac..cb63ae2ef 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h @@ -1,4 +1,7 @@ #pragma once +#include +#include + #include "IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp index 539636dc8..d320ae8cf 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -1,12 +1,10 @@ #include "IUIScene_BeaconMenu.h" #include - #include #include #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" @@ -18,6 +16,7 @@ #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/inventory/BeaconMenu.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_BeaconMenu::IUIScene_BeaconMenu() { m_beacon = nullptr; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp index 8303bd207..db3ab1fff 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/BrewingStandMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp index 7f4727623..1ddd60f87 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp index abb7f01c6..4e2001843 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -1,13 +1,33 @@ #include "IUIScene_CraftingMenu.h" +#include +#include +#include +#include +#include + #include "4J.Common/4J_InputActions.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/include/stdafx.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/crafting/ShapedRecipy.h" +#include "minecraft/world/level/tile/Tile.h" +#include "strings.h" Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA [IUIScene_CraftingMenu::m_iMaxGroup2x2] = { diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h index b9810692f..2a43ecd42 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h @@ -1,10 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/crafting/Recipy.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class LocalPlayer; +class ItemInstance; // 4J Stu - Crafting menu code that's shared across Iggy and XUI class IUIScene_CraftingMenu { diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp index feb144a8f..d35693b8d 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -1,21 +1,49 @@ #include "IUIScene_CreativeMenu.h" +#include #include +#include +#include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/include/stdafx.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" #include "minecraft/world/item/alchemy/PotionMacros.h" -#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/SimpleContainer.h" +#include "minecraft/world/entity/Painting.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/inventory/InventoryMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/FireworksItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/QuartzBlockTile.h" +#include "minecraft/world/level/tile/SandStoneTile.h" +#include "minecraft/world/level/tile/SaplingPlantTile.h" +#include "minecraft/world/level/tile/SmoothStoneBrickTile.h" +#include "minecraft/world/level/tile/StoneMonsterTile.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/tile/WallTile.h" +#include "minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" // 4J JEV - Images for each tab. IUIScene_CreativeMenu::TabSpec** IUIScene_CreativeMenu::specs = nullptr; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h index a777e264f..8f37a524b 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h @@ -1,6 +1,15 @@ #pragma once +#include +#include +#include + #include "IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" + +class Inventory; +class ItemInstance; // 4J Stu - This class is for code that is common between XUI and Iggy class SimpleContainer; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp index 78f3960d8..56a6c89ab 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp @@ -1,15 +1,14 @@ #include "IUIScene_EnchantingMenu.h" #include - #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/EnchantmentMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" class Player; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp index f42a769f6..b20f0c2f1 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/FireworksMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FireworksMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp index eeb8a9845..f0333cd44 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/FurnaceMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp index 077582066..dc601cec7 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/HopperMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HopperMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp index fc7b664a7..f954c264e 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection( diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp index c8afa4a59..e44e2f8f0 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/InventoryMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index 8d89b4125..1b967cada 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -1,22 +1,34 @@ #include "IUIScene_PauseMenu.h" +#include #include #include +#include +#include +#include +#include #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "console_helpers/StringHelpers.h" #include "console_helpers/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/skins/DLCTexturePack.h" -#include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "strings.h" + +class TexturePack; int IUIScene_PauseMenu::ExitGameDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h index e02e4343f..11f55070d 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h @@ -5,6 +5,8 @@ #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/include/stdafx.h" +class DLCPack; + class IUIScene_PauseMenu { protected: DLCPack* m_pDLCPack; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp index e5598db8e..d78d11d41 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -1,16 +1,29 @@ #include "IUIScene_TradingMenu.h" +#include +#include + #include "4J.Common/4J_InputActions.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/include/stdafx.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/network/packet/TradeItemPacket.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Rarity.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/world/item/trading/MerchantRecipeList.h" +#include "strings.h" IUIScene_TradingMenu::IUIScene_TradingMenu() { m_validOffersCount = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h index b35165931..d3998101a 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h @@ -1,10 +1,20 @@ #pragma once +#include +#include +#include +#include +#include + #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/inventory/MerchantMenu.h" #include "minecraft/world/item/Rarity.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "minecraft/world/item/trading/Merchant.h" class MerchantRecipe; +class HtmlString; +class ItemInstance; class IUIScene_TradingMenu { protected: diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp index b7973dc23..3a690eb5a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp @@ -2,13 +2,16 @@ #include -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIComponent_Chat::UIComponent_Chat(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp index 955ad3e95..1e8888195 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp @@ -1,6 +1,5 @@ #include "UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index 2a7dcaee4..d5d991c1b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -1,8 +1,8 @@ #include "UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp index 38059de09..905babe27 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp @@ -1,7 +1,6 @@ #include "UIComponent_Logo.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp index d61f692d4..5c2fe3cac 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp @@ -1,10 +1,11 @@ #include "UIComponent_MenuBackground.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Linux_UIController.h" +#include "4J_Render.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp index a4553cb75..0df156127 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp @@ -1,10 +1,8 @@ #include "UIComponent_Panorama.h" #include - #include -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_UIController.h" @@ -12,6 +10,9 @@ #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/storage/LevelData.h" +#include "4J_Render.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIComponent_Panorama::UIComponent_Panorama(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp index 74eee5452..cd4da419c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp @@ -1,8 +1,12 @@ #include "UIComponent_PressStartToPlay.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" -#include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" + +class UILayer; UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void* initData, diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h index 325d3d0e7..ad4523f67 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h @@ -1,7 +1,15 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J.Common/4J_Compat.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class UILayer; class UIComponent_PressStartToPlay : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp index 7fd029100..030f31455 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp @@ -1,12 +1,17 @@ #include "UIComponent_Tooltips.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" +#include "4J_Render.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp index bc0cdeca0..68a82b575 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -1,12 +1,24 @@ #include "UIComponent_TutorialPopup.h" +#include +#include + #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" +#include "strings.h" UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h index 328d3a47a..94604cdd1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h @@ -1,7 +1,20 @@ #pragma once +#include +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class ItemInstance; +class Tutorial; +class UILayer; #define TUTORIAL_POPUP_FADE_TIMER_ID 0 #define TUTORIAL_POPUP_MOVE_SCENE_TIMER_ID 1 diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp index ea82df748..ab3105080 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp @@ -1,17 +1,28 @@ #include "UIScene_HUD.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include + #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/BossMobGuiInfo.h" -#include "minecraft/client/renderer/entity/EnderDragonRenderer.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/InventoryMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "strings.h" UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h index 05254b62e..4611444b2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h +++ b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h @@ -1,8 +1,17 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; #define CHAT_LINES_COUNT 10 diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp index cd722706b..bb82bb278 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp @@ -3,6 +3,8 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/JavaMath.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #ifndef _ENABLESHIGGY #include "Minecraft.Client/Linux/Stubs/iggy_stubs.h" #endif diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp index 7951a8b7d..938a95bf9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp @@ -7,8 +7,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "UIControl.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" UIControl_Base::UIControl_Base() { m_bLabelChanged = false; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp index ad0c24648..6bfa47ad6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -1,8 +1,8 @@ #include "UIControl_BeaconEffectButton.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_BeaconEffectButton::UIControl_BeaconEffectButton() { m_data = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h index 1beaa2646..2fff805d9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h @@ -6,6 +6,8 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" class UIControl_BeaconEffectButton : public UIControl { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp index 567c139f5..47350b742 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp @@ -1,9 +1,9 @@ #include "UIControl_BitmapIcon.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h index 9c642ebe4..7a2c4369b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h @@ -6,6 +6,8 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" class UIControl_BitmapIcon : public UIControl { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp index bfc7f969d..52a8fdd7a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp @@ -2,9 +2,10 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_Button::UIControl_Button() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h index 6215ecf3a..58c2b3477 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h @@ -7,6 +7,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" class UIControl_Button : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp index 0db0f20e6..36761fae8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp @@ -2,10 +2,11 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_ButtonList::UIControl_ButtonList() { m_itemCount = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h index f1d8baae2..a723680b9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h @@ -8,6 +8,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" class UIControl_ButtonList : public UIControl_Base { protected: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp index 502d70c4c..b2e9a31b6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp @@ -2,10 +2,11 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_CheckBox::UIControl_CheckBox() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h index 4ce906153..8ab410ceb 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h @@ -7,6 +7,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" class UIControl_CheckBox : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp index 322b03437..37a88d880 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp @@ -2,7 +2,7 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_Cursor::UIControl_Cursor() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h index 4c7ca7e0b..927e401d8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h @@ -6,6 +6,8 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" class UIControl_Cursor : public UIControl_Base { public: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp index c79638d98..7dbd18d87 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp @@ -1,11 +1,11 @@ #include "UIControl_DLCList.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h index 055990762..2d7ee6681 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h @@ -6,6 +6,7 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" class UIControl_DLCList : public UIControl_ButtonList { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp index ab9ec8924..14eacabaf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp @@ -2,9 +2,10 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIControl_DynamicLabel::UIControl_DynamicLabel() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h index 7c4f35395..0ec259e8d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h @@ -8,6 +8,7 @@ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" class UIControl_DynamicLabel : public UIControl_Label { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp index 6362cbdd5..0cb5768d6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp @@ -1,12 +1,9 @@ #include "UIControl_EnchantmentBook.h" -#include - #include #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "java/Class.h" #include "minecraft/client/Lighting.h" @@ -18,6 +15,8 @@ #include "minecraft/world/inventory/EnchantmentMenu.h" #include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "gl3_loader.h" UIControl_EnchantmentBook::UIControl_EnchantmentBook() { UIControl::setControlType(UIControl::eEnchantmentBook); diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h index 6873e48c8..0f4598199 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h @@ -7,6 +7,8 @@ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl.h" #include "java/Random.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" class UIScene_EnchantingMenu; class BookModel; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp index a3d6e3db3..22c0a3064 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -1,7 +1,5 @@ #include "UIControl_EnchantmentButton.h" -#include - #include #include #include @@ -10,8 +8,6 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" @@ -21,6 +17,9 @@ #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/inventory/EnchantmentMenu.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "gl3_loader.h" UIControl_EnchantmentButton::UIControl_EnchantmentButton() { m_index = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h index c05781592..39dbc2ed0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h @@ -8,6 +8,7 @@ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Button.h" #include "java/Random.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" class UIControl_EnchantmentButton : public UIControl_Button { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp index 2d55d8a44..0e83db423 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp @@ -2,8 +2,9 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIControl_HTMLLabel::UIControl_HTMLLabel() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h index 4e22b6f70..9d6bb672c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h @@ -8,6 +8,8 @@ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" class UIControl_HTMLLabel : public UIControl_Label { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp index 85ef0ef8c..5d969034f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp @@ -2,9 +2,10 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_Label::UIControl_Label() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h index 6fe9177ff..41cbc95bc 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h @@ -7,6 +7,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" class UIControl_Label : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp index f645a6a8d..733de2a3e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp @@ -2,9 +2,9 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_LeaderboardList::UIControl_LeaderboardList() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h index c1e282d82..d3e65e352 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h @@ -6,6 +6,8 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" class UIControl_LeaderboardList : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp index 0a68229ba..65ef9edc8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp @@ -1,7 +1,6 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" #include - #include #include @@ -15,11 +14,10 @@ #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/EntityHorse.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" // #include // "../../../minecraft/net.minecraft.world.entity.animal.EntityHorse.h" -#include "UIControl_MinecraftHorse.h" - UIControl_MinecraftHorse::UIControl_MinecraftHorse() { UIControl::setControlType(UIControl::eMinecraftHorse); diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h index f500748f2..f5cf3deb6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h @@ -1,8 +1,10 @@ #pragma once #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" + #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" class UIControl_MinecraftHorse : public UIControl { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp index 6ed407f52..b3f954301 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -1,13 +1,10 @@ #include "UIControl_MinecraftPlayer.h" #include - #include #include #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" @@ -15,6 +12,8 @@ #include "minecraft/client/gui/ScreenSizeCalculator.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_MinecraftPlayer::UIControl_MinecraftPlayer() { UIControl::setControlType(UIControl::eMinecraftPlayer); diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h index 5bfb23ad4..c09ca795e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h @@ -1,8 +1,10 @@ #pragma once #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" + #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" class UIControl_MinecraftPlayer : public UIControl { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp index 6eca367a9..f910d8d31 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp @@ -1,11 +1,11 @@ #include "UIControl_PlayerList.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h index 635cd9127..393f66a2f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h @@ -6,6 +6,7 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" class UIControl_PlayerList : public UIControl_ButtonList { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp index fdedfcb77..dc6a8141e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -1,15 +1,12 @@ #include "UIControl_PlayerSkinPreview.h" -#include #include - #include #include #include #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "minecraft/client/Lighting.h" @@ -22,6 +19,9 @@ #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/world/entity/player/Player.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "gl3_loader.h" // #define SKIN_PREVIEW_BOB_ANIM #define SKIN_PREVIEW_WALKING_ANIM diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h index 8f31b2648..ef9349b9b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h @@ -3,11 +3,13 @@ #include #include #include +#include #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl.h" #include "minecraft/client/renderer/Textures.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" class ModelPart; class EntityRenderer; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp index 6e5bcdb71..62155c532 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp @@ -2,9 +2,10 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_Progress::UIControl_Progress() { m_min = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h index 4eebbabb4..415966001 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h @@ -7,6 +7,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" class UIControl_Progress : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp index ce1316196..1e38f7145 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp @@ -1,11 +1,11 @@ #include "UIControl_SaveList.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h index a19e5822f..3bc0b46c9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h @@ -6,6 +6,7 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" class UIControl_SaveList : public UIControl_ButtonList { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp index 1336f601d..9f5b95bd6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp @@ -2,11 +2,13 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIControl_Slider::UIControl_Slider() { m_id = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h index 510c0d9ce..c09ab6996 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h @@ -9,6 +9,8 @@ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" class UIControl_Slider : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp index 6025b136f..960772d23 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp @@ -2,8 +2,8 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_SlotList::UIControl_SlotList() { m_lastHighlighted = -1; } diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h index fce24ffca..c579cfd66 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h @@ -6,6 +6,8 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" class UIControl_SlotList : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp index 329eb5ea3..df1570877 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -2,9 +2,10 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() { m_min = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h index e33abea3a..cea14b406 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include @@ -12,6 +11,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h" class UIControl_SpaceIndicatorBar : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp index f26a3f00a..d94c8a099 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp @@ -2,9 +2,10 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_TextInput::UIControl_TextInput() { m_bHasFocus = false; } diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h index 13dc2c135..46719d56d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h @@ -7,6 +7,8 @@ #include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" class UIControl_TextInput : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp index 09010f8e6..801bcb779 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp @@ -2,10 +2,11 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Common/src/UI/UIString.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UIControl_TexturePackList::UIControl_TexturePackList() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h index 2f0c50763..42074f6e3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h @@ -7,6 +7,8 @@ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" class UIControl_TexturePackList : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp index fdc754f2d..7fc002af3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp @@ -2,6 +2,7 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" UIControl_Touch::UIControl_Touch() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h index 71f6ce95e..3e4682a0e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h +++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h @@ -6,6 +6,8 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h" class UIControl_Touch : public UIControl_Base { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 97c895a0a..597c80ce5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -13,10 +13,15 @@ #include "console_helpers/compression.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/ChunkSource.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "UIScene_DebugCreateSchematic.h" #include "console_helpers/StringHelpers.h" UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 7bbdc794a..ce5fb0ece 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,12 +1,11 @@ #include "UIScene_DebugOptions.h" #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index b1a15f657..d9e1ba23a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -2,7 +2,6 @@ #include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" #include - #include #include "4J_Profile.h" @@ -21,11 +20,16 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/enchantment/Enchantment.h" #include "minecraft/world/level/storage/LevelData.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class Player; class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "UIScene_DebugOverlay.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index 429500f96..8730e5f32 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -2,7 +2,6 @@ #include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" #include - #include #include "4J_Input.h" @@ -12,10 +11,16 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "minecraft/world/phys/Vec3.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UILayer; #ifdef _DEBUG_MENUS_ENABLED -#include "UIScene_DebugSetCamera.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 8e1efdbc0..dd8a8e0a7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -1,7 +1,6 @@ #include "IUIScene_StartGame.h" #include - #include #include "4J_Profile.h" @@ -12,6 +11,10 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 334fa6f19..dfcbc259f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -1,8 +1,11 @@ #include "UIScene_CreateWorldMenu.h" +#include +#include +#include + #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" @@ -11,8 +14,28 @@ #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/LevelSettings.h" -#include "minecraft/world/level/LevelType.h" -#include "minecraft/world/level/biome/BiomeSource.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "strings.h" #if defined(_WINDOWS64) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index ce8548a9e..a7b7e2a19 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "IUIScene_StartGame.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" @@ -8,6 +11,15 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class DLCPack; +class UILayer; class UIScene_CreateWorldMenu : public IUIScene_StartGame { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index a76bdd1a7..6317eddb5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -1,7 +1,17 @@ #include "UIScene_DLCMainMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include "4J.Common/4J_InputActions.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" + +class UILayer; #define PLAYER_ONLINE_TIMER_ID 0 #define PLAYER_ONLINE_TIMER_TIME 100 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index 22d5d6173..d1ed1d2c9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -1,8 +1,16 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_DLCMainMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index c07f9fa06..aafcbe32c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -1,8 +1,21 @@ #include "UIScene_DLCOffersMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "console_helpers/StringHelpers.h" +#include + +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" + +class UILayer; #define PLAYER_ONLINE_TIMER_ID 0 #define PLAYER_ONLINE_TIMER_TIME 100 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index 5c206ccc1..55d855c25 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -1,10 +1,18 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_DLCOffersMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index 3b9a1ab03..45223662c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -1,8 +1,22 @@ #include "UIScene_EULA.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "console_helpers/StringHelpers.h" +#include + +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index 8493c67da..cc69c59bb 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -5,6 +5,10 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_EULA : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index 2e7aeef25..11c0f5130 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -1,9 +1,10 @@ #include "UIScene_Intro.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_UIController.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 1b688a8f8..b7c274bdd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -1,13 +1,28 @@ #include "UIScene_JoinMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "minecraft/client/Minecraft.h" -#include "minecraft/client/Options.h" -#include "minecraft/client/skins/TexturePackRepository.h" -#include "minecraft/server/MinecraftServer.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" +#include +#include + +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/SessionInfo.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/level/LevelSettings.h" +#include "strings.h" #define UPDATE_PLAYERS_TIMER_ID 0 #define UPDATE_PLAYERS_TIMER_TIME 30000 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index bce7a20f3..bae837f49 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -1,9 +1,17 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class FriendSessionInfo; +class UILayer; class UIScene_JoinMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index d3464b763..6385d6d1e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -1,9 +1,26 @@ #include "UIScene_LaunchMoreOptionsMenu.h" +#include +#include + #include "4J_Input.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" #include "console_helpers/StringHelpers.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index 7a3974f7a..c0a81a400 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" @@ -7,6 +9,12 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_LaunchMoreOptionsMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index ff100dc66..6d101187a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -1,10 +1,29 @@ #include "UIScene_LeaderboardsMenu.h" +#include +#include +#include +#include +#include + #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" +#include "strings.h" #define PLAYER_ONLINE_TIMER_ID 0 #define PLAYER_ONLINE_TIMER_TIME 100 @@ -641,9 +660,6 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( unsigned int displayValue = leaderboardEntry->m_columns[i]; if (displayValue > 99999) displayValue = 99999; swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%u", displayValue); -#if defined(_DEBUG) - // app.DebugPrintf("Value - %d\n",leaderboardEntry->m_columns[i]); -#endif } else { // check how many digits we have int iDigitC = 0; @@ -655,34 +671,18 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( uiVal /= 10; iDigitC++; } - -#if defined(_DEBUG) - // app.DebugPrintf("Value - %d\n",leaderboardEntry->m_columns[i]); -#endif if (iDigitC < 4) { // m swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%um", leaderboardEntry->m_columns[i]); -#if defined(_DEBUG) - // app.DebugPrintf("Display - %um\n", - // leaderboardEntry->m_columns[i]); -#endif } else if (iDigitC < 8) { // km with a .X swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", ((float)leaderboardEntry->m_columns[i]) / 1000.f); -#if defined(_DEBUG) - // app.DebugPrintf("Display - %.1fkm\n", - // ((float)leaderboardEntry->m_columns[i])/1000.f); -#endif } else { // bigger than that, so no decimal point swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", ((float)leaderboardEntry->m_columns[i]) / 1000.f); -#if defined(_DEBUG) - // app.DebugPrintf("Display - %.0fkm\n", - // ((float)leaderboardEntry->m_columns[i])/1000.f); -#endif } } } diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index 81b5a0f1c..db8308206 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -1,9 +1,20 @@ #pragma once +#include +#include + #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 6aa1f3c7d..e503c1d32 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -1,15 +1,39 @@ #include "UIScene_LoadMenu.h" +#include +#include + #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" #include "minecraft/client/skins/DLCTexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/LevelSettings.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "minecraft/client/skins/TexturePack.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index 3cb1ff2f6..fd68e8347 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "IUIScene_StartGame.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" @@ -9,6 +10,16 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class DLCPack; +class LevelGenerationOptions; +class UILayer; class UIScene_LoadMenu : public IUIScene_StartGame { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 3850e170f..2d2df546b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -1,22 +1,35 @@ #include "UIScene_LoadOrJoinMenu.h" -#include -#include +#include +#include +#include +#include #include "Minecraft.Client/Common/src/Network/SessionInfo.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "console_helpers/PortableFileIO.h" -#include "console_helpers/StringHelpers.h" -#include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" -#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "java/File.h" +#include "java/InputOutputStream/FileInputStream.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/level/LevelSettings.h" +#include "strings.h" #if defined(SONY_REMOTE_STORAGE_DOWNLOAD) unsigned long UIScene_LoadOrJoinMenu::m_ulFileSize = 0L; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 9d8c75ee6..12e1e8c2a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -2,6 +2,8 @@ #include #include +#include +#include #include "4J_Storage.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" @@ -10,8 +12,15 @@ #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class LevelGenerationOptions; +class File; +class FriendSessionInfo; +class UILayer; class UIScene_LoadOrJoinMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 3a73cdec1..e35cb5a4f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -1,7 +1,10 @@ #include "UIScene_MainMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include +#include + #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" @@ -9,7 +12,31 @@ #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/ScreenSizeCalculator.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/util/Mth.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "gl3_loader.h" +#include "java/InputOutputStream/BufferedReader.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/InputStreamReader.h" +#include "java/System.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" + +class LevelGenerationOptions; Random* UIScene_MainMenu::random = new Random(); diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index 2aa843da6..e2863f365 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -1,11 +1,20 @@ #pragma once +#include #include #include #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "java/Random.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class Random; +class UILayer; class UIScene_MainMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 699011231..01bace163 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -1,8 +1,19 @@ #include "UIScene_NewUpdateMessage.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "console_helpers/StringHelpers.h" +#include + +#include "4J.Common/4J_InputActions.h" +#include "Common/App_Defines.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData, UILayer* parentLayer) @@ -23,7 +34,7 @@ UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData, std::vector paragraphs; int lastIndex = 0; for (int index = message.find(L"\r\n", lastIndex, 2); - index != wstring::npos; index = message.find(L"\r\n", lastIndex, 2)) { + index != std::wstring::npos; index = message.find(L"\r\n", lastIndex, 2)) { paragraphs.push_back(message.substr(lastIndex, index - lastIndex) + L" "); lastIndex = index + 2; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index 3c7e517b4..9a923a506 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_NewUpdateMessage : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index ac85a6aee..6f30cc3d3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -1,7 +1,19 @@ #include "UIScene_SaveMessage.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "Common/App_Defines.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" #define PROFILE_LOADED_TIMER_ID 0 #define PROFILE_LOADED_TIMER_TIME 50 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index 583b66893..8afbd979b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -1,8 +1,15 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_SaveMessage : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index ea05248e7..757f1054d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -1,7 +1,16 @@ #include "UIScene_TrialExitUpsell.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_Defines.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" + +class UILayer; UIScene_TrialExitUpsell::UIScene_TrialExitUpsell(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h index dc5fa62bc..a3034ec34 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" + +class UILayer; class UIScene_TrialExitUpsell : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index df64b38d9..fd37850b8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -1,11 +1,25 @@ #include "UIScene_ControlsMenu.h" +#include +#include + #include "4J_Input.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "4J.Common/4J_InputActions.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "strings.h" + +class UILayer; UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index d489dd271..910bbf952 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -1,9 +1,17 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_ControlsMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp index f1d8131f7..e2887770f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -1,8 +1,16 @@ #include "UIScene_Credits.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include + #include "console_helpers/StringHelpers.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" #define CREDIT_ICON -2 @@ -115,8 +123,6 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { {L"Roni Percy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Anne Clarke", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, {L"Anthony Kent", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, -#if defined(_WIN64) -#endif // Miles & Iggy credits {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h index ccfca0029..e2dc70e39 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h @@ -1,6 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; #define PS3_CREDITS_COUNT 80 #define PSVITA_CREDITS_COUNT 82 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 4c692db98..2ec3f02a2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -1,8 +1,16 @@ #include "UIScene_HelpAndOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/client/Minecraft.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index 3ac367981..6f31e2ba2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; #define BUTTON_HAO_CHANGESKIN 0 #define BUTTON_HAO_HOWTOPLAY 1 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 35135650e..392530f30 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -1,8 +1,21 @@ #include "UIScene_HowToPlay.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include +#include + #include "console_helpers/StringHelpers.h" +#include "4J.Common/4J_InputActions.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" + +class UILayer; static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[eHowToPlay_NumPages] = { @@ -287,7 +300,7 @@ void UIScene_HowToPlay::StartPage(EHowToPlayPage ePage) { std::vector paragraphs; int lastIndex = 0; for (int index = finalText.find(L"\r\n", lastIndex, 2); - index != wstring::npos; + index != std::wstring::npos; index = finalText.find(L"\r\n", lastIndex, 2)) { paragraphs.push_back(finalText.substr(lastIndex, index - lastIndex) + L" "); diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h index 5839dd031..91ade7e42 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class UILayer; class UIScene_HowToPlay : public UIScene { public: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 4e16dc1c4..2dee65957 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -1,7 +1,17 @@ #include "UIScene_HowToPlayMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include + +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" // strings for buttons in the list unsigned int UIScene_HowToPlayMenu::m_uiHTPButtonNameA[] = { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index 153219b49..cc2ca51e1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_HowToPlayMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 3fdfa2bca..8a6bd238f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,9 +1,14 @@ #include "UIScene_LanguageSelector.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" // strings for buttons in the list const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[] = { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index a9e1850b4..49dd5fd46 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Minecraft.Client/Common/App_Defines.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" @@ -7,6 +9,10 @@ #include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_LanguageSelector : public UIScene { public: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index dee5d6fa4..eb8925397 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -1,7 +1,13 @@ #include "UIScene_ReinstallMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "strings.h" UIScene_ReinstallMenu::UIScene_ReinstallMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index f35880802..d9d95a229 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_ReinstallMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index 51e9b09b0..0c0df31ad 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -1,7 +1,17 @@ #include "UIScene_SettingsAudioMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include + +#include "4J.Common/4J_InputActions.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "strings.h" UIScene_SettingsAudioMenu::UIScene_SettingsAudioMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index 3d491f8e8..5767fc092 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_SettingsAudioMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index abf727879..510ee8d01 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -1,8 +1,16 @@ #include "UIScene_SettingsControlMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" +#include + #include "minecraft/client/Minecraft.h" +#include "4J.Common/4J_InputActions.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad, void* initData, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index 501cf22d6..245ab3662 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -1,7 +1,13 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_SettingsControlMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index 6aeb12655..f65ce7e5c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -1,7 +1,19 @@ #include "UIScene_SettingsGraphicsMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" +#include + +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "strings.h" UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void* initData, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index c62e26545..19d5cc07c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_SettingsGraphicsMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 686c2726b..4a410f053 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -1,8 +1,16 @@ #include "UIScene_SettingsMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/client/Minecraft.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index 677182e65..80bdc83db 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -1,7 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; #define BUTTON_ALL_OPTIONS 0 #define BUTTON_ALL_AUDIO 1 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 49802e6e4..65e103f29 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -1,7 +1,24 @@ #include "UIScene_SettingsOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include + +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" int UIScene_SettingsOptionsMenu::m_iDifficultySettingA[4] = { IDS_DIFFICULTY_PEACEFUL, IDS_DIFFICULTY_EASY, IDS_DIFFICULTY_NORMAL, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index a8ef6caba..bdf8093c7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -1,10 +1,16 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_SettingsOptionsMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 6c43eb298..8c289f0df 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -1,7 +1,19 @@ #include "UIScene_SettingsUIMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include + +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "strings.h" UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index 311288868..de2a367df 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_SettingsUIMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index db0ee9826..5858dc78c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -1,11 +1,32 @@ #include "UIScene_SkinSelectMenu.h" +#include +#include + #include "Minecraft.Client/Common/Minecraft_Macros.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "console_helpers/StringHelpers.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "Common/App_Defines.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "SkinBox.h" +#include "gl3_loader.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" + +class ModelPart; #define SKIN_SELECT_PACK_DEFAULT 0 #define SKIN_SELECT_PACK_FAVORITES 1 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index e33dd5d5a..e7efbac08 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -1,5 +1,7 @@ #pragma once #include +#include +#include #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" @@ -7,6 +9,15 @@ #include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/include/SkinBox.h" #include "console_helpers/Definitions.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "minecraft/client/renderer/Textures.h" + +class DLCPack; +class UILayer; class UIScene_SkinSelectMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 9a59c81ae..bd7c33fa4 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -1,11 +1,28 @@ #include "UIScene_AbstractContainerMenu.h" +#include +#include + #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "strings.h" UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu( int iPad, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index 9b4e58aba..914905443 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -1,12 +1,19 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class AbstractContainerMenu; +class UILayer; class UIScene_AbstractContainerMenu : public UIScene, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 0cf1d7121..be242dbfd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -1,12 +1,32 @@ #include "UIScene_AnvilMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include +#include +#include + #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "4J_Input.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AnvilMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "strings.h" + +class UILayer; UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index 9911d27e4..53d94386c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "4J_Input.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h" @@ -8,8 +10,14 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/MerchantMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class InventoryMenu; +class UILayer; class UIScene_AnvilMenu : public UIScene_AbstractContainerMenu, public IUIScene_AnvilMenu { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index efe302833..56d10ebc0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -1,11 +1,25 @@ #include "UIScene_BeaconMenu.h" +#include +#include + #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/BeaconMenu.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "strings.h" + +class UILayer; UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index 4926b25ea..b1653ffdd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -1,10 +1,19 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class UILayer; class UIScene_BeaconMenu : public UIScene_AbstractContainerMenu, public IUIScene_BeaconMenu { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index 7c63ec550..da1aa6903 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -6,14 +6,17 @@ #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/BrewingStandMenu.h" #include "minecraft/world/item/alchemy/PotionBrewing.h" #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index a5af70480..57c4395d1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -1,19 +1,20 @@ #include "UIScene_ContainerMenu.h" #include - #include #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/ContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 4740160eb..ac0935f6f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -1,25 +1,25 @@ #include "UIScene_CreativeMenu.h" #include - #include #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/XboxStubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/SimpleContainer.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 245482b46..a220d62f0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -1,18 +1,19 @@ #include "UIScene_DispenserMenu.h" #include - #include #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/TrapMenu.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index fff05fae7..76ca3f06f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -1,10 +1,25 @@ #include "UIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include + #include "minecraft/client/Minecraft.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" +#include "strings.h" + +class UILayer; UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h index 02a40092d..8ee0593d8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h @@ -1,13 +1,21 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class InventoryMenu; +class UILayer; class UIScene_EnchantingMenu : public UIScene_AbstractContainerMenu, public IUIScene_EnchantingMenu { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index d73f0dd10..95b4562ef 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -1,11 +1,21 @@ #include "UIScene_FireworksMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" +#include +#include + #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/inventory/FireworksMenu.h" +#include "strings.h" + +class UILayer; UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index 03e4a62e2..66f2b2d00 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -1,11 +1,19 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class InventoryMenu; +class UILayer; class UIScene_FireworksMenu : public UIScene_AbstractContainerMenu, public IUIScene_FireworksMenu { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index b4a383ea8..4e7516b3d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -1,11 +1,23 @@ #include "UIScene_FurnaceMenu.h" +#include + #include "4J_Profile.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/inventory/FurnaceMenu.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "strings.h" + +class UILayer; UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h index b1b9aa2fe..0d6c8f32e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h @@ -1,12 +1,21 @@ #pragma once +#include +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class InventoryMenu; +class FurnaceTileEntity; +class UILayer; class UIScene_FurnaceMenu : public UIScene_AbstractContainerMenu, public IUIScene_FurnaceMenu { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index a317f55be..7e238aa44 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -1,19 +1,20 @@ #include "UIScene_HopperMenu.h" #include - #include #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/HopperMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index 8e30c34da..10f426c8c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -1,14 +1,11 @@ #include "UIScene_HorseInventoryMenu.h" #include - #include #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" @@ -16,6 +13,12 @@ #include "minecraft/world/entity/animal/EntityHorse.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/HorseInventoryMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index 139eac4d6..37ecf2f4d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -1,20 +1,30 @@ #include "UIScene_InventoryMenu.h" +#include +#include +#include +#include + #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "console_helpers/StringHelpers.h" -#include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/Options.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/inventory/InventoryMenu.h" +#include "strings.h" + +class UILayer; #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10) #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index 248dfd01c..864fa4af0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -1,12 +1,20 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/effect/MobEffect.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class InventoryMenu; +class UILayer; class UIScene_InventoryMenu : public UIScene_AbstractContainerMenu, public IUIScene_InventoryMenu { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index f0d00cd01..f9fea16b8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -1,14 +1,32 @@ #include "UIScene_TradingMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include +#include + #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/util/HtmlString.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" +#include "strings.h" + +class UILayer; UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index b4480ae5d..93480bbe5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -1,12 +1,18 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" class InventoryMenu; +class UILayer; class UIScene_TradingMenu : public UIScene, public IUIScene_TradingMenu { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index ca11270be..17f7cb07e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -1,10 +1,31 @@ #include "UIScene_CraftingMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/CraftingMenu.h" +#include "minecraft/world/inventory/InventoryMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/Recipy.h" +#include "strings.h" + +class UILayer; UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index cad0dc6d2..e37c77f3b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -1,10 +1,20 @@ #pragma once +#include +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class AbstractContainerMenu; +class ItemInstance; +class UILayer; #define CRAFTING_INVENTORY_SLOT_START 0 #define CRAFTING_INVENTORY_SLOT_END (CRAFTING_INVENTORY_SLOT_START + 27) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 9ed421a71..24f28ee54 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -1,10 +1,26 @@ #include "UIScene_DeathMenu.h" +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Storage.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" + +class UILayer; UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index bd0206d71..f45b34884 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_DeathMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 699dae55e..f170bfd1e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -1,12 +1,28 @@ #include "UIScene_EndPoem.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/Common/src/UI/UIBitmapFont.h" +#include +#include +#include + #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "java/Random.h" +#include "minecraft/SharedConstants.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "strings.h" + +class UILayer; UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) : UIScene(iPad, parentLayer) { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index 41b587062..d6c3f6de0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -1,6 +1,14 @@ #pragma once +#include +#include + #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_EndPoem : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 724b9d64c..4efb5e9bc 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -1,12 +1,26 @@ #include "UIScene_InGameHostOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include + #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/network/net.minecraft.network.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" +#include "4J.Common/4J_InputActions.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "minecraft/world/entity/player/Player.h" +#include "strings.h" + +class UILayer; UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu( int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 0bd3eaae6..e04d2c46c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -1,8 +1,14 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_InGameHostOptionsMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 945f87c3e..edc0c7caa 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -1,11 +1,29 @@ #include "UIScene_InGameInfoMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" +#include + #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "minecraft/network/packet/KickPlayerPacket.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index a422f0a43..c27454102 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -1,12 +1,20 @@ #pragma once #include +#include +#include #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class INetworkPlayer; +class UILayer; class UIScene_InGameInfoMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 39b9a120c..604f16a54 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -1,11 +1,29 @@ #include "UIScene_InGamePlayerOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include + #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" +#include "4J.Common/4J_InputActions.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/network/packet/KickPlayerPacket.h" +#include "minecraft/network/packet/PlayerInfoPacket.h" +#include "minecraft/world/entity/player/Player.h" +#include "strings.h" + +class UILayer; #define CHECKBOXES_TIMER_ID 0 #define CHECKBOXES_TIMER_TIME 100 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index 027efff64..e4cf3b2b1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -1,12 +1,20 @@ #pragma once #include +#include #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class INetworkPlayer; +class UILayer; class UIScene_InGamePlayerOptionsMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 890e06e0d..2c1c6b878 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -1,15 +1,31 @@ #include "UIScene_PauseMenu.h" +#include +#include + #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "console_helpers/StringHelpers.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/skins/DLCTexturePack.h" -#include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" -#include "minecraft/server/MinecraftServer.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" + +class TexturePack; UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index 33547c380..6db366e3f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -1,8 +1,15 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; #define BUTTON_PAUSE_RESUMEGAME 0 #define BUTTON_PAUSE_HELPANDOPTIONS 1 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 179c80fa6..e0555638a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -2,14 +2,24 @@ #include "UIScene_SignEntryMenu.h" #include "4J_Input.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/network/packet/SignUpdatePacket.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "strings.h" UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index ac17aa8a6..460e79f39 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -1,11 +1,17 @@ #pragma once +#include +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class SignTileEntity; +class UILayer; class UIScene_SignEntryMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 6f263aae4..3794656d8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -1,11 +1,25 @@ #include "UIScene_TeleportMenu.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include + #include "minecraft/client/multiplayer/ClientConnection.h" -#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" #include "minecraft/server/commands/TeleportCommand.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/Minecraft.h" +#include "minecraft/network/packet/GameCommandPacket.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index 9a73c518e..7df137bcc 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -7,6 +7,12 @@ #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.Client/include/NetTypes.h" + +class INetworkPlayer; +class UILayer; class UIScene_TeleportMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp index 729c524c9..f201a116b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -1,8 +1,22 @@ #include "UIScene_ConnectingProgress.h" -#include "Minecraft.Client/Common/src/UI/UI.h" #include "minecraft/client/Minecraft.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "java/System.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "strings.h" UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void* _initData, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h index bd6a957a3..ac353f037 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h @@ -1,9 +1,16 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_ConnectingProgress : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index 3d32b85bc..c87266a3d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -1,9 +1,28 @@ #include "UIScene_FullscreenProgress.h" -#include "Minecraft.Client/Common/src/UI/UI.h" +#include +#include + #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "console_helpers/C4JThread.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "strings.h" UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h index 0570d7e09..4c96fecb9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h @@ -1,9 +1,18 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class C4JThread; +class UILayer; class UIScene_FullscreenProgress : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp index 0e6ddee68..742f8df64 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp @@ -1,8 +1,16 @@ #include "UIScene_Keyboard.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" #include "console_helpers/StringHelpers.h" +#include "4J.Common/4J_InputActions.h" +#include "Common/App_Defines.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" #define KEYBOARD_DONE_TIMER_ID 0 #define KEYBOARD_DONE_TIMER_TIME 100 diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h index 67994afa6..740091e2f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h @@ -1,9 +1,16 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_Keyboard : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp index c74afcf5c..0a93ee884 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp @@ -2,8 +2,16 @@ #include "UIScene_MessageBox.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h index 60211106f..70ec09e58 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h @@ -1,8 +1,16 @@ #pragma once +#include + #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" + +class UILayer; class UIScene_MessageBox : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp index 7cf044cde..51a30e80c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -1,9 +1,19 @@ #include "UIScene_QuadrantSignin.h" +#include + #include "4J_Input.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "minecraft/client/Minecraft.h" +#include "4J.Common/4J_Compat.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "strings.h" UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h index a72c8a242..316ec6b31 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h @@ -1,10 +1,17 @@ #pragma once #include +#include #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" + +class UILayer; class UIScene_QuadrantSignin : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp index e3efb201f..9833c7166 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp +++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp @@ -1,7 +1,7 @@ #include "UIScene_Timer.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h" #include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp b/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp index f5dab11dc..57c80364f 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp @@ -2,6 +2,8 @@ #include "Minecraft.Client/include/BufferedImage.h" #include "UIFontData.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" ///////////////////////////// // UI Abstract Bitmap Font // diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.cpp b/targets/Minecraft.Client/Common/src/UI/UIController.cpp index 9bacf5a9e..4ab06ff52 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIController.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIController.cpp @@ -1,22 +1,54 @@ #include "UIController.h" +#include +#include +#include +#include +#include +#include +#include +#include + #include "4J_Input.h" #include "Minecraft.Client/include/BufferedImage.h" -#include "UI.h" #include "UIFontData.h" -#include "UIScene.h" #include "console_helpers/PerformanceTimer.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/client/renderer/entity/EnderDragonRenderer.h" #include "minecraft/client/skins/DLCTexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" -#include "minecraft/client/title/TitleScreen.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "4J_Profile.h" +#include "Common/App_enums.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h" +#include "Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h" +#include "Minecraft.Client/Common/src/UI/UIBitmapFont.h" +#include "Minecraft.Client/Common/src/UI/UIGroup.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UITTFFont.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "XboxStubs.h" +#include "console_helpers/C4JThread.h" +#include "gl3_loader.h" +#include "java/System.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/skins/TexturePack.h" +#include "strings.h" + +class Tutorial; // 4J Stu - Enable this to override the Iggy Allocator // #define ENABLE_IGGY_ALLOCATOR @@ -176,10 +208,6 @@ UIController::UIController() { // updateCurrentLanguage is going to be called. m_eCurrentFont = m_eTargetFont = eFont_NotLoaded; -#if defined(ENABLE_IGGY_ALLOCATOR) - // std::mutex is default-constructed, no initialization needed -#endif - // 4J Stu - This is a bit of a hack until we change the Minecraft // initialisation to store the proper screen size for other platforms #if defined(_WINDOWS64) || defined(__linux__) diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.h b/targets/Minecraft.Client/Common/src/UI/UIController.h index 8ccdeab1c..505dd0510 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIController.h +++ b/targets/Minecraft.Client/Common/src/UI/UIController.h @@ -1,7 +1,12 @@ #pragma once +#include // using namespace std; #include #include +#include +#include +#include +#include #ifdef __linux__ #include "Minecraft.Client/Linux/Iggy/include/iggy.h" @@ -17,12 +22,19 @@ #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "UIGroup.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Render.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "minecraft/sounds/SoundTypes.h" class UIAbstractBitmapFont; class UIBitmapFont; class UITTFFont; class UIComponent_DebugUIConsole; class UIComponent_DebugUIMarketingGuide; +class C4JThread; +class Tutorial; +class UIScene; // Base class for all shared functions between UIControllers class UIController : public IUIController { diff --git a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp b/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp index 39cf0ba65..b0d5575d5 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp @@ -4,11 +4,13 @@ #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "minecraft/client/MemoryTracker.h" #include "minecraft/client/Minecraft.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UIScene; diff --git a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp b/targets/Minecraft.Client/Common/src/UI/UILayer.cpp index 702c8ffe3..5ae941a6b 100644 --- a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UILayer.cpp @@ -76,10 +76,9 @@ #include "Minecraft.Client/Common/src/UI/UIGroup.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" -#include "UIScene.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UILayer::UILayer(UIGroup* parent) { m_parentGroup = parent; diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp b/targets/Minecraft.Client/Common/src/UI/UIScene.cpp index d4e63f848..2058cb4d7 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIScene.cpp @@ -1,13 +1,10 @@ #include "UIScene.h" -#include - #include #include #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" @@ -17,9 +14,6 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" #include "java/System.h" #include "minecraft/client/Lighting.h" @@ -28,6 +22,12 @@ #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/item/ItemInstance.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "gl3_loader.h" class MultiplayerLocalPlayer; diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.h b/targets/Minecraft.Client/Common/src/UI/UIScene.h index 9add45b86..5b6df53ba 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIScene.h +++ b/targets/Minecraft.Client/Common/src/UI/UIScene.h @@ -6,7 +6,6 @@ // different sized movies) #include - #include #include #include diff --git a/targets/Minecraft.Client/Common/src/UI/UIString.cpp b/targets/Minecraft.Client/Common/src/UI/UIString.cpp index d1ee7ea71..5168ac18c 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIString.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UIString.cpp @@ -1,8 +1,6 @@ #include "UIString.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp b/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp index 4748fe202..e086596cf 100644 --- a/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp +++ b/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp @@ -1,13 +1,13 @@ #include "UITTFFont.h" #include - #include #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/StringHelpers.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" UITTFFont::UITTFFont(const std::string& name, const std::string& path, S32 fallbackCharacter) diff --git a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c b/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c index 2788af8f1..6f20abaa0 100644 --- a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c +++ b/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c @@ -10,9 +10,9 @@ #include #include +#include "SDL_video.h" #include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "SDL_video.h" #ifndef _ENABLEIGGY void* IggyGDrawMallocAnnotated(SINTa size, const char* file, int line) { diff --git a/targets/Minecraft.Client/Linux/LinuxGL.cpp b/targets/Minecraft.Client/Linux/LinuxGL.cpp index f6e7f18d7..05cf91513 100644 --- a/targets/Minecraft.Client/Linux/LinuxGL.cpp +++ b/targets/Minecraft.Client/Linux/LinuxGL.cpp @@ -1,12 +1,11 @@ #ifdef __linux__ -#include - #include "4J.Render/4J_Render.h" #include "Minecraft.Client/include/stubs.h" #include "java/ByteBuffer.h" #include "java/FloatBuffer.h" #include "java/IntBuffer.h" +#include "gl3_loader.h" extern C4JRender RenderManager; @@ -107,9 +106,6 @@ void glVertexPointer_4J(int, int, FloatBuffer*) {} void glEndList_4J(int) {} void glTexGen_4J(int, int, FloatBuffer*) {} -// query objects -#include -#include #include #include #include diff --git a/targets/Minecraft.Client/Linux/Linux_App.cpp b/targets/Minecraft.Client/Linux/Linux_App.cpp index 9e637978f..aec82df58 100644 --- a/targets/Minecraft.Client/Linux/Linux_App.cpp +++ b/targets/Minecraft.Client/Linux/Linux_App.cpp @@ -1,7 +1,6 @@ #include "Linux_App.h" #include - #include #include "4J.Render/4J_Render.h" @@ -10,12 +9,12 @@ #include "Minecraft.Client/Common/Consoles_App.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Linux/Linux_App.h" #include "console_helpers/C4JThread.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/User.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/LevelSettings.h" +#include "Common/App_enums.h" CConsoleMinecraftApp app; diff --git a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp b/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp index e3fa9f013..2d500f628 100644 --- a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -1,15 +1,14 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include -#include -#include "Minecraft.Client/include/stdafx.h" // #include +#include + #if defined(__linux__) && defined(__GLIBC__) #include -#include #include + static void sigsegv_handler(int sig) { const char msg[] = "\n=== SIGNAL CAUGHT: "; write(STDERR_FILENO, msg, sizeof(msg) - 1); @@ -38,24 +37,15 @@ static void sigsegv_handler(int sig) { _exit(139); } #endif -#include "Minecraft.Client/Common/src/Network/Socket.h" -#include "console_helpers/StringHelpers.h" -#include "console_helpers/ThreadName.h" -#include "minecraft/client/User.h" -#include "minecraft/client/multiplayer/ClientConnection.h" -#include "minecraft/client/multiplayer/ConnectScreen.h" -#include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/locale/Language.h" -#include "minecraft/server/MinecraftServer.h" +#include +#include +#include +#include +#include +#include + #include "minecraft/stats/StatsCounter.h" -#include "minecraft/world/item/ItemInstance.h" -#include "minecraft/world/item/MapItem.h" -#include "minecraft/world/item/crafting/Recipes.h" -#include "minecraft/world/item/crafting/Recipy.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/AABB.h" -#include "minecraft/world/phys/Vec3.h" // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" @@ -65,10 +55,18 @@ static void sigsegv_handler(int sig) { #include "Minecraft.Client/Common/App_Defines.h" #include "console_helpers/compression.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/Options.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Render.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/world/level/tile/Tile.h" +#include "strings.h" // #include "../Orbis/Leaderboards/OrbisLeaderboardManager.h" diff --git a/targets/Minecraft.Client/Linux/Linux_UIController.cpp b/targets/Minecraft.Client/Linux/Linux_UIController.cpp index d3fec495d..602b611e5 100644 --- a/targets/Minecraft.Client/Linux/Linux_UIController.cpp +++ b/targets/Minecraft.Client/Linux/Linux_UIController.cpp @@ -5,7 +5,10 @@ #include "Linux_UIController.h" #include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h" ConsoleUIController ui; diff --git a/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h b/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h index 7ed6b6980..ccdc08439 100644 --- a/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h +++ b/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h @@ -14,6 +14,9 @@ #include #include #include +#include +#include +#include #define __cdecl #define _vsnprintf_s vsnprintf; diff --git a/targets/Minecraft.Client/Linux/linux_game_stubs.cpp b/targets/Minecraft.Client/Linux/linux_game_stubs.cpp index f2b50084b..07c6e875f 100644 --- a/targets/Minecraft.Client/Linux/linux_game_stubs.cpp +++ b/targets/Minecraft.Client/Linux/linux_game_stubs.cpp @@ -7,8 +7,4 @@ void Display::update() {} int CMinecraftApp::GetTPConfigVal(wchar_t* pwchDataFile) { return 0; } -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" - #endif diff --git a/targets/Minecraft.Client/include/stubs.h b/targets/Minecraft.Client/include/stubs.h index 63fd7e778..68788082c 100644 --- a/targets/Minecraft.Client/include/stubs.h +++ b/targets/Minecraft.Client/include/stubs.h @@ -1,5 +1,6 @@ #pragma once +#include #ifdef __linux__ #include #include @@ -201,6 +202,7 @@ class Textures; class Font; class MapItemSavedData; class Mob; + class Particles { public: void render(float) {} diff --git a/targets/Minecraft.Client/src/BufferedImage.cpp b/targets/Minecraft.Client/src/BufferedImage.cpp index 33cce872f..fba208873 100644 --- a/targets/Minecraft.Client/src/BufferedImage.cpp +++ b/targets/Minecraft.Client/src/BufferedImage.cpp @@ -1,8 +1,8 @@ #include "Minecraft.Client/include/BufferedImage.h" +#include #include #include -#include #include #include @@ -14,6 +14,7 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/PathHelper.h" #include "console_helpers/StringHelpers.h" +#include "PlatformTypes.h" BufferedImage::BufferedImage(int width, int height, int type) { data[0] = new int[width * height]; diff --git a/targets/Minecraft.Client/src/Extrax64Stubs.cpp b/targets/Minecraft.Client/src/Extrax64Stubs.cpp index e8d85fd58..3501fb055 100644 --- a/targets/Minecraft.Client/src/Extrax64Stubs.cpp +++ b/targets/Minecraft.Client/src/Extrax64Stubs.cpp @@ -1,10 +1,8 @@ -#include #include #include #include -#include #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" diff --git a/targets/console_helpers/src/C4JThread.cpp b/targets/console_helpers/src/C4JThread.cpp index 36150a756..3402010e7 100644 --- a/targets/console_helpers/src/C4JThread.cpp +++ b/targets/console_helpers/src/C4JThread.cpp @@ -1,5 +1,4 @@ #include - #include #include #include @@ -23,7 +22,6 @@ #if defined(__linux__) #include -#include #include #include #include @@ -33,6 +31,8 @@ #include "Minecraft.Client/Common/ShutdownManager.h" #include "console_helpers/C4JThread.h" +class Level; + thread_local C4JThread* C4JThread::ms_currentThread = nullptr; namespace { diff --git a/targets/console_helpers/src/PerformanceTimer.cpp b/targets/console_helpers/src/PerformanceTimer.cpp index f1fe1c32a..827fe2fcf 100644 --- a/targets/console_helpers/src/PerformanceTimer.cpp +++ b/targets/console_helpers/src/PerformanceTimer.cpp @@ -1,6 +1,7 @@ #include "console_helpers/PerformanceTimer.h" +#include #include #include diff --git a/targets/console_helpers/src/StringHelpers.cpp b/targets/console_helpers/src/StringHelpers.cpp index 7ebfc1ac8..03ff17910 100644 --- a/targets/console_helpers/src/StringHelpers.cpp +++ b/targets/console_helpers/src/StringHelpers.cpp @@ -1,7 +1,10 @@ +#include #include #include #include #include +#include +#include #include "simdutf.h" diff --git a/targets/console_helpers/src/compression.cpp b/targets/console_helpers/src/compression.cpp index 0b7f7b2e8..2e49f7300 100644 --- a/targets/console_helpers/src/compression.cpp +++ b/targets/console_helpers/src/compression.cpp @@ -1,13 +1,9 @@ #include #include #include - #include #include -// #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/compression.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" diff --git a/targets/java/include/java/InputOutputStream/BufferedOutputStream.h b/targets/java/include/java/InputOutputStream/BufferedOutputStream.h index 289b019b2..8b2c792e8 100644 --- a/targets/java/include/java/InputOutputStream/BufferedOutputStream.h +++ b/targets/java/include/java/InputOutputStream/BufferedOutputStream.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include diff --git a/targets/java/include/java/InputOutputStream/DataInputStream.h b/targets/java/include/java/InputOutputStream/DataInputStream.h index 3bc5f12b0..bb9b9e268 100644 --- a/targets/java/include/java/InputOutputStream/DataInputStream.h +++ b/targets/java/include/java/InputOutputStream/DataInputStream.h @@ -4,6 +4,7 @@ #include #include +#include #include "DataInput.h" #include "InputStream.h" diff --git a/targets/java/include/java/InputOutputStream/DataOutputStream.h b/targets/java/include/java/InputOutputStream/DataOutputStream.h index 730ea6005..c8c16b4a2 100644 --- a/targets/java/include/java/InputOutputStream/DataOutputStream.h +++ b/targets/java/include/java/InputOutputStream/DataOutputStream.h @@ -2,6 +2,7 @@ // 4J Stu - Represents Java standard library class (although we miss out an // intermediate inheritance class that we don't care about) +#include #include #include "DataOutput.h" diff --git a/targets/java/include/java/InputOutputStream/FileOutputStream.h b/targets/java/include/java/InputOutputStream/FileOutputStream.h index 40f438587..a8ac8ac2f 100644 --- a/targets/java/include/java/InputOutputStream/FileOutputStream.h +++ b/targets/java/include/java/InputOutputStream/FileOutputStream.h @@ -1,6 +1,7 @@ #pragma once // 4J Stu - Represents Java standard lib abstract +#include #include #include "OutputStream.h" diff --git a/targets/java/include/java/InputOutputStream/InputStreamReader.h b/targets/java/include/java/InputOutputStream/InputStreamReader.h index 883bf68f9..4e22028cb 100644 --- a/targets/java/include/java/InputOutputStream/InputStreamReader.h +++ b/targets/java/include/java/InputOutputStream/InputStreamReader.h @@ -4,6 +4,7 @@ #include "Reader.h" class InputStream; +class DataInputStream; class InputStreamReader : public Reader { private: diff --git a/targets/java/include/java/JavaMath.h b/targets/java/include/java/JavaMath.h index b16044d04..a7b43535d 100644 --- a/targets/java/include/java/JavaMath.h +++ b/targets/java/include/java/JavaMath.h @@ -1,6 +1,10 @@ #pragma once +#include + #include "Random.h" +class Random; + class Math { private: static Random rand; diff --git a/targets/java/src/ByteBuffer.cpp b/targets/java/src/ByteBuffer.cpp index c269c35e0..d2b5c7a26 100644 --- a/targets/java/src/ByteBuffer.cpp +++ b/targets/java/src/ByteBuffer.cpp @@ -2,9 +2,7 @@ #include "java/ByteBuffer.h" #include -#include #include - #include #include diff --git a/targets/java/src/File.cpp b/targets/java/src/File.cpp index 85d77f291..bf5954988 100644 --- a/targets/java/src/File.cpp +++ b/targets/java/src/File.cpp @@ -1,9 +1,6 @@ #include "java/File.h" -#include #include -#include - #include #include #include diff --git a/targets/java/src/InputOutputStream/BufferedReader.cpp b/targets/java/src/InputOutputStream/BufferedReader.cpp index 7e1b61dd1..ed5583974 100644 --- a/targets/java/src/InputOutputStream/BufferedReader.cpp +++ b/targets/java/src/InputOutputStream/BufferedReader.cpp @@ -2,6 +2,9 @@ #include #include +#include + +#include "java/InputOutputStream/Reader.h" // Creates a buffering character-input stream that uses a default-sized input // buffer. Parameters: in - A Reader diff --git a/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp b/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp index e48294500..34d484ca5 100644 --- a/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp +++ b/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp @@ -7,8 +7,6 @@ // length - the maximum number of bytes to read from the buffer. #include "java/InputOutputStream/ByteArrayInputStream.h" -#include - #include #include #include diff --git a/targets/java/src/InputOutputStream/DataOutputStream.cpp b/targets/java/src/InputOutputStream/DataOutputStream.cpp index 660904258..8232fe662 100644 --- a/targets/java/src/InputOutputStream/DataOutputStream.cpp +++ b/targets/java/src/InputOutputStream/DataOutputStream.cpp @@ -1,9 +1,7 @@ #include "java/InputOutputStream/DataOutputStream.h" #include - #include -#include #include #include diff --git a/targets/java/src/InputOutputStream/FileOutputStream.cpp b/targets/java/src/InputOutputStream/FileOutputStream.cpp index 99c3838f1..79ea8633e 100644 --- a/targets/java/src/InputOutputStream/FileOutputStream.cpp +++ b/targets/java/src/InputOutputStream/FileOutputStream.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "console_helpers/StringHelpers.h" // 4jcraft TODO #include "java/File.h" diff --git a/targets/java/src/JavaMath.cpp b/targets/java/src/JavaMath.cpp index a9a2e6ef0..e79925fc6 100644 --- a/targets/java/src/JavaMath.cpp +++ b/targets/java/src/JavaMath.cpp @@ -3,6 +3,8 @@ #include #include +#include "java/Random.h" + Random Math::rand = Random(); // Returns a double value with a positive sign, greater than or equal to 0.0 and diff --git a/targets/java/src/system.cpp b/targets/java/src/system.cpp index f71bb6433..5df2c4c69 100644 --- a/targets/java/src/system.cpp +++ b/targets/java/src/system.cpp @@ -1,12 +1,12 @@ -#include "java/System.h" - #include #include #include - #include #include #include +#include + +#include "java/System.h" class Biome; class Node; diff --git a/targets/minecraft/Pos.cpp b/targets/minecraft/Pos.cpp index ab4c224c8..c9c008768 100644 --- a/targets/minecraft/Pos.cpp +++ b/targets/minecraft/Pos.cpp @@ -4,8 +4,6 @@ #include -#include "minecraft/Pos.h" - Pos::Pos() { x = y = z = 0; } Pos::Pos(int x, int y, int z) { diff --git a/targets/minecraft/SharedConstants.cpp b/targets/minecraft/SharedConstants.cpp index 54d8f8315..b726e67f8 100644 --- a/targets/minecraft/SharedConstants.cpp +++ b/targets/minecraft/SharedConstants.cpp @@ -3,8 +3,6 @@ #include -#include "minecraft/SharedConstants.h" - const std::wstring SharedConstants::VERSION_STRING = L"1.6.4"; const bool SharedConstants::TEXTURE_LIGHTING = true; diff --git a/targets/minecraft/client/Camera.cpp b/targets/minecraft/client/Camera.cpp index 8c140f387..3c921934b 100644 --- a/targets/minecraft/client/Camera.cpp +++ b/targets/minecraft/client/Camera.cpp @@ -3,11 +3,9 @@ #include #include #include - #include #include "MemoryTracker.h" -#include "Minecraft.Client/Linux/Stubs/d3d11_stubs.h" #include "Minecraft.Client/include/stubs.h" #include "java/FloatBuffer.h" #include "minecraft/world/entity/LivingEntity.h" @@ -18,6 +16,7 @@ #include "minecraft/world/level/tile/LiquidTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/Vec3.h" +#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h" float Camera::xPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f; diff --git a/targets/minecraft/client/ClientConstants.cpp b/targets/minecraft/client/ClientConstants.cpp index 0b8f4cfe4..c6adaab1c 100644 --- a/targets/minecraft/client/ClientConstants.cpp +++ b/targets/minecraft/client/ClientConstants.cpp @@ -1,7 +1,6 @@ #include "ClientConstants.h" #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" -#include "minecraft/client/ClientConstants.h" const std::wstring ClientConstants::VERSION_STRING = std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W + diff --git a/targets/minecraft/client/GuiMessage.cpp b/targets/minecraft/client/GuiMessage.cpp index 802dd7b4d..f86bc15c0 100644 --- a/targets/minecraft/client/GuiMessage.cpp +++ b/targets/minecraft/client/GuiMessage.cpp @@ -1,7 +1,5 @@ #include "GuiMessage.h" -#include "minecraft/client/GuiMessage.h" - GuiMessage::GuiMessage(const std::wstring& string) { this->string = string; ticks = 0; diff --git a/targets/minecraft/client/MemoryTracker.cpp b/targets/minecraft/client/MemoryTracker.cpp index e5592886f..eb235cf3c 100644 --- a/targets/minecraft/client/MemoryTracker.cpp +++ b/targets/minecraft/client/MemoryTracker.cpp @@ -5,7 +5,6 @@ #include "4J.Render/4J_Render.h" #include "java/ByteBuffer.h" -#include "minecraft/client/MemoryTracker.h" std::unordered_map MemoryTracker::GL_LIST_IDS; std::vector MemoryTracker::TEXTURE_IDS; diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index d807d5a6e..cea6e36ef 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -1,22 +1,22 @@ #include "Minecraft.h" +#include +#include #include #include #include +#include +#include +#include -#include "DemoUser.h" -#include "Minecraft.Client/include/stdafx.h" #include "Options.h" #include "ProgressRenderer.h" #include "Timer.h" #include "User.h" #include "minecraft/client/gui/DeathScreen.h" #include "minecraft/client/gui/ErrorScreen.h" -#include "minecraft/client/gui/PauseScreen.h" #include "minecraft/client/gui/Screen.h" -#include "minecraft/client/gui/inventory/InventoryScreen.h" #include "minecraft/client/gui/particle/GuiParticles.h" -#include "minecraft/client/level/DemoLevel.h" #include "minecraft/client/model/HumanoidModel.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" @@ -29,26 +29,87 @@ #include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/client/title/TitleScreen.h" -#include "minecraft/server/level/CreativeMode.h" -#include "minecraft/server/level/GameMode.h" -#include "minecraft/server/level/SurvivalMode.h" #include "minecraft/stats/StatsCounter.h" +#include "4J.Common/4J_InputActions.h" +#include "4J_Profile.h" +#include "4J_Render.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Pos.h" +#include "SharedConstants.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/client/renderer/ItemInHandRenderer.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/renderer/TileRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/skins/TexturePack.h" +#include "console_helpers/Definitions.h" +#include "console_helpers/compression.h" +#include "gl3_loader.h" +#include "java/Class.h" +#include "java/Random.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/stats/Stats.h" +#include "strings.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/entity/animal/Pig.h" +#include "minecraft/world/entity/animal/Sheep.h" +#include "minecraft/world/entity/animal/Wolf.h" +#include "minecraft/world/entity/monster/Spider.h" +#include "minecraft/world/entity/monster/Zombie.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/FoodItem.h" +#include "minecraft/world/item/GoldenAppleItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/LeashItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/CompressedTileStorage.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelStorageSource.h" +#include "minecraft/world/level/storage/McRegionLevelStorageSource.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/HitResult.h" #if defined(ENABLE_JAVA_GUIS) #include "minecraft/client/gui/inventory/CreativeInventoryScreen.h" #endif #include "4J_Input.h" -#include "Camera.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Common/src/UI/UIFontData.h" #include "Minecraft.Client/include/stubs.h" #include "console_helpers/StringHelpers.h" -#include "java/ByteBuffer.h" #include "java/File.h" #include "java/System.h" #include "minecraft/StaticConstructors.h" @@ -61,32 +122,14 @@ #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/player/Input.h" -#include "minecraft/client/renderer/culling/FrustumCuller.h" #include "minecraft/client/renderer/texture/TextureManager.h" #include "minecraft/client/skins/DLCTexturePack.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/Difficulty.h" -#include "minecraft/world/effect/MobEffect.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" #include "minecraft/world/entity/npc/Villager.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "minecraft/world/item/alchemy/PotionMacros.h" -#include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/world/level/chunk/SparseDataStorage.h" #include "minecraft/world/level/chunk/SparseLightStorage.h" -#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "minecraft/world/level/levelgen/HellRandomLevelSource.h" -#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "minecraft/world/level/tile/entity/ChestTileEntity.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" + +class ChunkSource; // #define DISABLE_SPU_CODE // 4J Turning this on will change the graph at the bottom of the debug overlay diff --git a/targets/minecraft/client/Minecraft.h b/targets/minecraft/client/Minecraft.h index 6c383f465..0c4f7b08b 100644 --- a/targets/minecraft/client/Minecraft.h +++ b/targets/minecraft/client/Minecraft.h @@ -1,5 +1,15 @@ #pragma once +#include #include +#include +#include +#include + +#include "4J.Common/4J_Compat.h" +#include "console_helpers/C4JThread.h" +#include "java/File.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/network/packet/DisconnectPacket.h" class Timer; class MultiPlayerLevel; @@ -39,12 +49,8 @@ class LevelSettings; class ColourTable; class MultiPlayerGameMode; class LivingEntity; - -#include "4J.Common/4J_Compat.h" -#include "console_helpers/C4JThread.h" -#include "java/File.h" -#include "minecraft/client/resources/ResourceLocation.h" -#include "minecraft/network/packet/DisconnectPacket.h" +class Level; +class ResourceLocation; #if defined(linux) #undef linux diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp index 7d8852b79..595307ef7 100644 --- a/targets/minecraft/client/gui/ChatScreen.cpp +++ b/targets/minecraft/client/gui/ChatScreen.cpp @@ -7,8 +7,8 @@ #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" -#include "minecraft/client/gui/Screen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/gui/Screen.h" const std::wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; diff --git a/targets/minecraft/client/gui/ConfirmScreen.cpp b/targets/minecraft/client/gui/ConfirmScreen.cpp index 184efc3e3..b9c67b929 100644 --- a/targets/minecraft/client/gui/ConfirmScreen.cpp +++ b/targets/minecraft/client/gui/ConfirmScreen.cpp @@ -3,9 +3,9 @@ #include #include "SmallButton.h" +#include "minecraft/locale/Language.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Screen.h" -#include "minecraft/locale/Language.h" ConfirmScreen::ConfirmScreen(Screen* parent, const std::wstring& title1, const std::wstring& title2, int id) { diff --git a/targets/minecraft/client/gui/ControlsScreen.cpp b/targets/minecraft/client/gui/ControlsScreen.cpp index 19439f026..ec7c93fb1 100644 --- a/targets/minecraft/client/gui/ControlsScreen.cpp +++ b/targets/minecraft/client/gui/ControlsScreen.cpp @@ -5,9 +5,9 @@ #include "SmallButton.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" +#include "minecraft/locale/Language.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Screen.h" -#include "minecraft/locale/Language.h" ControlsScreen::ControlsScreen(Screen* lastScreen, Options* options) { // 4J - added initialisers diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index 081eeb329..337829ffa 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -2,7 +2,6 @@ #include #include - #include #include @@ -17,18 +16,16 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" -#include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/world/level/LevelSettings.h" #include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/client/gui/Screen.h" CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) { done = false; // 4J added diff --git a/targets/minecraft/client/gui/DeathScreen.cpp b/targets/minecraft/client/gui/DeathScreen.cpp index 41dbb031e..0b1bcdc62 100644 --- a/targets/minecraft/client/gui/DeathScreen.cpp +++ b/targets/minecraft/client/gui/DeathScreen.cpp @@ -9,8 +9,8 @@ #include "PauseScreen.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/gui/Screen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/gui/Screen.h" void DeathScreen::init() { buttons.clear(); diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp index fdc2a6864..3ce4f76b5 100644 --- a/targets/minecraft/client/gui/Font.cpp +++ b/targets/minecraft/client/gui/Font.cpp @@ -1,7 +1,6 @@ #include "Font.h" #include - #include #include @@ -11,7 +10,6 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Options.h" -#include "minecraft/client/gui/Font.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index d54ee8550..f48323ea2 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -1,11 +1,10 @@ #include "Gui.h" +#include + #include "4J.Common/4J_Compat.h" -#include "4J.Input/4J_Input.h" -#include "ChatScreen.h" +#include "4J_Input.h" #include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/include/stubs.h" -#include "console_helpers/StringHelpers.h" #include "java/JavaMath.h" #include "java/System.h" #include "minecraft/client/ClientConstants.h" @@ -17,30 +16,46 @@ #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/client/renderer/GameRenderer.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/EnderDragonRenderer.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "minecraft/client/renderer/entity/ItemRenderer.h" -#include "minecraft/client/renderer/texture/TextureAtlas.h" -#include "minecraft/locale/Language.h" #include "minecraft/net.minecraft.h" -#include "minecraft/server/level/GameMode.h" -#include "minecraft/util/Mth.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "minecraft/world/food/net.minecraft.world.food.h" #include "minecraft/world/item/net.minecraft.world.item.h" #include "minecraft/world/level/biome/Biome.h" -#include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/dimension/Dimension.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/world/net.minecraft.world.h" +#include "4J_Render.h" +#include "Facing.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/App_structs.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "minecraft/client/GuiMessage.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/ChatScreen.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "gl3_loader.h" +#include "java/Random.h" +#include "strings.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/PortalTile.h" +#include "minecraft/client/renderer/texture/TextureAtlas.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/util/Mth.h" +#include "minecraft/client/renderer/GameRenderer.h" +#include "console_helpers/StringHelpers.h" ResourceLocation Gui::PUMPKIN_BLUR_LOCATION = ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR); diff --git a/targets/minecraft/client/gui/Gui.h b/targets/minecraft/client/gui/Gui.h index d7aacd312..21777afce 100644 --- a/targets/minecraft/client/gui/Gui.h +++ b/targets/minecraft/client/gui/Gui.h @@ -1,5 +1,9 @@ #pragma once +#include #include +#include +#include +#include #include "4J.Common/4J_Compat.h" #include "GuiComponent.h" @@ -8,6 +12,9 @@ class Random; class Minecraft; +class ItemInstance; +class ItemRenderer; +class ResourceLocation; class Gui : public GuiComponent { private: diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp index 0c9b69bee..451b1173d 100644 --- a/targets/minecraft/client/gui/InBedChatScreen.cpp +++ b/targets/minecraft/client/gui/InBedChatScreen.cpp @@ -8,9 +8,9 @@ #include "Minecraft.Client/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/gui/ChatScreen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/locale/Language.h" +#include "minecraft/client/gui/ChatScreen.h" void InBedChatScreen::init() { Keyboard::enableRepeatEvents(true); diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp index abb5c3833..071c2fba7 100644 --- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -8,8 +8,8 @@ #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" -#include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" +#include "minecraft/client/gui/Screen.h" JoinMultiplayerScreen::JoinMultiplayerScreen(Screen* lastScreen) { ipEdit = nullptr; diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp index c89d25c81..a109debed 100644 --- a/targets/minecraft/client/gui/Minimap.cpp +++ b/targets/minecraft/client/gui/Minimap.cpp @@ -3,14 +3,13 @@ #include #include #include - +#include #include #include "4J.Render/4J_Render.h" #include "Font.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/BufferedImage.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/minecraft/client/gui/OptionsScreen.cpp b/targets/minecraft/client/gui/OptionsScreen.cpp index 9aa855932..f14ac6b97 100644 --- a/targets/minecraft/client/gui/OptionsScreen.cpp +++ b/targets/minecraft/client/gui/OptionsScreen.cpp @@ -8,9 +8,9 @@ #include "VideoSettingsScreen.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" +#include "minecraft/locale/Language.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Screen.h" -#include "minecraft/locale/Language.h" OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) { title = L"Options"; // 4J added diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp index ca6a1d333..bed9599b6 100644 --- a/targets/minecraft/client/gui/PauseScreen.cpp +++ b/targets/minecraft/client/gui/PauseScreen.cpp @@ -1,14 +1,12 @@ #include "PauseScreen.h" #include - #include #include #include #include #include "4J_Input.h" -#include "4J_Profile.h" #include "Button.h" #include "MessageScreen.h" #include "Minecraft.Client/Common/App_enums.h" @@ -16,10 +14,10 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "OptionsScreen.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/gui/Screen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/locale/I18n.h" #include "minecraft/server/MinecraftServer.h" +#include "minecraft/client/gui/Screen.h" PauseScreen::PauseScreen() { saveStep = 0; diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp index a7de15bb0..339d480d2 100644 --- a/targets/minecraft/client/gui/RenameWorldScreen.cpp +++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp @@ -7,9 +7,9 @@ #include "Minecraft.Client/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" #include "minecraft/world/level/storage/LevelStorageSource.h" +#include "minecraft/client/gui/Screen.h" RenameWorldScreen::RenameWorldScreen(Screen* lastScreen, const std::wstring& levelId) { diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 6cc6c9d91..b9e537682 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -1,15 +1,14 @@ #include "Screen.h" #include "4J.Common/4J_InputActions.h" -#include "4J_Input.h" #include "4J_Profile.h" +#include "4J_Input.h" #include "Button.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/stubs.h" -#include "ScreenSizeCalculator.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/particle/GuiParticles.h" diff --git a/targets/minecraft/client/gui/ScreenSizeCalculator.cpp b/targets/minecraft/client/gui/ScreenSizeCalculator.cpp index d782e5d8e..fab982c83 100644 --- a/targets/minecraft/client/gui/ScreenSizeCalculator.cpp +++ b/targets/minecraft/client/gui/ScreenSizeCalculator.cpp @@ -3,7 +3,6 @@ #include #include "minecraft/client/Options.h" -#include "minecraft/client/gui/ScreenSizeCalculator.h" // who the fuck thought this was a good idea ScreenSizeCalculator::ScreenSizeCalculator(Options* options, int width, diff --git a/targets/minecraft/client/gui/ScrolledSelectionList.h b/targets/minecraft/client/gui/ScrolledSelectionList.h index eac363691..8c9e2d057 100644 --- a/targets/minecraft/client/gui/ScrolledSelectionList.h +++ b/targets/minecraft/client/gui/ScrolledSelectionList.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/client/gui/SelectWorldScreen.cpp b/targets/minecraft/client/gui/SelectWorldScreen.cpp index 0a4e77d38..7ab59b36e 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.cpp +++ b/targets/minecraft/client/gui/SelectWorldScreen.cpp @@ -2,10 +2,8 @@ #include #include - #include -#include "4J_Profile.h" #include "Button.h" #include "ConfirmScreen.h" #include "CreateWorldScreen.h" @@ -14,11 +12,11 @@ #include "RenameWorldScreen.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/gui/Screen.h" -#include "minecraft/client/gui/ScrolledSelectionList.h" #include "minecraft/locale/Language.h" #include "minecraft/world/level/storage/LevelStorageSource.h" #include "minecraft/world/level/storage/LevelSummary.h" +#include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/ScrolledSelectionList.h" SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) { // 4J - added initialisers diff --git a/targets/minecraft/client/gui/SelectWorldScreen.h b/targets/minecraft/client/gui/SelectWorldScreen.h index 67df168ff..cb28d7c06 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.h +++ b/targets/minecraft/client/gui/SelectWorldScreen.h @@ -1,6 +1,7 @@ #pragma once #include #include +#include #include "Screen.h" #include "ScrolledSelectionList.h" diff --git a/targets/minecraft/client/gui/TradeSwitchButton.cpp b/targets/minecraft/client/gui/TradeSwitchButton.cpp index d34308263..4c373d69b 100644 --- a/targets/minecraft/client/gui/TradeSwitchButton.cpp +++ b/targets/minecraft/client/gui/TradeSwitchButton.cpp @@ -2,11 +2,11 @@ #include -#include "4J.Render/4J_Render.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/gui/Button.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/VideoSettingsScreen.cpp b/targets/minecraft/client/gui/VideoSettingsScreen.cpp index 864c0a742..fdcb99d4d 100644 --- a/targets/minecraft/client/gui/VideoSettingsScreen.cpp +++ b/targets/minecraft/client/gui/VideoSettingsScreen.cpp @@ -6,9 +6,9 @@ #include "SmallButton.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" +#include "minecraft/locale/Language.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Screen.h" -#include "minecraft/locale/Language.h" // 4jcraft #define ITEM_COUNT 10 diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp index ebfd100c5..d824f7095 100644 --- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -1,7 +1,6 @@ #include "AchievementScreen.h" #include - #include #include @@ -16,6 +15,7 @@ #include "minecraft/client/gui/SmallButton.h" #include "minecraft/locale/I18n.h" #include "minecraft/stats/Achievement.h" +#include "minecraft/stats/Achievements.h" AchievementScreen::AchievementScreen(StatsCounter* statsCounter) { // 4J - added initialisers diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h index 4a4c4dace..5f4e1cb30 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h @@ -2,6 +2,7 @@ #include #include #include +#include #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp index 9071fc97e..6ce073b69 100644 --- a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp @@ -3,8 +3,8 @@ #include #include "BeaconScreen.h" -#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/locale/Language.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp index a3cbf95ba..523a8ec35 100644 --- a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp @@ -3,8 +3,8 @@ #include #include "BeaconScreen.h" -#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/locale/Language.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp index 3c830755a..8b44e45c2 100644 --- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -4,8 +4,8 @@ #include "BeaconScreen.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/world/effect/MobEffect.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) #ifdef ENABLE_JAVA_GUIS diff --git a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp index a02f576ef..71f826521 100644 --- a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -1,7 +1,6 @@ #include "BeaconScreen.h" #include - #include #include #include @@ -15,8 +14,6 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/entity/ItemRenderer.h" @@ -27,6 +24,8 @@ #include "minecraft/world/inventory/BeaconMenu.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/client/gui/inventory/AbstractBeaconButton.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes (and iggy too) diff --git a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp index 6167f03f2..a241404d3 100644 --- a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp @@ -4,10 +4,10 @@ #include #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/BrewingStandMenu.h" #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing // container classes diff --git a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp index 843633fe9..36222117d 100644 --- a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp @@ -1,8 +1,8 @@ #include "ContainerScreen.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/Container.h" #include "minecraft/world/inventory/ContainerMenu.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" ContainerScreen::ContainerScreen(std::shared_ptr inventory, std::shared_ptr container) diff --git a/targets/minecraft/client/gui/inventory/CraftingScreen.cpp b/targets/minecraft/client/gui/inventory/CraftingScreen.cpp index b2c09a7f4..3b0feead8 100644 --- a/targets/minecraft/client/gui/inventory/CraftingScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CraftingScreen.cpp @@ -4,12 +4,12 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/locale/Language.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/CraftingMenu.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" class Player; diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index e522a6308..c75f87a32 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -1,7 +1,6 @@ #include "CreativeInventoryScreen.h" #include - #include #include @@ -11,7 +10,6 @@ #include "AbstractContainerScreen.h" #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" @@ -25,6 +23,9 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "Minecraft.Client/include/stubs.h" // Static member initialization int CreativeInventoryScreen::selectedTabIndex = diff --git a/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp b/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp index d47a16921..1a34b6dd0 100644 --- a/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp +++ b/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp @@ -3,10 +3,10 @@ #include #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/FurnaceMenu.h" #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_FURNACE_LOCATION = ResourceLocation(TN_GUI_FURNACE); diff --git a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp index 431e09afc..c67304602 100644 --- a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp @@ -3,17 +3,18 @@ #include #include -#include "4J.Render/4J_Render.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" -#include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/HorseInventoryMenu.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" + +#include "minecraft/client/renderer/Textures.h" class EntityHorse; diff --git a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp index 220f491e4..9afa9a6da 100644 --- a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -8,7 +8,6 @@ #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" -#include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/achievement/AchievementScreen.h" #include "minecraft/client/gui/achievement/StatsScreen.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" @@ -18,6 +17,8 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" +#include "minecraft/client/gui/Font.h" InventoryScreen::InventoryScreen(std::shared_ptr player) : AbstractContainerScreen(player->inventoryMenu) { diff --git a/targets/minecraft/client/gui/inventory/RepairScreen.cpp b/targets/minecraft/client/gui/inventory/RepairScreen.cpp index 060fee4df..e4e8f189d 100644 --- a/targets/minecraft/client/gui/inventory/RepairScreen.cpp +++ b/targets/minecraft/client/gui/inventory/RepairScreen.cpp @@ -1,7 +1,6 @@ #include "RepairScreen.h" #include - #include #include @@ -20,6 +19,7 @@ #include "minecraft/world/inventory/AnvilMenu.h" #include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" class Inventory; class Level; diff --git a/targets/minecraft/client/gui/inventory/TrapScreen.cpp b/targets/minecraft/client/gui/inventory/TrapScreen.cpp index 1ab57f0c9..75336f7d8 100644 --- a/targets/minecraft/client/gui/inventory/TrapScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TrapScreen.cpp @@ -3,10 +3,10 @@ #include #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/TrapMenu.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/client/gui/inventory/AbstractContainerScreen.h" #ifdef ENABLE_JAVA_GUIS ResourceLocation GUI_TRAP_LOCATION = ResourceLocation(TN_GUI_TRAP); diff --git a/targets/minecraft/client/level/DemoLevel.cpp b/targets/minecraft/client/level/DemoLevel.cpp index cd8df19a1..1221eefa9 100644 --- a/targets/minecraft/client/level/DemoLevel.cpp +++ b/targets/minecraft/client/level/DemoLevel.cpp @@ -4,6 +4,7 @@ #include "minecraft/world/level/LevelType.h" #include "minecraft/world/level/chunk/ChunkSource.h" #include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/Level.h" class LevelStorage; diff --git a/targets/minecraft/client/level/DemoLevel.h b/targets/minecraft/client/level/DemoLevel.h index 3c2582086..d570e9d58 100644 --- a/targets/minecraft/client/level/DemoLevel.h +++ b/targets/minecraft/client/level/DemoLevel.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/client/model/CowModel.cpp b/targets/minecraft/client/model/CowModel.cpp index b87b9dfae..5d3543aa9 100644 --- a/targets/minecraft/client/model/CowModel.cpp +++ b/targets/minecraft/client/model/CowModel.cpp @@ -1,7 +1,7 @@ #include "CowModel.h" -#include "minecraft/client/model/QuadrupedModel.h" #include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/QuadrupedModel.h" CowModel::CowModel() : QuadrupedModel(12, 0) { head = new ModelPart(this, 0, 0); diff --git a/targets/minecraft/client/model/EndermanModel.cpp b/targets/minecraft/client/model/EndermanModel.cpp index b20f6cd9a..28266e6ed 100644 --- a/targets/minecraft/client/model/EndermanModel.cpp +++ b/targets/minecraft/client/model/EndermanModel.cpp @@ -2,8 +2,8 @@ #include -#include "minecraft/client/model/HumanoidModel.h" #include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/HumanoidModel.h" EndermanModel::EndermanModel() : HumanoidModel(0, -14, 64, 32) { carrying = false; diff --git a/targets/minecraft/client/model/HumanoidModel.cpp b/targets/minecraft/client/model/HumanoidModel.cpp index 155b83399..3ec459a60 100644 --- a/targets/minecraft/client/model/HumanoidModel.cpp +++ b/targets/minecraft/client/model/HumanoidModel.cpp @@ -6,10 +6,8 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "minecraft/client/model/HumanoidModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" // 4J added diff --git a/targets/minecraft/client/model/PigModel.cpp b/targets/minecraft/client/model/PigModel.cpp index bb5be67d1..8b7fd978e 100644 --- a/targets/minecraft/client/model/PigModel.cpp +++ b/targets/minecraft/client/model/PigModel.cpp @@ -1,7 +1,7 @@ #include "PigModel.h" -#include "minecraft/client/model/QuadrupedModel.h" #include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/QuadrupedModel.h" PigModel::PigModel() : QuadrupedModel(6, 0) { head->texOffs(16, 16)->addBox(-2.0f, 0.0f, -9.0f, 4, 3, 1, 0.0f); diff --git a/targets/minecraft/client/model/SheepFurModel.cpp b/targets/minecraft/client/model/SheepFurModel.cpp index 8f52060a9..9a483babf 100644 --- a/targets/minecraft/client/model/SheepFurModel.cpp +++ b/targets/minecraft/client/model/SheepFurModel.cpp @@ -2,10 +2,10 @@ #include -#include "minecraft/client/model/QuadrupedModel.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" +#include "minecraft/client/model/QuadrupedModel.h" SheepFurModel::SheepFurModel() : QuadrupedModel(12, 0) { headXRot = 0.0f; diff --git a/targets/minecraft/client/model/SheepModel.cpp b/targets/minecraft/client/model/SheepModel.cpp index 1eae65882..572cbca0f 100644 --- a/targets/minecraft/client/model/SheepModel.cpp +++ b/targets/minecraft/client/model/SheepModel.cpp @@ -2,10 +2,10 @@ #include -#include "minecraft/client/model/QuadrupedModel.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" +#include "minecraft/client/model/QuadrupedModel.h" SheepModel::SheepModel() : QuadrupedModel(12, 0) { headXRot = 0.0f; diff --git a/targets/minecraft/client/model/SkeletonModel.cpp b/targets/minecraft/client/model/SkeletonModel.cpp index 7fdc4d433..4410b5b6e 100644 --- a/targets/minecraft/client/model/SkeletonModel.cpp +++ b/targets/minecraft/client/model/SkeletonModel.cpp @@ -2,10 +2,10 @@ #include -#include "minecraft/client/model/ZombieModel.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Skeleton.h" +#include "minecraft/client/model/ZombieModel.h" void SkeletonModel::_init(float g) { arm0 = new ModelPart(this, 24 + 16, 16); diff --git a/targets/minecraft/client/model/Vertex.cpp b/targets/minecraft/client/model/Vertex.cpp index b323c0f79..5cc3c43a7 100644 --- a/targets/minecraft/client/model/Vertex.cpp +++ b/targets/minecraft/client/model/Vertex.cpp @@ -1,5 +1,7 @@ #include "Vertex.h" +#include "minecraft/world/phys/Vec3.h" + Vertex Vertex::remap(const float u, const float v) const { return Vertex(pos.x, pos.y, pos.z, u, v); } diff --git a/targets/minecraft/client/model/VillagerZombieModel.cpp b/targets/minecraft/client/model/VillagerZombieModel.cpp index 3d5db290a..528ae75ee 100644 --- a/targets/minecraft/client/model/VillagerZombieModel.cpp +++ b/targets/minecraft/client/model/VillagerZombieModel.cpp @@ -1,12 +1,11 @@ #include "VillagerZombieModel.h" #include - #include #include -#include "minecraft/client/model/HumanoidModel.h" #include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/HumanoidModel.h" void VillagerZombieModel::_init(float g, float yOffset, bool isArmor) { delete head; diff --git a/targets/minecraft/client/model/WitherBossModel.cpp b/targets/minecraft/client/model/WitherBossModel.cpp index 3121d43b7..33379f5c5 100644 --- a/targets/minecraft/client/model/WitherBossModel.cpp +++ b/targets/minecraft/client/model/WitherBossModel.cpp @@ -1,9 +1,12 @@ #include "WitherBossModel.h" #include +#include +#include #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/boss/wither/WitherBoss.h" +#include "minecraft/world/entity/LivingEntity.h" WitherBossModel::WitherBossModel() { texWidth = 64; diff --git a/targets/minecraft/client/model/WitherBossModel.h b/targets/minecraft/client/model/WitherBossModel.h index da59dbb59..94778458a 100644 --- a/targets/minecraft/client/model/WitherBossModel.h +++ b/targets/minecraft/client/model/WitherBossModel.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" +class ModelPart; + class WitherBossModel : public Model { private: std::vector upperBodyParts; diff --git a/targets/minecraft/client/model/ZombieModel.cpp b/targets/minecraft/client/model/ZombieModel.cpp index 25db4c17c..38a88e0a2 100644 --- a/targets/minecraft/client/model/ZombieModel.cpp +++ b/targets/minecraft/client/model/ZombieModel.cpp @@ -1,12 +1,11 @@ #include "ZombieModel.h" #include - #include #include -#include "minecraft/client/model/HumanoidModel.h" #include "minecraft/client/model/geom/ModelPart.h" +#include "minecraft/client/model/HumanoidModel.h" ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32) {} diff --git a/targets/minecraft/client/model/dragon/DragonModel.cpp b/targets/minecraft/client/model/dragon/DragonModel.cpp index 43ca8b08a..4bd5d2fcb 100644 --- a/targets/minecraft/client/model/dragon/DragonModel.cpp +++ b/targets/minecraft/client/model/dragon/DragonModel.cpp @@ -1,8 +1,17 @@ #include "DragonModel.h" -#include "Minecraft.Client/include/stdafx.h" -#include "minecraft/util/Mth.h" +#include +#include +#include +#include +#include + #include "minecraft/world/entity/boss/enderdragon/EnderDragon.h" +#include "4J_Render.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/model/geom/ModelPart.h" +#include "gl3_loader.h" +#include "minecraft/world/entity/Entity.h" DragonModel::DragonModel(float g) : Model() { // 4J-PB diff --git a/targets/minecraft/client/model/dragon/DragonModel.h b/targets/minecraft/client/model/dragon/DragonModel.h index 26e99e594..caa0bece7 100644 --- a/targets/minecraft/client/model/dragon/DragonModel.h +++ b/targets/minecraft/client/model/dragon/DragonModel.h @@ -2,6 +2,8 @@ #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" +class ModelPart; + class DragonModel : public Model { public: static const int MODEL_ID = 4; diff --git a/targets/minecraft/client/model/geom/Model.cpp b/targets/minecraft/client/model/geom/Model.cpp index 1ca9c21e7..75c8284b9 100644 --- a/targets/minecraft/client/model/geom/Model.cpp +++ b/targets/minecraft/client/model/geom/Model.cpp @@ -1,7 +1,6 @@ #include "Model.h" #include "TexOffs.h" -#include "minecraft/client/model/geom/Model.h" Model::Model() { riding = false; diff --git a/targets/minecraft/client/model/geom/ModelPart.cpp b/targets/minecraft/client/model/geom/ModelPart.cpp index 2c025bfd5..fcdfdf417 100644 --- a/targets/minecraft/client/model/geom/ModelPart.cpp +++ b/targets/minecraft/client/model/geom/ModelPart.cpp @@ -1,15 +1,14 @@ #include "ModelPart.h" #include - #include #include "4J.Render/4J_Render.h" #include "Cube.h" #include "TexOffs.h" #include "minecraft/client/MemoryTracker.h" -#include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/client/model/geom/Model.h" const float ModelPart::RAD = (180.0f / std::numbers::pi); diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 2ede8d433..c893316e0 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -1,31 +1,30 @@ #include "ClientConnection.h" -#include +#include +#include +#include #include +#include +#include +#include +#include #include "4J_Input.h" -#include "DisconnectedScreen.h" #include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/UI.h" -#include "Minecraft.Client/include/stdafx.h" #include "MultiPlayerLevel.h" -#include "MultiPlayerLocalPlayer.h" #include "ReceivingLevelScreen.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/StringHelpers.h" #include "minecraft/Pos.h" #include "minecraft/SharedConstants.h" -#include "minecraft/client/ClientConstants.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/Options.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/User.h" #include "minecraft/client/gui/Gui.h" -#include "minecraft/client/gui/inventory/MerchantScreen.h" #include "minecraft/client/particle/CritParticle.h" #include "minecraft/client/particle/TakeAnimationParticle.h" #include "minecraft/client/player/RemotePlayer.h" @@ -34,31 +33,177 @@ #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/sounds/SoundTypes.h" -#include "minecraft/stats/StatsCounter.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/food/net.minecraft.world.food.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" #include "minecraft/world/phys/AABB.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/App_structs.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/client/particle/ParticleEngine.h" +#include "minecraft/client/player/LocalPlayer.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Class.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/Random.h" +#include "minecraft/network/packet/AddEntityPacket.h" +#include "minecraft/network/packet/AddExperienceOrbPacket.h" +#include "minecraft/network/packet/AddGlobalEntityPacket.h" +#include "minecraft/network/packet/AddMobPacket.h" +#include "minecraft/network/packet/AddPaintingPacket.h" +#include "minecraft/network/packet/AddPlayerPacket.h" +#include "minecraft/network/packet/AnimatePacket.h" +#include "minecraft/network/packet/AwardStatPacket.h" +#include "minecraft/network/packet/BlockRegionUpdatePacket.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/ChunkTilesUpdatePacket.h" +#include "minecraft/network/packet/ChunkVisibilityAreaPacket.h" +#include "minecraft/network/packet/ChunkVisibilityPacket.h" +#include "minecraft/network/packet/ComplexItemDataPacket.h" +#include "minecraft/network/packet/ContainerAckPacket.h" +#include "minecraft/network/packet/ContainerClosePacket.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/network/packet/ContainerSetContentPacket.h" +#include "minecraft/network/packet/ContainerSetDataPacket.h" +#include "minecraft/network/packet/ContainerSetSlotPacket.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "minecraft/network/packet/EntityEventPacket.h" +#include "minecraft/network/packet/ExplodePacket.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/KeepAlivePacket.h" +#include "minecraft/network/packet/LevelEventPacket.h" +#include "minecraft/network/packet/LevelParticlesPacket.h" +#include "minecraft/network/packet/LevelSoundPacket.h" +#include "minecraft/network/packet/LoginPacket.h" +#include "minecraft/network/packet/MoveEntityPacket.h" +#include "minecraft/network/packet/MoveEntityPacketSmall.h" +#include "minecraft/network/packet/MovePlayerPacket.h" +#include "minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "minecraft/network/packet/PlayerInfoPacket.h" +#include "minecraft/network/packet/PreLoginPacket.h" +#include "minecraft/network/packet/RemoveEntitiesPacket.h" +#include "minecraft/network/packet/RemoveMobEffectPacket.h" +#include "minecraft/network/packet/RespawnPacket.h" +#include "minecraft/network/packet/RotateHeadPacket.h" +#include "minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "minecraft/network/packet/SetCarriedItemPacket.h" +#include "minecraft/network/packet/SetEntityDataPacket.h" +#include "minecraft/network/packet/SetEntityLinkPacket.h" +#include "minecraft/network/packet/SetEntityMotionPacket.h" +#include "minecraft/network/packet/SetEquippedItemPacket.h" +#include "minecraft/network/packet/SetExperiencePacket.h" +#include "minecraft/network/packet/SetHealthPacket.h" +#include "minecraft/network/packet/SetSpawnPositionPacket.h" +#include "minecraft/network/packet/SetTimePacket.h" +#include "minecraft/network/packet/SignUpdatePacket.h" +#include "minecraft/network/packet/TakeItemEntityPacket.h" +#include "minecraft/network/packet/TeleportEntityPacket.h" +#include "minecraft/network/packet/TextureAndGeometryChangePacket.h" +#include "minecraft/network/packet/TextureAndGeometryPacket.h" +#include "minecraft/network/packet/TextureChangePacket.h" +#include "minecraft/network/packet/TexturePacket.h" +#include "minecraft/network/packet/TileDestructionPacket.h" +#include "minecraft/network/packet/TileEditorOpenPacket.h" +#include "minecraft/network/packet/TileEntityDataPacket.h" +#include "minecraft/network/packet/TileEventPacket.h" +#include "minecraft/network/packet/TileUpdatePacket.h" +#include "minecraft/network/packet/UpdateAttributesPacket.h" +#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" +#include "minecraft/network/packet/UpdateMobEffectPacket.h" +#include "minecraft/network/packet/UpdateProgressPacket.h" +#include "minecraft/network/packet/XZPacket.h" +#include "minecraft/stats/GenericStats.h" +#include "strings.h" +#include "minecraft/world/SimpleContainer.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/LeashFenceKnotEntity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Painting.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/ai/attributes/RangedAttribute.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" +#include "minecraft/world/entity/global/LightningBolt.h" +#include "minecraft/world/entity/item/Boat.h" +#include "minecraft/world/entity/item/FallingTile.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/item/PrimedTnt.h" +#include "minecraft/world/entity/monster/Slime.h" +#include "minecraft/world/entity/npc/ClientSideMerchant.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/entity/projectile/DragonFireball.h" +#include "minecraft/world/entity/projectile/EyeOfEnderSignal.h" +#include "minecraft/world/entity/projectile/FireworksRocketEntity.h" +#include "minecraft/world/entity/projectile/FishingHook.h" +#include "minecraft/world/entity/projectile/LargeFireball.h" +#include "minecraft/world/entity/projectile/SmallFireball.h" +#include "minecraft/world/entity/projectile/Snowball.h" +#include "minecraft/world/entity/projectile/ThrownEgg.h" +#include "minecraft/world/entity/projectile/ThrownEnderpearl.h" +#include "minecraft/world/entity/projectile/ThrownExpBottle.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#include "minecraft/world/entity/projectile/WitherSkull.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/AnimalChest.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/MapItem.h" +#include "minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/level/Explosion.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/SavedDataStorage.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/world/level/tile/entity/CommandBlockEntity.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/level/tile/entity/DropperTileEntity.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" + +class Packet; +class TexturePack; +class UIScene; ClientConnection::ClientConnection(Minecraft* minecraft, const std::wstring& ip, int port) { diff --git a/targets/minecraft/client/multiplayer/ClientConnection.h b/targets/minecraft/client/multiplayer/ClientConnection.h index e2fcfc92d..62399bf2e 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.h +++ b/targets/minecraft/client/multiplayer/ClientConnection.h @@ -1,12 +1,25 @@ #pragma once +#include +#include +#include +#include + #include "4J_Storage.h" #include "minecraft/network/net.minecraft.network.h" +#include "minecraft/network/Connection.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/PacketListener.h" +#include "minecraft/world/entity/Entity.h" class Minecraft; class MultiPlayerLevel; class SavedDataStorage; class Socket; class MultiplayerLocalPlayer; +class INetworkPlayer; +class Packet; +class Random; +class SetEntityLinkPacket; class ClientConnection : public PacketListener { private: diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index 162840241..2a7f55dd1 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -18,6 +18,7 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) { XZSIZE = level->dimension->getXZSize(); // 4J Added diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index d06dc4fe2..611655893 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -5,10 +5,8 @@ #include "ClientConnection.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "MultiPlayerLevel.h" -#include "MultiPlayerLocalPlayer.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/network/packet/ContainerButtonClickPacket.h" #include "minecraft/network/packet/ContainerClickPacket.h" #include "minecraft/network/packet/CraftItemPacket.h" @@ -30,6 +28,8 @@ #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" +#include "minecraft/world/item/ItemInstance.h" MultiPlayerGameMode::MultiPlayerGameMode(Minecraft* minecraft, ClientConnection* connection) { diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 5e37f61f3..817c13ca4 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -1,7 +1,6 @@ #include "MultiPlayerLevel.h" #include - #include #include #include @@ -11,15 +10,11 @@ #include "4J.Common/4J_Compat.h" #include "4J_Input.h" -#include "4J_Profile.h" #include "ClientConnection.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "MultiPlayerChunkCache.h" #include "MultiPlayerLocalPlayer.h" #include "java/JavaMath.h" @@ -40,6 +35,8 @@ #include "minecraft/world/level/storage/SavedDataStorage.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" class LevelSettings; class Scoreboard; diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h index b5d9749a7..7d7ee8aae 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 595ebeb3c..a2456db29 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -1,6 +1,7 @@ #include "MultiPlayerLocalPlayer.h" #include +#include #include "ClientConnection.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" @@ -23,7 +24,6 @@ #include "minecraft/network/packet/TextureAndGeometryChangePacket.h" #include "minecraft/network/packet/TextureChangePacket.h" #include "minecraft/stats/Stat.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/effect/MobEffectInstance.h" #include "minecraft/world/entity/player/Abilities.h" @@ -32,8 +32,10 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/player/Player.h" class User; +class ItemEntity; // 4J added for testing #if defined(STRESS_TEST_MOVE) diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h index 5844857a3..7bc1c1a15 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "minecraft/SharedConstants.h" #include "minecraft/client/player/LocalPlayer.h" diff --git a/targets/minecraft/client/particle/BreakingItemParticle.cpp b/targets/minecraft/client/particle/BreakingItemParticle.cpp index d38092799..c5134daf4 100644 --- a/targets/minecraft/client/particle/BreakingItemParticle.cpp +++ b/targets/minecraft/client/particle/BreakingItemParticle.cpp @@ -1,12 +1,12 @@ #include "BreakingItemParticle.h" #include "minecraft/SharedConstants.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/world/Icon.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" class Level; class Textures; diff --git a/targets/minecraft/client/particle/BubbleParticle.cpp b/targets/minecraft/client/particle/BubbleParticle.cpp index 7229af4fb..b91105bfc 100644 --- a/targets/minecraft/client/particle/BubbleParticle.cpp +++ b/targets/minecraft/client/particle/BubbleParticle.cpp @@ -1,11 +1,12 @@ #include "BubbleParticle.h" +#include + #include "java/JavaMath.h" #include "java/Random.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/client/particle/Particle.h" BubbleParticle::BubbleParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/targets/minecraft/client/particle/CritParticle.cpp b/targets/minecraft/client/particle/CritParticle.cpp index 3ed963fd2..e9a406e96 100644 --- a/targets/minecraft/client/particle/CritParticle.cpp +++ b/targets/minecraft/client/particle/CritParticle.cpp @@ -1,11 +1,12 @@ #include "CritParticle.h" #include "java/Random.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" +#include "minecraft/core/particles/ParticleTypes.h" void CritParticle::_init(Level* level, std::shared_ptr entity, ePARTICLE_TYPE type) { diff --git a/targets/minecraft/client/particle/DripParticle.cpp b/targets/minecraft/client/particle/DripParticle.cpp index 684645f03..eb44a52c7 100644 --- a/targets/minecraft/client/particle/DripParticle.cpp +++ b/targets/minecraft/client/particle/DripParticle.cpp @@ -1,15 +1,16 @@ #include "DripParticle.h" +#include + #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/particle/Particle.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/client/particle/Particle.h" DripParticle::DripParticle(Level* level, double x, double y, double z, Material* material) diff --git a/targets/minecraft/client/particle/FireworksParticles.cpp b/targets/minecraft/client/particle/FireworksParticles.cpp index e0194f81a..5bf1b92a3 100644 --- a/targets/minecraft/client/particle/FireworksParticles.cpp +++ b/targets/minecraft/client/particle/FireworksParticles.cpp @@ -1,7 +1,6 @@ #include "FireworksParticles.h" #include - #include #include #include @@ -9,8 +8,6 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/entity/LivingEntity.h" @@ -19,6 +16,8 @@ #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" #include "nbt/Tag.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" FireworksParticles::FireworksStarter::FireworksStarter( Level* level, double x, double y, double z, double xd, double yd, double zd, diff --git a/targets/minecraft/client/particle/FireworksParticles.h b/targets/minecraft/client/particle/FireworksParticles.h index d9de2da0a..5977093fa 100644 --- a/targets/minecraft/client/particle/FireworksParticles.h +++ b/targets/minecraft/client/particle/FireworksParticles.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "Particle.h" #include "java/Class.h" diff --git a/targets/minecraft/client/particle/FootstepParticle.cpp b/targets/minecraft/client/particle/FootstepParticle.cpp index 1d3537509..665145073 100644 --- a/targets/minecraft/client/particle/FootstepParticle.cpp +++ b/targets/minecraft/client/particle/FootstepParticle.cpp @@ -1,15 +1,15 @@ #include "FootstepParticle.h" #include +#include #include "4J.Render/4J_Render.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" ResourceLocation FootstepParticle::FOOTPRINT_LOCATION = ResourceLocation(TN_MISC_FOOTSTEP); diff --git a/targets/minecraft/client/particle/HugeExplosionParticle.cpp b/targets/minecraft/client/particle/HugeExplosionParticle.cpp index f4f2d26d8..04481ce19 100644 --- a/targets/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionParticle.cpp @@ -8,11 +8,11 @@ #include "java/Random.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" class Level; diff --git a/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp index 51a8b62f8..af2d15716 100644 --- a/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp @@ -2,10 +2,10 @@ #include "java/Random.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/level/Level.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level* level, double x, double y, double z, diff --git a/targets/minecraft/client/particle/LavaParticle.cpp b/targets/minecraft/client/particle/LavaParticle.cpp index 69a829634..068903493 100644 --- a/targets/minecraft/client/particle/LavaParticle.cpp +++ b/targets/minecraft/client/particle/LavaParticle.cpp @@ -2,9 +2,9 @@ #include "java/JavaMath.h" #include "java/Random.h" -#include "minecraft/client/particle/Particle.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/level/Level.h" +#include "minecraft/client/particle/Particle.h" LavaParticle::LavaParticle(Level* level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/targets/minecraft/client/particle/Particle.cpp b/targets/minecraft/client/particle/Particle.cpp index d88f7e684..5461add1f 100644 --- a/targets/minecraft/client/particle/Particle.cpp +++ b/targets/minecraft/client/particle/Particle.cpp @@ -1,16 +1,17 @@ #include "Particle.h" #include +#include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/Icon.h" +#include "minecraft/client/particle/ParticleEngine.h" +#include "minecraft/world/entity/Entity.h" class Level; class Textures; diff --git a/targets/minecraft/client/particle/PlayerCloudParticle.cpp b/targets/minecraft/client/particle/PlayerCloudParticle.cpp index 073df01a4..d25c3cc26 100644 --- a/targets/minecraft/client/particle/PlayerCloudParticle.cpp +++ b/targets/minecraft/client/particle/PlayerCloudParticle.cpp @@ -3,10 +3,10 @@ #include #include "java/JavaMath.h" -#include "minecraft/client/particle/Particle.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/client/particle/Particle.h" PlayerCloudParticle::PlayerCloudParticle(Level* level, double x, double y, double z, double xa, double ya, diff --git a/targets/minecraft/client/particle/SuspendedParticle.cpp b/targets/minecraft/client/particle/SuspendedParticle.cpp index d28c4ae29..0178f5388 100644 --- a/targets/minecraft/client/particle/SuspendedParticle.cpp +++ b/targets/minecraft/client/particle/SuspendedParticle.cpp @@ -1,14 +1,15 @@ #include "SuspendedParticle.h" +#include + #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/client/particle/Particle.h" SuspendedParticle::SuspendedParticle(Level* level, double x, double y, double z, double xa, double ya, double za) diff --git a/targets/minecraft/client/particle/TakeAnimationParticle.cpp b/targets/minecraft/client/particle/TakeAnimationParticle.cpp index dfc59c6ab..d1fd711f3 100644 --- a/targets/minecraft/client/particle/TakeAnimationParticle.cpp +++ b/targets/minecraft/client/particle/TakeAnimationParticle.cpp @@ -1,15 +1,15 @@ #include "TakeAnimationParticle.h" #include +#include #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" TakeAnimationParticle::TakeAnimationParticle(Level* level, std::shared_ptr item, diff --git a/targets/minecraft/client/particle/TerrainParticle.cpp b/targets/minecraft/client/particle/TerrainParticle.cpp index 922788805..bd2eb9667 100644 --- a/targets/minecraft/client/particle/TerrainParticle.cpp +++ b/targets/minecraft/client/particle/TerrainParticle.cpp @@ -1,13 +1,13 @@ #include "TerrainParticle.h" #include "minecraft/SharedConstants.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/world/Icon.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/GrassTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/particle/Particle.h" +#include "minecraft/client/particle/ParticleEngine.h" class Textures; diff --git a/targets/minecraft/client/particle/WaterDropParticle.cpp b/targets/minecraft/client/particle/WaterDropParticle.cpp index 5dbf7cdd1..d12c9b504 100644 --- a/targets/minecraft/client/particle/WaterDropParticle.cpp +++ b/targets/minecraft/client/particle/WaterDropParticle.cpp @@ -1,12 +1,13 @@ #include "WaterDropParticle.h" +#include + #include "java/JavaMath.h" #include "java/Random.h" -#include "minecraft/client/particle/Particle.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/client/particle/Particle.h" WaterDropParticle::WaterDropParticle(Level* level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0) { diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index c60f227d6..cebf550d1 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -1,11 +1,10 @@ #include "LocalPlayer.h" -#include #include - #include #include #include +#include #include "Input.h" #include "java/Random.h" @@ -18,7 +17,6 @@ #include "minecraft/client/renderer/GameRenderer.h" #include "minecraft/client/renderer/ItemInHandRenderer.h" #include "minecraft/stats/StatsCounter.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/entity/TileEntity.h" @@ -29,7 +27,6 @@ #include "4J.Render/4J_Render.h" #include "4J_Input.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" @@ -80,6 +77,12 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" +#include "4J.Common/4J_InputActions.h" +#include "PlatformTypes.h" +#include "Pos.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/util/SmoothFloat.h" +#include "minecraft/world/entity/player/Player.h" LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user, int dimension) diff --git a/targets/minecraft/client/player/RemotePlayer.cpp b/targets/minecraft/client/player/RemotePlayer.cpp index c5b5e208e..e08bb84bc 100644 --- a/targets/minecraft/client/player/RemotePlayer.cpp +++ b/targets/minecraft/client/player/RemotePlayer.cpp @@ -1,15 +1,15 @@ #include "RemotePlayer.h" -#include - #include #include +#include #include "Minecraft.Client/Linux/Linux_App.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "Pos.h" +#include "minecraft/world/entity/player/Player.h" class Level; diff --git a/targets/minecraft/client/renderer/Chunk.cpp b/targets/minecraft/client/renderer/Chunk.cpp index 2cba370ee..4eb368536 100644 --- a/targets/minecraft/client/renderer/Chunk.cpp +++ b/targets/minecraft/client/renderer/Chunk.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -13,11 +12,7 @@ #include "LevelRenderer.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/FrameProfiler.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "TileRenderer.h" -#include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/culling/Culler.h" #include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" #include "minecraft/world/entity/Entity.h" @@ -27,6 +22,8 @@ #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "minecraft/world/phys/AABB.h" int Chunk::updates = 0; diff --git a/targets/minecraft/client/renderer/Chunk.h b/targets/minecraft/client/renderer/Chunk.h index 1c4e82c9a..d56a75a2a 100644 --- a/targets/minecraft/client/renderer/Chunk.h +++ b/targets/minecraft/client/renderer/Chunk.h @@ -1,9 +1,9 @@ #pragma once #include - #include #include #include +#include #include "LevelRenderer.h" #include "Tesselator.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index 0a075b64e..e930c0923 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -1,8 +1,6 @@ #include "GameRenderer.h" -#include #include - #include #include #include @@ -10,7 +8,6 @@ #include "4J.Common/4J_Compat.h" #include "4J.Render/4J_Render.h" #include "4J_Input.h" -#include "4J_Profile.h" #include "BossMobGuiInfo.h" #include "Chunk.h" #include "ItemInHandRenderer.h" @@ -22,12 +19,8 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/include/FrameProfiler.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "Minecraft.Client/include/stubs.h" #include "Tesselator.h" -#include "Textures.h" #include "console_helpers/compression.h" #include "java/Class.h" #include "java/FloatBuffer.h" @@ -61,7 +54,6 @@ #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/sounds/SoundTypes.h" -#include "minecraft/util/Mth.h" #include "minecraft/util/SmoothFloat.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/effect/MobEffectInstance.h" @@ -86,6 +78,9 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/client/renderer/Textures.h" +#include "gl3_loader.h" +#include "minecraft/world/phys/Vec3.h" bool GameRenderer::anaglyph3d = false; int GameRenderer::anaglyphPass = 0; diff --git a/targets/minecraft/client/renderer/GameRenderer.h b/targets/minecraft/client/renderer/GameRenderer.h index 4d73dd2ba..8ebdd5784 100644 --- a/targets/minecraft/client/renderer/GameRenderer.h +++ b/targets/minecraft/client/renderer/GameRenderer.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index 49acc4162..044287528 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -1,7 +1,6 @@ #include "ItemInHandRenderer.h" #include - #include #include #include @@ -10,9 +9,6 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "Tesselator.h" #include "Textures.h" #include "TileRenderer.h" @@ -25,12 +21,10 @@ #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/client/renderer/ItemInHandRenderer.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "minecraft/client/renderer/entity/PlayerRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/client/resources/ResourceLocation.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/Icon.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index 6c6bf8eb9..5a76e66bf 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -4,7 +4,6 @@ #include #include #include - #include #include #include @@ -16,7 +15,6 @@ #include "4J.Common/4J_Compat.h" #include "4J.Render/4J_Render.h" #include "4J_Input.h" -#include "4J_Profile.h" #include "Chunk.h" #include "GameRenderer.h" #include "Minecraft.Client/Common/App_enums.h" @@ -28,7 +26,6 @@ #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" #include "Minecraft.Client/include/stubs.h" #include "Tesselator.h" -#include "Textures.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" #include "java/JavaMath.h" @@ -70,7 +67,6 @@ #include "minecraft/client/particle/SuspendedTownParticle.h" #include "minecraft/client/particle/TerrainParticle.h" #include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/client/renderer/OffsettedRenderList.h" #include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/client/renderer/culling/Culler.h" #include "minecraft/client/renderer/culling/Frustum.h" @@ -106,6 +102,10 @@ #include "minecraft/world/level/tile/entity/TileEntity.h" #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/client/renderer/OffsettedRenderList.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/phys/AABB.h" class Icon; class ItemInstance; diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h index 9265bed75..0c4fbbbdf 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.h +++ b/targets/minecraft/client/renderer/LevelRenderer.h @@ -23,7 +23,6 @@ class ResourceLocation; #endif #include #include - #include #include #include diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp index 22c37af28..0146e4fb0 100644 --- a/targets/minecraft/client/renderer/Tesselator.cpp +++ b/targets/minecraft/client/renderer/Tesselator.cpp @@ -1,14 +1,12 @@ #include "Tesselator.h" #include - #include #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/stubs.h" #include "minecraft/client/MemoryTracker.h" -#include "minecraft/client/renderer/Tesselator.h" bool Tesselator::TRIANGLE_MODE = false; bool Tesselator::USE_VBO = false; diff --git a/targets/minecraft/client/renderer/Tesselator.h b/targets/minecraft/client/renderer/Tesselator.h index e419a1599..465fb1707 100644 --- a/targets/minecraft/client/renderer/Tesselator.h +++ b/targets/minecraft/client/renderer/Tesselator.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index 4cfb1f072..963c3b76e 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -1,8 +1,6 @@ #include "Textures.h" -#include #include - #include #include #include @@ -19,7 +17,6 @@ #include "java/ByteBuffer.h" #include "minecraft/client/MemoryTracker.h" #include "minecraft/client/Options.h" -#include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/texture/PreStitchedTextureMap.h" #include "minecraft/client/renderer/texture/Texture.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" @@ -30,6 +27,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/item/ItemInstance.h" +#include "4J_Render.h" +#include "gl3_loader.h" // Linux/PC port: disable mipmapping globally so textures are always sampled // from the full-resolution level 0 with GL_NEAREST, giving pixel-crisp diff --git a/targets/minecraft/client/renderer/Textures.h b/targets/minecraft/client/renderer/Textures.h index b8b7b6964..a35e3477e 100644 --- a/targets/minecraft/client/renderer/Textures.h +++ b/targets/minecraft/client/renderer/Textures.h @@ -6,6 +6,7 @@ #include #include "4J.Render/4J_Render.h" +#include "IPlatformRender.h" class Icon; class Entity; diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp index 2d6670f65..761c47180 100644 --- a/targets/minecraft/client/renderer/TileRenderer.cpp +++ b/targets/minecraft/client/renderer/TileRenderer.cpp @@ -3,7 +3,7 @@ #include #include #include - +#include #include #include #include @@ -14,16 +14,11 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/include/FrameProfiler.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "Tesselator.h" -#include "Textures.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/world/Icon.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" @@ -68,6 +63,7 @@ #include "minecraft/world/level/tile/piston/PistonBaseTile.h" #include "minecraft/world/level/tile/piston/PistonExtensionTile.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/client/renderer/Textures.h" bool TileRenderer::fancy = true; diff --git a/targets/minecraft/client/renderer/culling/FrustumCuller.cpp b/targets/minecraft/client/renderer/culling/FrustumCuller.cpp index 60b8a3d42..0181de56e 100644 --- a/targets/minecraft/client/renderer/culling/FrustumCuller.cpp +++ b/targets/minecraft/client/renderer/culling/FrustumCuller.cpp @@ -1,8 +1,8 @@ #include "FrustumCuller.h" +#include "minecraft/world/phys/AABB.h" #include "minecraft/client/renderer/culling/Frustum.h" #include "minecraft/client/renderer/culling/FrustumData.h" -#include "minecraft/world/phys/AABB.h" FrustumCuller::FrustumCuller() { frustum = Frustum::getFrustum(); } diff --git a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp index 001d7065b..f8e8d0430 100644 --- a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -1,8 +1,6 @@ #include "ArrowRenderer.h" -#include #include - #include #include "4J.Render/4J_Render.h" @@ -11,6 +9,7 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/projectile/Arrow.h" +#include "gl3_loader.h" ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS); diff --git a/targets/minecraft/client/renderer/entity/BatRenderer.cpp b/targets/minecraft/client/renderer/entity/BatRenderer.cpp index 8230d8104..06f9ae202 100644 --- a/targets/minecraft/client/renderer/entity/BatRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/BatRenderer.cpp @@ -7,10 +7,10 @@ #include "minecraft/client/model/BatModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/ambient/Bat.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation BatRenderer::BAT_LOCATION = ResourceLocation(TN_MOB_BAT); diff --git a/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp b/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp index 7fc9b7af3..df0576d6e 100644 --- a/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp @@ -4,10 +4,10 @@ #include "minecraft/client/model/BlazeModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/monster/Blaze.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE); diff --git a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp index 75c715905..7860e8f79 100644 --- a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp @@ -1,17 +1,16 @@ #include "BoatRenderer.h" #include - #include #include "4J.Render/4J_Render.h" #include "minecraft/client/model/BoatModel.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/item/Boat.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT); diff --git a/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp index f2137e6f1..cb8ee66b9 100644 --- a/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp @@ -4,8 +4,8 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/SpiderRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/entity/SpiderRenderer.h" ResourceLocation CaveSpiderRenderer::CAVE_SPIDER_LOCATION = ResourceLocation(TN_MOB_CAVE_SPIDER); diff --git a/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp b/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp index b22ba411f..f4ead7a71 100644 --- a/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp @@ -1,14 +1,13 @@ #include "ChickenRenderer.h" #include - #include #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Chicken.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/CowRenderer.cpp b/targets/minecraft/client/renderer/entity/CowRenderer.cpp index b76e9e406..67ebd855d 100644 --- a/targets/minecraft/client/renderer/entity/CowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/CowRenderer.cpp @@ -3,8 +3,8 @@ #include #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp index 6b261c51e..9460b3318 100644 --- a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp @@ -1,17 +1,16 @@ #include "CreeperRenderer.h" -#include #include - #include #include "4J.Render/4J_Render.h" #include "minecraft/client/model/CreeperModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Creeper.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "gl3_loader.h" ResourceLocation CreeperRenderer::POWER_LOCATION = ResourceLocation(TN_POWERED_CREEPER); diff --git a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp index aa1fce2e9..15f299aee 100644 --- a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -1,9 +1,15 @@ #include "EnderCrystalRenderer.h" #include +#include #include "minecraft/client/model/dragon/EnderCrystalModel.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "4J_Render.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" ResourceLocation EnderCrystalRenderer::ENDER_CRYSTAL_LOCATION = ResourceLocation(TN_MOB_ENDERDRAGON_ENDERCRYSTAL); diff --git a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.h b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.h index bbca58ad2..483a89cfa 100644 --- a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.h +++ b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.h @@ -2,6 +2,7 @@ #include "EntityRenderer.h" class Model; +class ResourceLocation; class EnderCrystalRenderer : public EntityRenderer { private: diff --git a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index 7ed171d0e..8cfc64ea8 100644 --- a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -1,12 +1,26 @@ #include "EnderDragonRenderer.h" #include +#include +#include +#include #include "minecraft/client/Lighting.h" #include "minecraft/client/model/dragon/DragonModel.h" #include "minecraft/client/renderer/BossMobGuiInfo.h" #include "minecraft/client/renderer/Tesselator.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" +#include "4J_Render.h" +#include "SharedConstants.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "gl3_loader.h" +#include "java/Random.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" +#include "minecraft/world/entity/boss/enderdragon/EnderDragon.h" ResourceLocation EnderDragonRenderer::DRAGON_EXPLODING_LOCATION = ResourceLocation(TN_MOB_ENDERDRAGON_SHUFFLE); diff --git a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.h b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.h index fb0bdc083..8e16a9d1f 100644 --- a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.h +++ b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.h @@ -2,6 +2,7 @@ #include "MobRenderer.h" class DragonModel; +class ResourceLocation; class EnderDragonRenderer : public MobRenderer { private: diff --git a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp index f6f054d55..f08393a18 100644 --- a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -1,7 +1,5 @@ #include "EndermanRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -9,13 +7,14 @@ #include "minecraft/client/model/EndermanModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/EnderMan.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "gl3_loader.h" ResourceLocation EndermanRenderer::ENDERMAN_EYES_LOCATION = ResourceLocation(TN_MOB_ENDERMAN_EYES); diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index 330b24b71..12c1c113f 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -1,6 +1,8 @@ #include "EntityRenderDispatcher.h" +#include #include +#include #include "ArrowRenderer.h" #include "BatRenderer.h" @@ -22,7 +24,6 @@ #include "GhastRenderer.h" #include "GiantMobRenderer.h" #include "HorseRenderer.h" -#include "HumanoidMobRenderer.h" #include "ItemFrameRenderer.h" #include "ItemRenderer.h" #include "ItemSpriteRenderer.h" @@ -53,37 +54,36 @@ #include "WitherSkullRenderer.h" #include "WolfRenderer.h" #include "ZombieRenderer.h" -#include "minecraft/client/Options.h" -#include "minecraft/client/model/BoatModel.h" #include "minecraft/client/model/ChickenModel.h" #include "minecraft/client/model/CowModel.h" -#include "minecraft/client/model/CreeperModel.h" -#include "minecraft/client/model/GhastModel.h" #include "minecraft/client/model/HumanoidModel.h" -#include "minecraft/client/model/MinecartModel.h" #include "minecraft/client/model/ModelHorse.h" #include "minecraft/client/model/OcelotModel.h" #include "minecraft/client/model/PigModel.h" #include "minecraft/client/model/SheepFurModel.h" #include "minecraft/client/model/SheepModel.h" -#include "minecraft/client/model/SkeletonModel.h" #include "minecraft/client/model/SlimeModel.h" -#include "minecraft/client/model/SpiderModel.h" #include "minecraft/client/model/SquidModel.h" #include "minecraft/client/model/WolfModel.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J_Render.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SharedConstants.h" +#include "minecraft/client/model/ZombieModel.h" +#include "minecraft/client/renderer/Tesselator.h" +#include "gl3_loader.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" + +class Font; +class IconRegister; +class Options; +class Textures; double EntityRenderDispatcher::xOff = 0.0; double EntityRenderDispatcher::yOff = 0.0; diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h index 3df13c952..a98758fff 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h @@ -1,8 +1,21 @@ #pragma once +#include +#include + #include "EntityRenderer.h" #include "java/JavaIntHash.h" #include "minecraft/world/entity/Entity.h" +#include "java/Class.h" + class font; +class Entity; +class Font; +class IconRegister; +class ItemInHandRenderer; +class Level; +class LivingEntity; +class Options; +class Textures; class EntityRenderDispatcher { public: diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp index 99cf9eb63..9b2d00f91 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -1,6 +1,6 @@ #include "EntityRenderer.h" -#include +#include #include "4J.Render/4J_Render.h" #include "EntityRenderDispatcher.h" @@ -11,7 +11,6 @@ #include "minecraft/client/renderer/TileRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/client/resources/ResourceLocation.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/Icon.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/Mob.h" @@ -20,6 +19,7 @@ #include "minecraft/world/level/tile/FireTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "gl3_loader.h" ResourceLocation EntityRenderer::SHADOW_LOCATION = ResourceLocation(TN__CLAMP__MISC_SHADOW); diff --git a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index ef89b802c..e22477a97 100644 --- a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -1,8 +1,6 @@ #include "ExperienceOrbRenderer.h" -#include #include - #include #include @@ -14,6 +12,7 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/ExperienceOrb.h" +#include "gl3_loader.h" ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION = ResourceLocation(TN_ITEM_EXPERIENCE_ORB); diff --git a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp index 38125c57d..91069f013 100644 --- a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -1,21 +1,19 @@ #include "FallingTileRenderer.h" -#include -#include - #include +#include #include "4J.Render/4J_Render.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/item/FallingTile.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/AnvilTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "gl3_loader.h" FallingTileRenderer::FallingTileRenderer() : EntityRenderer() { tileRenderer = new TileRenderer(); diff --git a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp index 76ae727c7..19b5c96ba 100644 --- a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp @@ -1,7 +1,5 @@ #include "FireballRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -16,6 +14,7 @@ #include "minecraft/world/level/tile/FireTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "gl3_loader.h" FireballRenderer::FireballRenderer(float scale) { this->scale = scale; } diff --git a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp index e3391bce8..9954eb13e 100644 --- a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -1,7 +1,5 @@ #include "FishingHookRenderer.h" -#include - #include #include #include @@ -17,6 +15,7 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/FishingHook.h" #include "minecraft/world/phys/Vec3.h" +#include "gl3_loader.h" ResourceLocation FishingHookRenderer::PARTICLE_LOCATION = ResourceLocation(TN_PARTICLES); diff --git a/targets/minecraft/client/renderer/entity/GhastRenderer.cpp b/targets/minecraft/client/renderer/entity/GhastRenderer.cpp index 13a364a97..eff0a9158 100644 --- a/targets/minecraft/client/renderer/entity/GhastRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/GhastRenderer.cpp @@ -5,11 +5,11 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/model/GhastModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Ghast.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation GhastRenderer::GHAST_LOCATION = ResourceLocation(TN_MOB_GHAST); ResourceLocation GhastRenderer::GHAST_SHOOTING_LOCATION = diff --git a/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp b/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp index 13a92fc62..ebd8019e4 100644 --- a/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp @@ -4,8 +4,8 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp index 1a5f942c9..aee58b059 100644 --- a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp @@ -7,11 +7,11 @@ #include "MobRenderer.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" ResourceLocation HorseRenderer::HORSE_LOCATION = ResourceLocation(TN_MOB_HORSE_WHITE); diff --git a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index e9da1cc32..e62da0ad2 100644 --- a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -13,7 +13,6 @@ #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/client/renderer/ItemInHandRenderer.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/renderer/tileentity/SkullTileRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" @@ -23,6 +22,7 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" const std::wstring HumanoidMobRenderer::MATERIAL_NAMES[5] = { L"cloth", L"chain", L"iron", L"diamond", L"gold"}; diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp index ff4c0b156..4fb44d65a 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -1,16 +1,10 @@ #include "ItemRenderer.h" -#include -#include #include - #include #include "4J.Render/4J_Render.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" #include "java/JavaMath.h" #include "java/Random.h" @@ -23,8 +17,6 @@ #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/EntityRenderer.h" -#include "minecraft/client/renderer/entity/ItemRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/util/Mth.h" #include "minecraft/world/Icon.h" @@ -33,6 +25,8 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "gl3_loader.h" class ResourceLocation; diff --git a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp index 24613884a..aba306271 100644 --- a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp @@ -1,13 +1,10 @@ #include "ItemSpriteRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" #include "EntityRenderDispatcher.h" #include "minecraft/client/renderer/Tesselator.h" -#include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/world/Icon.h" #include "minecraft/world/entity/Entity.h" @@ -15,6 +12,8 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/PotionItem.h" #include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "gl3_loader.h" ItemSpriteRenderer::ItemSpriteRenderer(Item* sourceItem, int sourceItemAuxValue /*= 0*/) diff --git a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp index 868c3c901..fb23d6a59 100644 --- a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp @@ -5,10 +5,10 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/model/LavaSlimeModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/LavaSlime.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation LavaSlimeRenderer::MAGMACUBE_LOCATION = ResourceLocation(TN_MOB_LAVA); diff --git a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp index 01c7c2096..5f01522b9 100644 --- a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp @@ -1,14 +1,13 @@ #include "LeashKnotRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" #include "minecraft/client/model/LeashKnotModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" +#include "gl3_loader.h" ResourceLocation LeashKnotRenderer::KNOT_LOCATION = ResourceLocation(TN_ITEM_LEASHKNOT); diff --git a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp index 5cac0fa2a..46da7342c 100644 --- a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp @@ -1,7 +1,5 @@ #include "LightningBoltRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -9,6 +7,7 @@ #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/global/LightningBolt.h" +#include "gl3_loader.h" void LightningBoltRenderer::render(std::shared_ptr _bolt, double x, double y, double z, float rot, float a) { diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index 2a1bba789..ae991b2c9 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -1,7 +1,5 @@ #include "LivingEntityRenderer.h" -#include - #include #include #include @@ -27,6 +25,7 @@ #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/Arrow.h" +#include "gl3_loader.h" ResourceLocation LivingEntityRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT); diff --git a/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp b/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp index a16c05f23..51862bca0 100644 --- a/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp @@ -1,9 +1,9 @@ #include "MinecartSpawnerRenderer.h" -#include "minecraft/client/renderer/entity/MinecartRenderer.h" #include "minecraft/client/renderer/tileentity/MobSpawnerRenderer.h" #include "minecraft/world/entity/item/MinecartSpawner.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/MinecartRenderer.h" void MinecartSpawnerRenderer::renderMinecartContents( std::shared_ptr cart, float a, Tile* tile, int tileData) { diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp index d96707a23..e0d841fd2 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp @@ -1,8 +1,6 @@ #include "MobRenderer.h" -#include #include - #include #include "4J.Render/4J_Render.h" @@ -17,6 +15,7 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/Mob.h" +#include "gl3_loader.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp index d4ee38a6d..7b7bdd189 100644 --- a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp @@ -1,7 +1,5 @@ #include "MushroomCowRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -9,13 +7,14 @@ #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/MushroomCow.h" #include "minecraft/world/level/tile/PlantTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "gl3_loader.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp index ce207b630..dcd94857f 100644 --- a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp @@ -4,11 +4,11 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp index f8dfc6afd..73a378574 100644 --- a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -1,6 +1,6 @@ #include "PaintingRenderer.h" -#include +#include #include "4J.Render/4J_Render.h" #include "EntityRenderDispatcher.h" @@ -8,10 +8,10 @@ #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/Painting.h" #include "minecraft/world/level/Level.h" +#include "gl3_loader.h" ResourceLocation PaintingRenderer::PAINTING_LOCATION(TN_ART_KZ); diff --git a/targets/minecraft/client/renderer/entity/PigRenderer.cpp b/targets/minecraft/client/renderer/entity/PigRenderer.cpp index 2fb775b4d..3b96d70ac 100644 --- a/targets/minecraft/client/renderer/entity/PigRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PigRenderer.cpp @@ -3,10 +3,10 @@ #include #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Pig.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp index 5660f7ff9..5573d63a6 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -1,7 +1,6 @@ #include "PlayerRenderer.h" #include -#include #include #include @@ -21,7 +20,6 @@ #include "minecraft/client/renderer/ItemInHandRenderer.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/EntityRenderer.h" #include "minecraft/client/renderer/tileentity/SkullTileRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" @@ -35,6 +33,7 @@ #include "minecraft/world/item/UseAnim.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" +#include "minecraft/client/renderer/entity/EntityRenderer.h" const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] = { diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.h b/targets/minecraft/client/renderer/entity/PlayerRenderer.h index 2b645fc7e..211120f6e 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h @@ -8,6 +8,7 @@ #include "MobRenderer.h" #include "minecraft/client/renderer/entity/LivingEntityRenderer.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/client/renderer/entity/LivingEntityRenderer.h" class HumanoidModel; class LivingEntity; diff --git a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp index 465c3de7c..0bee119a0 100644 --- a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp @@ -8,10 +8,10 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp b/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp index 202ef602a..584203e33 100644 --- a/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp @@ -4,8 +4,8 @@ #include "minecraft/client/model/SilverfishModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation SilverfishRenderer::SILVERFISH_LOCATION(TN_MOB_SILVERFISH); diff --git a/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp b/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp index 50eee5910..2c550c83f 100644 --- a/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp @@ -5,11 +5,11 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/model/SkeletonModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/HumanoidMobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Skeleton.h" +#include "minecraft/client/renderer/entity/HumanoidMobRenderer.h" ResourceLocation SkeletonRenderer::SKELETON_LOCATION = ResourceLocation(TN_MOB_SKELETON); diff --git a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp index d1e964885..cac0e92ee 100644 --- a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp @@ -1,15 +1,14 @@ #include "SlimeRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Slime.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "gl3_loader.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp index d545812cc..38a47d05a 100644 --- a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp @@ -9,13 +9,13 @@ #include "minecraft/client/renderer/ItemInHandRenderer.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/SnowMan.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation SnowManRenderer::SNOWMAN_LOCATION = ResourceLocation(TN_MOB_SNOWMAN); diff --git a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp index 95eadba0e..4dac572dc 100644 --- a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp @@ -1,17 +1,16 @@ #include "SpiderRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/model/SpiderModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Spider.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "gl3_loader.h" ResourceLocation SpiderRenderer::SPIDER_LOCATION = ResourceLocation(TN_MOB_SPIDER); diff --git a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp index bc7580cdd..f84e80a62 100644 --- a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp @@ -4,10 +4,10 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Squid.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp index 6c05a6670..54505a8b3 100644 --- a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp @@ -1,15 +1,14 @@ #include "TntMinecartRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/MinecartRenderer.h" #include "minecraft/world/entity/item/Minecart.h" #include "minecraft/world/entity/item/MinecartTNT.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/MinecartRenderer.h" +#include "gl3_loader.h" void TntMinecartRenderer::renderMinecartContents( std::shared_ptr _cart, float a, Tile* tile, int tileData) { diff --git a/targets/minecraft/client/renderer/entity/TntRenderer.cpp b/targets/minecraft/client/renderer/entity/TntRenderer.cpp index 284f6371a..cfd5d8dfc 100644 --- a/targets/minecraft/client/renderer/entity/TntRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/TntRenderer.cpp @@ -1,7 +1,5 @@ #include "TntRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -11,6 +9,7 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/item/PrimedTnt.h" #include "minecraft/world/level/tile/Tile.h" +#include "gl3_loader.h" TntRenderer::TntRenderer() { renderer = new TileRenderer(); diff --git a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp index 129137d14..d665bbef9 100644 --- a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp @@ -1,7 +1,5 @@ #include "VillagerGolemRenderer.h" -#include - #include #include #include @@ -12,13 +10,14 @@ #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/renderer/texture/TextureAtlas.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/VillagerGolem.h" #include "minecraft/world/level/tile/PlantTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" +#include "gl3_loader.h" ResourceLocation VillagerGolemRenderer::GOLEM_LOCATION = ResourceLocation(TN_MOB_VILLAGER_GOLEM); diff --git a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp index 9491804dd..19c132b4e 100644 --- a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp @@ -5,11 +5,11 @@ #include "4J.Render/4J_Render.h" #include "minecraft/client/model/VillagerModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation VillagerRenderer::VILLAGER_LOCATION = ResourceLocation(TN_MOB_VILLAGER_VILLAGER); diff --git a/targets/minecraft/client/renderer/entity/WitchRenderer.cpp b/targets/minecraft/client/renderer/entity/WitchRenderer.cpp index e77408df9..58ab5643e 100644 --- a/targets/minecraft/client/renderer/entity/WitchRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitchRenderer.cpp @@ -12,7 +12,6 @@ #include "minecraft/client/renderer/ItemInHandRenderer.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/TileRenderer.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" @@ -21,6 +20,7 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" ResourceLocation WitchRenderer::WITCH_LOCATION = ResourceLocation(TN_MOB_WITCH); diff --git a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp index 053e12a70..783f2b437 100644 --- a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -1,11 +1,20 @@ #include "WitherBossRenderer.h" #include +#include #include "MobRenderer.h" #include "minecraft/client/model/WitherBossModel.h" #include "minecraft/client/renderer/BossMobGuiInfo.h" #include "minecraft/world/entity/boss/wither/WitherBoss.h" +#include "4J_Render.h" +#include "SharedConstants.h" +#include "minecraft/client/model/geom/Model.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "gl3_loader.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" ResourceLocation WitherBossRenderer::WITHER_ARMOR_LOCATION = ResourceLocation(TN_MOB_WITHER_ARMOR); diff --git a/targets/minecraft/client/renderer/entity/WitherBossRenderer.h b/targets/minecraft/client/renderer/entity/WitherBossRenderer.h index fe0a12f73..804df94ed 100644 --- a/targets/minecraft/client/renderer/entity/WitherBossRenderer.h +++ b/targets/minecraft/client/renderer/entity/WitherBossRenderer.h @@ -3,6 +3,7 @@ class WitherBoss; class LivingEntity; +class ResourceLocation; class WitherBossRenderer : public MobRenderer { private: diff --git a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp index c8b313dc4..4ece1a67b 100644 --- a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp @@ -1,7 +1,5 @@ #include "WitherSkullRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -10,6 +8,7 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/projectile/WitherSkull.h" +#include "gl3_loader.h" ResourceLocation WitherSkullRenderer::WITHER_ARMOR_LOCATION( TN_MOB_WITHER_INVULNERABLE); diff --git a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp index 2c5f2e4aa..cd031bce4 100644 --- a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp @@ -7,12 +7,12 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/MobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Sheep.h" #include "minecraft/world/entity/animal/Wolf.h" +#include "minecraft/client/renderer/entity/MobRenderer.h" class Model; diff --git a/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp b/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp index b1bb89c51..72560a7f8 100644 --- a/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp @@ -1,7 +1,6 @@ #include "ZombieRenderer.h" #include - #include #include "java/Class.h" @@ -9,11 +8,11 @@ #include "minecraft/client/model/VillagerZombieModel.h" #include "minecraft/client/model/ZombieModel.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/entity/HumanoidMobRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/monster/Zombie.h" +#include "minecraft/client/renderer/entity/HumanoidMobRenderer.h" ResourceLocation ZombieRenderer::ZOMBIE_PIGMAN_LOCATION(TN_MOB_PIGZOMBIE); ResourceLocation ZombieRenderer::ZOMBIE_LOCATION(TN_MOB_ZOMBIE); diff --git a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp index c76ffff12..658aaae11 100644 --- a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp +++ b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp @@ -7,7 +7,6 @@ #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/BufferedReader.h" #include "minecraft/SharedConstants.h" -#include "minecraft/client/renderer/texture/StitchedTexture.h" #include "minecraft/client/renderer/texture/custom/ClockTexture.h" #include "minecraft/client/renderer/texture/custom/CompassTexture.h" diff --git a/targets/minecraft/client/renderer/texture/Texture.h b/targets/minecraft/client/renderer/texture/Texture.h index d1699f23f..e6bc608d3 100644 --- a/targets/minecraft/client/renderer/texture/Texture.h +++ b/targets/minecraft/client/renderer/texture/Texture.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp index ca27fde7d..ebc15290f 100644 --- a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp @@ -1,7 +1,5 @@ #include "BeaconRenderer.h" -#include - #include #include #include @@ -13,6 +11,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "gl3_loader.h" ResourceLocation BeaconRenderer::BEAM_LOCATION = ResourceLocation(TN_MISC_BEACON_BEAM); diff --git a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp index cbe102a2e..531f6031a 100644 --- a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp @@ -1,7 +1,5 @@ #include "ChestRenderer.h" -#include - #include #include @@ -10,12 +8,13 @@ #include "minecraft/client/model/LargeChestModel.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/client/renderer/Textures.h" -#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/level/tile/ChestTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/ChestTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h" +#include "gl3_loader.h" ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); diff --git a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp index 56721eadd..df07e05d9 100644 --- a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp @@ -1,7 +1,5 @@ #include "EnchantTableRenderer.h" -#include - #include #include #include @@ -13,6 +11,7 @@ #include "minecraft/util/Mth.h" #include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "gl3_loader.h" ResourceLocation EnchantTableRenderer::BOOK_LOCATION = ResourceLocation(TN_ITEM_BOOK); diff --git a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp index ce9362b06..9daf99c2f 100644 --- a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp @@ -1,7 +1,5 @@ #include "EnderChestRenderer.h" -#include - #include #include @@ -12,6 +10,7 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/level/tile/entity/EnderChestTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "gl3_loader.h" ResourceLocation EnderChestRenderer::ENDER_CHEST_LOCATION = ResourceLocation(TN_TILE_ENDER_CHEST); diff --git a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp index c85d4d712..a85e8459e 100644 --- a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp @@ -1,7 +1,5 @@ #include "PistonPieceRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -17,6 +15,7 @@ #include "minecraft/world/level/tile/entity/TileEntity.h" #include "minecraft/world/level/tile/piston/PistonBaseTile.h" #include "minecraft/world/level/tile/piston/PistonExtensionTile.h" +#include "gl3_loader.h" ResourceLocation PistonPieceRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index 6cf321e9c..50324dcac 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -1,16 +1,25 @@ #include "SignRenderer.h" +#include +#include +#include + #include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/include/stdafx.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" -#include "minecraft/client/gui/Gui.h" #include "minecraft/client/model/SignModel.h" #include "minecraft/client/model/geom/ModelPart.h" -#include "minecraft/world/entity/Entity.h" -#include "minecraft/world/level/Level.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "4J_Render.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "minecraft/client/renderer/Textures.h" +#include "minecraft/client/resources/ResourceLocation.h" +#include "gl3_loader.h" +#include "strings.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" ResourceLocation SignRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.h b/targets/minecraft/client/renderer/tileentity/SignRenderer.h index 4c2b4a27b..9ff45fa35 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.h @@ -1,6 +1,8 @@ #pragma once #include "TileEntityRenderer.h" + class SignModel; +class ResourceLocation; class SignRenderer : public TileEntityRenderer { private: diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index 98549c5a2..15f6ce04c 100644 --- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -1,7 +1,5 @@ #include "SkullTileRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -10,11 +8,12 @@ #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/renderer/entity/PlayerRenderer.h" -#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/level/tile/SkullTile.h" #include "minecraft/world/level/tile/entity/SkullTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h" +#include "gl3_loader.h" SkullTileRenderer* SkullTileRenderer::instance = nullptr; diff --git a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp index 45a3a6e3f..95cca3a97 100644 --- a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp @@ -1,7 +1,5 @@ #include "TheEndPortalRenderer.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -16,6 +14,7 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "gl3_loader.h" ResourceLocation TheEndPortalRenderer::END_SKY_LOCATION = ResourceLocation(TN_MISC_TUNNEL); diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp index bcb2f22e7..d080c2499 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp @@ -1,7 +1,5 @@ #include "TileEntityRenderDispatcher.h" -#include - #include #include "4J.Render/4J_Render.h" @@ -19,6 +17,7 @@ #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "gl3_loader.h" class Font; class Textures; diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index 80dcbb733..0680111ce 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -2,7 +2,6 @@ #include #include - #include #include "Minecraft.Client/Common/src/Colours/ColourTable.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 9370d8d36..935ec2432 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -6,7 +6,6 @@ #include #include "4J_Input.h" -#include "4J_Profile.h" #include "4J_Storage.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/src/Audio/SoundEngine.h" diff --git a/targets/minecraft/client/skins/DefaultTexturePack.cpp b/targets/minecraft/client/skins/DefaultTexturePack.cpp index 92486603d..327501bdf 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.cpp +++ b/targets/minecraft/client/skins/DefaultTexturePack.cpp @@ -1,8 +1,11 @@ #include "DefaultTexturePack.h" -#include "console_helpers/StringHelpers.h" -#include "minecraft/client/renderer/Textures.h" +#include +#include + +#include "minecraft/client/skins/AbstractTexturePack.h" +#include "java/InputOutputStream/InputStream.h" DefaultTexturePack::DefaultTexturePack() : AbstractTexturePack(0, nullptr, L"Minecraft", nullptr) { diff --git a/targets/minecraft/client/skins/DefaultTexturePack.h b/targets/minecraft/client/skins/DefaultTexturePack.h index 178e0dbe5..637ca2a6e 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.h +++ b/targets/minecraft/client/skins/DefaultTexturePack.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "AbstractTexturePack.h" #include "Minecraft.Client/include/stdafx.h" #include "java/InputOutputStream/InputStream.h" #include "strings.h" +#include "Minecraft.Client/Linux/Linux_App.h" class DefaultTexturePack : public AbstractTexturePack { public: diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index 41ab22d23..77a00133c 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -1,19 +1,21 @@ #include "TexturePackRepository.h" +#include +#include +#include + #include "4J_Input.h" #include "DLCTexturePack.h" #include "DefaultTexturePack.h" -#include "FileTexturePack.h" -#include "FolderTexturePack.h" #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/include/stdafx.h" -#include "console_helpers/StringHelpers.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/client/Options.h" #include "minecraft/client/gui/Minimap.h" -#include "strings.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "minecraft/client/skins/TexturePack.h" TexturePack* TexturePackRepository::DEFAULT_TEXTURE_PACK = nullptr; @@ -42,14 +44,6 @@ TexturePackRepository::TexturePackRepository(File workingDirectory, } void TexturePackRepository::addDebugPacks() { -#if !defined(_CONTENT_PACKAGE) - // File *file = new File(L"DummyTexturePack"); // Path to the test texture - // pack m_dummyTexturePack = new - // FolderTexturePack(FOLDER_TEST_TEXTURE_PACK_ID, L"FolderTestPack", file, - // DEFAULT_TEXTURE_PACK); texturePacks->push_back(m_dummyTexturePack); - // cacheById[m_dummyTexturePack->getId()] = m_dummyTexturePack; - -#endif } void TexturePackRepository::createWorkingDirecoryUnlessExists() { @@ -169,10 +163,6 @@ bool TexturePackRepository::selectTexturePackById(std::uint32_t id) { } else { app.DebugPrintf( "Failed to select texture pack %d as it is not in the list\n", id); -#if !defined(_CONTENT_PACKAGE) - // TODO - 4J Stu: We should report this to the player in some way - //__debugbreak(); -#endif // Fail safely if (selectSkin(DEFAULT_TEXTURE_PACK)) { app.SetAction(InputManager.GetPrimaryPad(), diff --git a/targets/minecraft/client/skins/TexturePackRepository.h b/targets/minecraft/client/skins/TexturePackRepository.h index 81fe815a0..6815a5f67 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.h +++ b/targets/minecraft/client/skins/TexturePackRepository.h @@ -1,11 +1,17 @@ #pragma once #include +#include +#include +#include +#include #include "TexturePack.h" #include "java/File.h" class Minecraft; +class DLCPack; +class TexturePack; class TexturePackRepository { public: diff --git a/targets/minecraft/commands/Command.h b/targets/minecraft/commands/Command.h index 342c10e73..89b67f7cd 100644 --- a/targets/minecraft/commands/Command.h +++ b/targets/minecraft/commands/Command.h @@ -3,10 +3,10 @@ // 4J Stu - Based loosely on the Java versions #include - #include #include #include +#include #include "4J.Common/4J_Compat.h" #include "CommandsEnum.h" diff --git a/targets/minecraft/commands/CommandDispatcher.cpp b/targets/minecraft/commands/CommandDispatcher.cpp index baf022a69..128274383 100644 --- a/targets/minecraft/commands/CommandDispatcher.cpp +++ b/targets/minecraft/commands/CommandDispatcher.cpp @@ -6,6 +6,7 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/commands/Command.h" #include "minecraft/commands/CommandSender.h" +#include "minecraft/commands/CommandsEnum.h" int CommandDispatcher::performCommand(std::shared_ptr sender, EGameCommand command, diff --git a/targets/minecraft/commands/CommandDispatcher.h b/targets/minecraft/commands/CommandDispatcher.h index f80818ffc..35f029b3d 100644 --- a/targets/minecraft/commands/CommandDispatcher.h +++ b/targets/minecraft/commands/CommandDispatcher.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/commands/common/DefaultGameModeCommand.cpp b/targets/minecraft/commands/common/DefaultGameModeCommand.cpp index d18e9baa4..3bd097006 100644 --- a/targets/minecraft/commands/common/DefaultGameModeCommand.cpp +++ b/targets/minecraft/commands/common/DefaultGameModeCommand.cpp @@ -2,6 +2,8 @@ #include +#include "minecraft/commands/CommandsEnum.h" + EGameCommand DefaultGameModeCommand::getId() { return eGameCommand_DefaultGameMode; } diff --git a/targets/minecraft/commands/common/EnchantItemCommand.cpp b/targets/minecraft/commands/common/EnchantItemCommand.cpp index fbddf2127..cf1a451f4 100644 --- a/targets/minecraft/commands/common/EnchantItemCommand.cpp +++ b/targets/minecraft/commands/common/EnchantItemCommand.cpp @@ -16,6 +16,7 @@ #include "minecraft/world/item/enchantment/Enchantment.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" +#include "minecraft/commands/CommandsEnum.h" EGameCommand EnchantItemCommand::getId() { return eGameCommand_EnchantItem; } diff --git a/targets/minecraft/commands/common/ExperienceCommand.cpp b/targets/minecraft/commands/common/ExperienceCommand.cpp index 4e7ae5244..95cc94401 100644 --- a/targets/minecraft/commands/common/ExperienceCommand.cpp +++ b/targets/minecraft/commands/common/ExperienceCommand.cpp @@ -2,6 +2,8 @@ #include +#include "minecraft/commands/CommandsEnum.h" + EGameCommand ExperienceCommand::getId() { return eGameCommand_Experience; } int ExperienceCommand::getPermissionLevel() { return LEVEL_GAMEMASTERS; } diff --git a/targets/minecraft/commands/common/GameModeCommand.cpp b/targets/minecraft/commands/common/GameModeCommand.cpp index b84990658..647d81995 100644 --- a/targets/minecraft/commands/common/GameModeCommand.cpp +++ b/targets/minecraft/commands/common/GameModeCommand.cpp @@ -1,5 +1,7 @@ #include "GameModeCommand.h" +#include "minecraft/commands/CommandsEnum.h" + class CommandSender; EGameCommand GameModeCommand::getId() { return eGameCommand_GameMode; } diff --git a/targets/minecraft/commands/common/GiveItemCommand.cpp b/targets/minecraft/commands/common/GiveItemCommand.cpp index 928313e54..2f7a9ef60 100644 --- a/targets/minecraft/commands/common/GiveItemCommand.cpp +++ b/targets/minecraft/commands/common/GiveItemCommand.cpp @@ -14,6 +14,7 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/commands/CommandsEnum.h" EGameCommand GiveItemCommand::getId() { return eGameCommand_Give; } diff --git a/targets/minecraft/commands/common/KillCommand.cpp b/targets/minecraft/commands/common/KillCommand.cpp index efed50402..01255cbab 100644 --- a/targets/minecraft/commands/common/KillCommand.cpp +++ b/targets/minecraft/commands/common/KillCommand.cpp @@ -7,6 +7,7 @@ #include "minecraft/commands/CommandSender.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/commands/CommandsEnum.h" EGameCommand KillCommand::getId() { return eGameCommand_Kill; } diff --git a/targets/minecraft/commands/common/TimeCommand.cpp b/targets/minecraft/commands/common/TimeCommand.cpp index b26147009..461460436 100644 --- a/targets/minecraft/commands/common/TimeCommand.cpp +++ b/targets/minecraft/commands/common/TimeCommand.cpp @@ -10,6 +10,8 @@ #include "minecraft/network/packet/ChatPacket.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/level/ServerLevel.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/network/packet/GameCommandPacket.h" class CommandSender; diff --git a/targets/minecraft/commands/common/ToggleDownfallCommand.cpp b/targets/minecraft/commands/common/ToggleDownfallCommand.cpp index dd17303ad..beb704b32 100644 --- a/targets/minecraft/commands/common/ToggleDownfallCommand.cpp +++ b/targets/minecraft/commands/common/ToggleDownfallCommand.cpp @@ -8,6 +8,7 @@ #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/level/ServerLevel.h" #include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/commands/CommandsEnum.h" EGameCommand ToggleDownfallCommand::getId() { return eGameCommand_ToggleDownfall; diff --git a/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp b/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp index 0f1987ea6..456cd726d 100644 --- a/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp +++ b/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp @@ -2,7 +2,6 @@ #include "java/Class.h" #include "minecraft/core/BlockSource.h" -#include "minecraft/core/DefaultDispenseItemBehavior.h" #include "minecraft/core/FacingEnum.h" #include "minecraft/core/Position.h" #include "minecraft/world/entity/Entity.h" @@ -11,6 +10,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/DispenserTile.h" #include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" std::shared_ptr AbstractProjectileDispenseBehavior::execute( BlockSource* source, std::shared_ptr dispensed, diff --git a/targets/minecraft/core/DefaultDispenseItemBehavior.cpp b/targets/minecraft/core/DefaultDispenseItemBehavior.cpp index af1a9b8ea..103c3c3af 100644 --- a/targets/minecraft/core/DefaultDispenseItemBehavior.cpp +++ b/targets/minecraft/core/DefaultDispenseItemBehavior.cpp @@ -8,6 +8,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/DispenserTile.h" #include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/item/ItemInstance.h" std::shared_ptr DefaultDispenseItemBehavior::dispense( BlockSource* source, std::shared_ptr dispensed) { diff --git a/targets/minecraft/core/ItemDispenseBehaviors.cpp b/targets/minecraft/core/ItemDispenseBehaviors.cpp index 437026ec9..4b3a317ae 100644 --- a/targets/minecraft/core/ItemDispenseBehaviors.cpp +++ b/targets/minecraft/core/ItemDispenseBehaviors.cpp @@ -7,9 +7,7 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" -#include "minecraft/core/AbstractProjectileDispenseBehavior.h" #include "minecraft/core/BlockSource.h" -#include "minecraft/core/DefaultDispenseItemBehavior.h" #include "minecraft/core/FacingEnum.h" #include "minecraft/core/Position.h" #include "minecraft/world/entity/Entity.h" @@ -35,6 +33,8 @@ #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/core/AbstractProjectileDispenseBehavior.h" +#include "minecraft/core/DefaultDispenseItemBehavior.h" /* Arrow */ diff --git a/targets/minecraft/locale/I18n.h b/targets/minecraft/locale/I18n.h index 47d8f1b08..d61b070e3 100644 --- a/targets/minecraft/locale/I18n.h +++ b/targets/minecraft/locale/I18n.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include "Language.h" diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index dfddee740..af308d626 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -1,17 +1,14 @@ #include "Connection.h" #include -#include - #include +#include +#include #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" #include "console_helpers/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" @@ -22,6 +19,7 @@ #include "minecraft/network/packet/KeepAlivePacket.h" #include "minecraft/network/packet/Packet.h" #include "minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/DisconnectPacket.h" class SocketAddress; diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h index ccc525bc9..dec4f8c6e 100644 --- a/targets/minecraft/network/Connection.h +++ b/targets/minecraft/network/Connection.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/network/packet/AddEntityPacket.h b/targets/minecraft/network/packet/AddEntityPacket.h index 61d5b9f1f..f4dd88335 100644 --- a/targets/minecraft/network/packet/AddEntityPacket.h +++ b/targets/minecraft/network/packet/AddEntityPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include "Packet.h" diff --git a/targets/minecraft/network/packet/AddMobPacket.cpp b/targets/minecraft/network/packet/AddMobPacket.cpp index f406758b1..be8fae185 100644 --- a/targets/minecraft/network/packet/AddMobPacket.cpp +++ b/targets/minecraft/network/packet/AddMobPacket.cpp @@ -2,7 +2,6 @@ #include -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/AddMobPacket.h b/targets/minecraft/network/packet/AddMobPacket.h index abb1777cc..1186f87f7 100644 --- a/targets/minecraft/network/packet/AddMobPacket.h +++ b/targets/minecraft/network/packet/AddMobPacket.h @@ -1,9 +1,9 @@ #pragma once #include - #include #include +#include #include "Packet.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/network/packet/AddPlayerPacket.cpp b/targets/minecraft/network/packet/AddPlayerPacket.cpp index 6f12dd437..b3275acc1 100644 --- a/targets/minecraft/network/packet/AddPlayerPacket.cpp +++ b/targets/minecraft/network/packet/AddPlayerPacket.cpp @@ -2,9 +2,6 @@ #include -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/AddPlayerPacket.h b/targets/minecraft/network/packet/AddPlayerPacket.h index c5b150098..f06c97790 100644 --- a/targets/minecraft/network/packet/AddPlayerPacket.h +++ b/targets/minecraft/network/packet/AddPlayerPacket.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "4J.Common/4J_Compat.h" #include "Packet.h" diff --git a/targets/minecraft/network/packet/AwardStatPacket.h b/targets/minecraft/network/packet/AwardStatPacket.h index 7457a8b42..41d2acaa8 100644 --- a/targets/minecraft/network/packet/AwardStatPacket.h +++ b/targets/minecraft/network/packet/AwardStatPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.h b/targets/minecraft/network/packet/BlockRegionUpdatePacket.h index d1def51ea..fa3f26fc6 100644 --- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.h +++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/network/packet/ChatPacket.cpp b/targets/minecraft/network/packet/ChatPacket.cpp index 96d9dadca..e61694e92 100644 --- a/targets/minecraft/network/packet/ChatPacket.cpp +++ b/targets/minecraft/network/packet/ChatPacket.cpp @@ -4,7 +4,6 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/SharedConstants.h" -#include "minecraft/network/packet/ChatPacket.h" #include "minecraft/world/entity/player/Player.h" // longest allowed string is "<" + name + "> " + message diff --git a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h index 9a4ff03be..7334fbda9 100644 --- a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h +++ b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.h b/targets/minecraft/network/packet/CustomPayloadPacket.h index cfd6a7b6a..a0cbc60bb 100644 --- a/targets/minecraft/network/packet/CustomPayloadPacket.h +++ b/targets/minecraft/network/packet/CustomPayloadPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/network/packet/DisconnectPacket.cpp b/targets/minecraft/network/packet/DisconnectPacket.cpp index f1cfeebec..22071b3cd 100644 --- a/targets/minecraft/network/packet/DisconnectPacket.cpp +++ b/targets/minecraft/network/packet/DisconnectPacket.cpp @@ -1,13 +1,11 @@ #include "minecraft/network/packet/DisconnectPacket.h" #include - #include #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "minecraft/network/packet/DisconnectPacket.h" DisconnectPacket::DisconnectPacket() { reason = eDisconnect_None; } diff --git a/targets/minecraft/network/packet/DisconnectPacket.h b/targets/minecraft/network/packet/DisconnectPacket.h index 2c4fa45f7..fee11fb92 100644 --- a/targets/minecraft/network/packet/DisconnectPacket.h +++ b/targets/minecraft/network/packet/DisconnectPacket.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Packet.h" class DisconnectPacket : public Packet, diff --git a/targets/minecraft/network/packet/EntityEventPacket.h b/targets/minecraft/network/packet/EntityEventPacket.h index aa2668839..0b9904cc0 100644 --- a/targets/minecraft/network/packet/EntityEventPacket.h +++ b/targets/minecraft/network/packet/EntityEventPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include "Packet.h" diff --git a/targets/minecraft/network/packet/ExplodePacket.cpp b/targets/minecraft/network/packet/ExplodePacket.cpp index 8a93da9e2..3cadcc2ed 100644 --- a/targets/minecraft/network/packet/ExplodePacket.cpp +++ b/targets/minecraft/network/packet/ExplodePacket.cpp @@ -6,6 +6,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/TilePos.h" ExplodePacket::ExplodePacket() { x = 0; diff --git a/targets/minecraft/network/packet/GameCommandPacket.h b/targets/minecraft/network/packet/GameCommandPacket.h index cd484e750..df6fcc2dc 100644 --- a/targets/minecraft/network/packet/GameCommandPacket.h +++ b/targets/minecraft/network/packet/GameCommandPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/network/packet/GameEventPacket.cpp b/targets/minecraft/network/packet/GameEventPacket.cpp index 846d1b8a3..b1f77e703 100644 --- a/targets/minecraft/network/packet/GameEventPacket.cpp +++ b/targets/minecraft/network/packet/GameEventPacket.cpp @@ -1,9 +1,11 @@ #include "GameEventPacket.h" -#include +#include #include "PacketListener.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "strings.h" const int GameEventPacket::NO_RESPAWN_BED_AVAILABLE = 0; const int GameEventPacket::START_RAINING = 1; diff --git a/targets/minecraft/network/packet/GameEventPacket.h b/targets/minecraft/network/packet/GameEventPacket.h index e2b6038e6..e2a4e7795 100644 --- a/targets/minecraft/network/packet/GameEventPacket.h +++ b/targets/minecraft/network/packet/GameEventPacket.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "Packet.h" class GameEventPacket : public Packet, diff --git a/targets/minecraft/network/packet/LoginPacket.cpp b/targets/minecraft/network/packet/LoginPacket.cpp index 425a57f12..d2c7db2cb 100644 --- a/targets/minecraft/network/packet/LoginPacket.cpp +++ b/targets/minecraft/network/packet/LoginPacket.cpp @@ -1,9 +1,6 @@ #include "LoginPacket.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/MoveEntityPacket.cpp b/targets/minecraft/network/packet/MoveEntityPacket.cpp index b97abfe69..b227cab6b 100644 --- a/targets/minecraft/network/packet/MoveEntityPacket.cpp +++ b/targets/minecraft/network/packet/MoveEntityPacket.cpp @@ -6,6 +6,7 @@ #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/network/packet/Packet.h" MoveEntityPacket::MoveEntityPacket() { hasRot = false; diff --git a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp index fea5d4549..731da2d84 100644 --- a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp +++ b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp @@ -6,6 +6,7 @@ #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/network/packet/Packet.h" MoveEntityPacketSmall::MoveEntityPacketSmall() { hasRot = false; diff --git a/targets/minecraft/network/packet/Packet.cpp b/targets/minecraft/network/packet/Packet.cpp index 4c357b5e2..ae0dc2800 100644 --- a/targets/minecraft/network/packet/Packet.cpp +++ b/targets/minecraft/network/packet/Packet.cpp @@ -3,8 +3,6 @@ #include #include #include - -#include #include #include #include @@ -62,7 +60,6 @@ #include "minecraft/network/packet/MoveEntityPacket.h" #include "minecraft/network/packet/MoveEntityPacketSmall.h" #include "minecraft/network/packet/MovePlayerPacket.h" -#include "minecraft/network/packet/Packet.h" #include "minecraft/network/packet/PlayerAbilitiesPacket.h" #include "minecraft/network/packet/PlayerActionPacket.h" #include "minecraft/network/packet/PlayerCommandPacket.h" diff --git a/targets/minecraft/network/packet/Packet.h b/targets/minecraft/network/packet/Packet.h index c3adf31b6..28bf21aca 100644 --- a/targets/minecraft/network/packet/Packet.h +++ b/targets/minecraft/network/packet/Packet.h @@ -1,6 +1,12 @@ #pragma once +#include #include +#include +#include +#include +#include +#include #include "nbt/CompoundTag.h" @@ -8,6 +14,7 @@ class Packet; class PacketListener; class DataInputStream; class DataOutputStream; +class CompoundTag; #define PACKET_ENABLE_STAT_TRACKING 0 diff --git a/targets/minecraft/network/packet/PacketListener.cpp b/targets/minecraft/network/packet/PacketListener.cpp index bce54a9cd..4ed4ab5a0 100644 --- a/targets/minecraft/network/packet/PacketListener.cpp +++ b/targets/minecraft/network/packet/PacketListener.cpp @@ -87,6 +87,7 @@ #include "minecraft/network/packet/UpdateProgressPacket.h" #include "minecraft/network/packet/UseItemPacket.h" #include "minecraft/network/packet/XZPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" void PacketListener::handleBlockRegionUpdate( std::shared_ptr packet) {} diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp index a05dc91da..6047e4c17 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.cpp +++ b/targets/minecraft/network/packet/PreLoginPacket.cpp @@ -3,13 +3,13 @@ #include #include -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" PreLoginPacket::PreLoginPacket() { loginKey = L""; diff --git a/targets/minecraft/network/packet/RespawnPacket.h b/targets/minecraft/network/packet/RespawnPacket.h index 3152a8628..dfc8bd9f0 100644 --- a/targets/minecraft/network/packet/RespawnPacket.h +++ b/targets/minecraft/network/packet/RespawnPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include "Packet.h" diff --git a/targets/minecraft/network/packet/RotateHeadPacket.cpp b/targets/minecraft/network/packet/RotateHeadPacket.cpp index b511f465f..970dc34fc 100644 --- a/targets/minecraft/network/packet/RotateHeadPacket.cpp +++ b/targets/minecraft/network/packet/RotateHeadPacket.cpp @@ -2,6 +2,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/network/packet/Packet.h" #include "minecraft/network/packet/PacketListener.h" RotateHeadPacket::RotateHeadPacket() {} diff --git a/targets/minecraft/network/packet/SetEntityDataPacket.h b/targets/minecraft/network/packet/SetEntityDataPacket.h index f8b4a10d9..367eecd53 100644 --- a/targets/minecraft/network/packet/SetEntityDataPacket.h +++ b/targets/minecraft/network/packet/SetEntityDataPacket.h @@ -2,6 +2,7 @@ #include #include +#include #include "Packet.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/network/packet/SetEntityLinkPacket.cpp b/targets/minecraft/network/packet/SetEntityLinkPacket.cpp index 8b2a942e6..8b7891a6a 100644 --- a/targets/minecraft/network/packet/SetEntityLinkPacket.cpp +++ b/targets/minecraft/network/packet/SetEntityLinkPacket.cpp @@ -4,6 +4,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/entity/Entity.h" +#include "minecraft/network/packet/Packet.h" SetEntityLinkPacket::SetEntityLinkPacket() { sourceId = -1; diff --git a/targets/minecraft/network/packet/SetEntityMotionPacket.cpp b/targets/minecraft/network/packet/SetEntityMotionPacket.cpp index 3baadb1cb..59697fd4c 100644 --- a/targets/minecraft/network/packet/SetEntityMotionPacket.cpp +++ b/targets/minecraft/network/packet/SetEntityMotionPacket.cpp @@ -4,6 +4,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/entity/Entity.h" +#include "minecraft/network/packet/Packet.h" void SetEntityMotionPacket::_init(int id, double xd, double yd, double zd) { this->id = id; diff --git a/targets/minecraft/network/packet/SetEquippedItemPacket.cpp b/targets/minecraft/network/packet/SetEquippedItemPacket.cpp index 87e6f22bd..bb8da2255 100644 --- a/targets/minecraft/network/packet/SetEquippedItemPacket.cpp +++ b/targets/minecraft/network/packet/SetEquippedItemPacket.cpp @@ -3,6 +3,8 @@ #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/world/item/ItemInstance.h" SetEquippedItemPacket::SetEquippedItemPacket() { entity = 0; diff --git a/targets/minecraft/network/packet/SetTimePacket.h b/targets/minecraft/network/packet/SetTimePacket.h index ab790243a..27b85e54a 100644 --- a/targets/minecraft/network/packet/SetTimePacket.h +++ b/targets/minecraft/network/packet/SetTimePacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include "Packet.h" diff --git a/targets/minecraft/network/packet/TeleportEntityPacket.cpp b/targets/minecraft/network/packet/TeleportEntityPacket.cpp index a8d9039c2..8c82c85db 100644 --- a/targets/minecraft/network/packet/TeleportEntityPacket.cpp +++ b/targets/minecraft/network/packet/TeleportEntityPacket.cpp @@ -5,6 +5,7 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" +#include "minecraft/network/packet/Packet.h" TeleportEntityPacket::TeleportEntityPacket() { id = -1; diff --git a/targets/minecraft/network/packet/TeleportEntityPacket.h b/targets/minecraft/network/packet/TeleportEntityPacket.h index 8290565f8..bb55143d7 100644 --- a/targets/minecraft/network/packet/TeleportEntityPacket.h +++ b/targets/minecraft/network/packet/TeleportEntityPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include "Packet.h" diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.h b/targets/minecraft/network/packet/TextureAndGeometryPacket.h index 9eb4a96de..a79b00742 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "Minecraft.Client/include/SkinBox.h" #include "Packet.h" diff --git a/targets/minecraft/network/packet/TileDestructionPacket.cpp b/targets/minecraft/network/packet/TileDestructionPacket.cpp index a7ce9f82b..39dc9249b 100644 --- a/targets/minecraft/network/packet/TileDestructionPacket.cpp +++ b/targets/minecraft/network/packet/TileDestructionPacket.cpp @@ -3,6 +3,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/PacketListener.h" +#include "minecraft/network/packet/Packet.h" TileDestructionPacket::TileDestructionPacket() { id = 0; diff --git a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp index f738a4c6f..9ce3f1113 100644 --- a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp +++ b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp @@ -7,6 +7,7 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" UpdateAttributesPacket::UpdateAttributesPacket() { entityId = 0; } diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h index 844e81b67..d0bc39628 100644 --- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp b/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp index add5f3577..df1ba6ce2 100644 --- a/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp +++ b/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp @@ -6,6 +6,7 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/network/packet/Packet.h" UpdateMobEffectPacket::UpdateMobEffectPacket() { entityId = 0; diff --git a/targets/minecraft/network/packet/UseItemPacket.cpp b/targets/minecraft/network/packet/UseItemPacket.cpp index b29400dea..2ae8f2abe 100644 --- a/targets/minecraft/network/packet/UseItemPacket.cpp +++ b/targets/minecraft/network/packet/UseItemPacket.cpp @@ -3,6 +3,7 @@ #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" +#include "minecraft/world/item/ItemInstance.h" const float UseItemPacket::CLICK_ACCURACY = 16.0f; diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index c70af7db2..3226f1525 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -1,34 +1,65 @@ #include "MinecraftServer.h" +#include +#include #include #include #include +#include +#include +#include #include "ConsoleInput.h" #include "DispenserBootstrap.h" -#include "Minecraft.Client/include/stdafx.h" #include "PlayerList.h" #include "Settings.h" #include "console_helpers/PlatformTime.h" -#include "console_helpers/StringHelpers.h" #include "java/System.h" #include "minecraft/Pos.h" #include "minecraft/client/Options.h" #include "minecraft/commands/Command.h" -#include "minecraft/network/net.minecraft.network.h" #include "minecraft/server/level/DerivedServerLevel.h" #include "minecraft/server/level/EntityTracker.h" #include "minecraft/server/level/ServerChunkCache.h" #include "minecraft/server/level/ServerLevel.h" -#include "minecraft/server/level/ServerLevelListener.h" #include "minecraft/server/network/ServerConnection.h" -#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/phys/AABB.h" -#include "minecraft/world/phys/Vec3.h" +#include "4J.Common/4J_Compat.h" +#include "4J_Profile.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/File.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/InputOutputStream/FileOutputStream.h" +#include "java/Random.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/ServerSettingsChangedPacket.h" +#include "minecraft/network/packet/SetTimePacket.h" +#include "minecraft/network/packet/UpdateProgressPacket.h" +#include "strings.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/LevelType.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/storage/McRegionLevelStorage.h" +#include "minecraft/world/level/storage/McRegionLevelStorageSource.h" +#include "minecraft/world/level/tile/Tile.h" #if defined(SPLIT_SAVES) #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #endif @@ -38,15 +69,12 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "console_helpers/ThreadName.h" #include "console_helpers/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/renderer/GameRenderer.h" #include "minecraft/server/commands/ServerCommandDispatcher.h" -#include "minecraft/server/level/PlayerChunkMap.h" #include "minecraft/server/level/ServerPlayer.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/BiomeSource.h" #include "minecraft/world/level/chunk/CompressedTileStorage.h" @@ -54,6 +82,8 @@ #include "minecraft/world/level/chunk/SparseLightStorage.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" +class ConsoleInputSource; + #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 // 4J Added diff --git a/targets/minecraft/server/MinecraftServer.h b/targets/minecraft/server/MinecraftServer.h index 75fdbcda3..9b062d894 100644 --- a/targets/minecraft/server/MinecraftServer.h +++ b/targets/minecraft/server/MinecraftServer.h @@ -1,6 +1,10 @@ #pragma once #include #include +#include +#include +#include +#include #include "ConsoleInputSource.h" #include "console_helpers/C4JThread.h" @@ -22,6 +26,10 @@ class ProgressRenderer; class CommandDispatcher; class LevelGenerationOptions; class ServerLevel; +class File; +class Level; +class Player; +class Pos; #define MINECRAFT_SERVER_SLOW_QUEUE_DELAY 250 diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 34ae44bb1..3561bc95a 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -1,19 +1,20 @@ #include "PlayerList.h" +#include +#include #include #include +#include +#include #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/include/stdafx.h" #include "MinecraftServer.h" #include "Settings.h" #include "java/JavaMath.h" #include "minecraft/Pos.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "minecraft/network/net.minecraft.network.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" #include "minecraft/server/level/EntityTracker.h" #include "minecraft/server/level/PlayerChunkMap.h" #include "minecraft/server/level/ServerChunkCache.h" @@ -25,12 +26,56 @@ #include "minecraft/server/network/ServerConnection.h" #include "minecraft/util/ProgressListener.h" #include "minecraft/world/entity/EntityIO.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "minecraft/world/level/levelgen/HellRandomLevelSource.h" -#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "4J_Profile.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "console_helpers/Definitions.h" +#include "java/Class.h" +#include "nbt/CompoundTag.h" +#include "minecraft/network/Connection.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/LoginPacket.h" +#include "minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "minecraft/network/packet/PlayerInfoPacket.h" +#include "minecraft/network/packet/RespawnPacket.h" +#include "minecraft/network/packet/SetCarriedItemPacket.h" +#include "minecraft/network/packet/SetExperiencePacket.h" +#include "minecraft/network/packet/SetSpawnPositionPacket.h" +#include "minecraft/network/packet/SetTimePacket.h" +#include "minecraft/network/packet/TextureAndGeometryPacket.h" +#include "minecraft/network/packet/TexturePacket.h" +#include "minecraft/network/packet/UpdateMobEffectPacket.h" +#include "minecraft/network/packet/XZPacket.h" +#include "strings.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/PortalForcer.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/storage/PlayerIO.h" + +class MobEffectInstance; // 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/targets/minecraft/server/PlayerList.h b/targets/minecraft/server/PlayerList.h index 4ad758022..bc7bd46e2 100644 --- a/targets/minecraft/server/PlayerList.h +++ b/targets/minecraft/server/PlayerList.h @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include "4J.Common/4J_Compat.h" #include "nbt/CompoundTag.h" @@ -26,6 +28,7 @@ class Entity; class Pos; class Player; class Level; +class CompoundTag; class PlayerList { private: diff --git a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp index 503747327..614b3c31b 100644 --- a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp +++ b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp @@ -17,6 +17,7 @@ #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" #include "minecraft/server/level/ServerPlayer.h" +#include "minecraft/network/packet/ChatPacket.h" ServerCommandDispatcher::ServerCommandDispatcher() { addCommand(new TimeCommand()); diff --git a/targets/minecraft/server/commands/TeleportCommand.cpp b/targets/minecraft/server/commands/TeleportCommand.cpp index 2dcf44f3b..1c9b12b8e 100644 --- a/targets/minecraft/server/commands/TeleportCommand.cpp +++ b/targets/minecraft/server/commands/TeleportCommand.cpp @@ -14,6 +14,8 @@ #include "minecraft/server/network/PlayerConnection.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/network/packet/GameCommandPacket.h" EGameCommand TeleportCommand::getId() { return eGameCommand_Teleport; } diff --git a/targets/minecraft/server/level/DerivedServerLevel.cpp b/targets/minecraft/server/level/DerivedServerLevel.cpp index 5ad1de97f..c41db9759 100644 --- a/targets/minecraft/server/level/DerivedServerLevel.cpp +++ b/targets/minecraft/server/level/DerivedServerLevel.cpp @@ -1,8 +1,8 @@ #include "DerivedServerLevel.h" -#include "minecraft/server/level/ServerLevel.h" #include "minecraft/world/level/storage/DerivedLevelData.h" #include "minecraft/world/level/storage/SavedDataStorage.h" +#include "minecraft/server/level/ServerLevel.h" class LevelSettings; class LevelStorage; diff --git a/targets/minecraft/server/level/EntityTracker.cpp b/targets/minecraft/server/level/EntityTracker.cpp index 648b33e23..9c8d2dc16 100644 --- a/targets/minecraft/server/level/EntityTracker.cpp +++ b/targets/minecraft/server/level/EntityTracker.cpp @@ -1,26 +1,24 @@ #include "EntityTracker.h" +#include +#include #include +#include +#include #include "ServerLevel.h" #include "ServerPlayer.h" #include "TrackedEntity.h" -#include "minecraft/network/net.minecraft.network.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" #include "minecraft/server/network/PlayerConnection.h" -#include "minecraft/util/Mth.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "java/Class.h" +#include "minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" EntityTracker::EntityTracker(ServerLevel* level) { this->level = level; diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp index 1d06c6e35..af6666238 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.cpp +++ b/targets/minecraft/server/level/PlayerChunkMap.cpp @@ -1,7 +1,6 @@ #include "PlayerChunkMap.h" #include - #include #include #include @@ -27,6 +26,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/ChunkPos.h" PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap* pcm) : pos(x, z) { diff --git a/targets/minecraft/server/level/PlayerChunkMap.h b/targets/minecraft/server/level/PlayerChunkMap.h index c74b12912..fbf135e76 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.h +++ b/targets/minecraft/server/level/PlayerChunkMap.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp index 2fd92b7e8..1a178da04 100644 --- a/targets/minecraft/server/level/ServerChunkCache.cpp +++ b/targets/minecraft/server/level/ServerChunkCache.cpp @@ -3,14 +3,10 @@ #include #include #include - #include #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "ServerLevel.h" #include "console_helpers/compression.h" #include "minecraft/server/MinecraftServer.h" @@ -22,6 +18,8 @@ #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage, ChunkSource* source) { diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index 2e849bf09..7e8fb3105 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -1,19 +1,14 @@ #include "ServerLevel.h" -#include +#include #include -#include +#include #include "4J_Input.h" #include "EntityTracker.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" -#include "Minecraft.Client/include/stdafx.h" #include "PlayerChunkMap.h" #include "ServerChunkCache.h" #include "ServerLevelListener.h" @@ -21,35 +16,59 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/DLCTexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" #include "minecraft/server/ServerScoreboard.h" #include "minecraft/server/network/PlayerConnection.h" -#include "minecraft/util/Mth.h" #include "minecraft/util/ProgressListener.h" #include "minecraft/util/WeighedTreasure.h" -#include "minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h" -#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "minecraft/world/entity/item/FallingTile.h" -#include "minecraft/world/entity/item/ItemEntity.h" -#include "minecraft/world/entity/item/PrimedTnt.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/entity/projectile/Arrow.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/scores/ScoreboardSaveData.h" -#include "minecraft/world/scores/net.minecraft.world.scores.h" +#include "4J_Storage.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Pos.h" +#include "java/Class.h" +#include "java/Random.h" +#include "minecraft/network/packet/AddGlobalEntityPacket.h" +#include "minecraft/network/packet/EntityEventPacket.h" +#include "minecraft/network/packet/ExplodePacket.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/LevelParticlesPacket.h" +#include "minecraft/network/packet/TileEventPacket.h" +#include "strings.h" +#include "minecraft/util/WeighedRandom.h" +#include "minecraft/world/entity/ai/village/VillageSiege.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/entity/global/LightningBolt.h" +#include "minecraft/world/entity/npc/Npc.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/Explosion.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/LevelListener.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/MobSpawner.h" +#include "minecraft/world/level/PortalForcer.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/LevelChunk.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/levelgen/feature/BonusChestFeature.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/storage/SavedDataStorage.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/Vec3.h" + +class ChunkStorage; +class MobCategory; +class Packet; +class TexturePack; std::vector ServerLevel::RANDOM_BONUS_ITEMS; diff --git a/targets/minecraft/server/level/ServerLevel.h b/targets/minecraft/server/level/ServerLevel.h index 286d26ce5..f802fd06a 100644 --- a/targets/minecraft/server/level/ServerLevel.h +++ b/targets/minecraft/server/level/ServerLevel.h @@ -1,11 +1,24 @@ #pragma once +#include #include #include #include +#include +#include +#include +#include +#include #include "java/JavaIntHash.h" #include "minecraft/world/level/net.minecraft.world.level.h" +#include "SharedConstants.h" +#include "console_helpers/C4JThread.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/TickNextTickData.h" +#include "minecraft/world/level/TileEventData.h" +#include "minecraft/world/level/biome/Biome.h" class ServerChunkCache; class MinecraftServer; @@ -13,6 +26,14 @@ class Node; class EntityTracker; class PlayerChunkMap; class WeighedTreasure; +class LevelSettings; +class LevelStorage; +class MobCategory; +class MobSpawner; +class PortalForcer; +class Pos; +class ProgressListener; +class TileEntity; class ServerLevel : public Level { private: diff --git a/targets/minecraft/server/level/ServerLevelListener.cpp b/targets/minecraft/server/level/ServerLevelListener.cpp index 667515baf..335ba854b 100644 --- a/targets/minecraft/server/level/ServerLevelListener.cpp +++ b/targets/minecraft/server/level/ServerLevelListener.cpp @@ -16,6 +16,7 @@ #include "minecraft/server/network/PlayerConnection.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/core/particles/ParticleTypes.h" ServerLevelListener::ServerLevelListener(MinecraftServer* server, ServerLevel* level) { diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index 0c4ccb99f..70c7fc12d 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -1,7 +1,11 @@ #include "ServerPlayer.h" +#include +#include #include #include +#include +#include #include "4J_Input.h" #include "EntityTracker.h" @@ -14,28 +18,97 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/renderer/LevelRenderer.h" -#include "minecraft/locale/net.minecraft.locale.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" -#include "minecraft/server/Settings.h" #include "minecraft/server/network/PlayerConnection.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" #include "minecraft/world/level/chunk/LevelChunk.h" -#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h" -#include "minecraft/world/scores/net.minecraft.world.scores.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/System.h" +#include "nbt/CompoundTag.h" +#include "minecraft/network/packet/AnimatePacket.h" +#include "minecraft/network/packet/AwardStatPacket.h" +#include "minecraft/network/packet/BlockRegionUpdatePacket.h" +#include "minecraft/network/packet/ContainerClosePacket.h" +#include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/network/packet/ContainerSetContentPacket.h" +#include "minecraft/network/packet/ContainerSetDataPacket.h" +#include "minecraft/network/packet/ContainerSetSlotPacket.h" +#include "minecraft/network/packet/CustomPayloadPacket.h" +#include "minecraft/network/packet/EntityActionAtPositionPacket.h" +#include "minecraft/network/packet/EntityEventPacket.h" +#include "minecraft/network/packet/GameEventPacket.h" +#include "minecraft/network/packet/Packet.h" +#include "minecraft/network/packet/PlayerAbilitiesPacket.h" +#include "minecraft/network/packet/RemoveEntitiesPacket.h" +#include "minecraft/network/packet/RemoveMobEffectPacket.h" +#include "minecraft/network/packet/SetEntityLinkPacket.h" +#include "minecraft/network/packet/SetExperiencePacket.h" +#include "minecraft/network/packet/SetHealthPacket.h" +#include "minecraft/network/packet/TileEditorOpenPacket.h" +#include "minecraft/network/packet/UpdateMobEffectPacket.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/stats/Stat.h" +#include "strings.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/damageSource/CombatTracker.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/item/MinecartHopper.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/AnvilMenu.h" +#include "minecraft/world/inventory/BeaconMenu.h" +#include "minecraft/world/inventory/BrewingStandMenu.h" +#include "minecraft/world/inventory/ContainerMenu.h" +#include "minecraft/world/inventory/CraftingMenu.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" +#include "minecraft/world/inventory/FireworksMenu.h" +#include "minecraft/world/inventory/FurnaceMenu.h" +#include "minecraft/world/inventory/HopperMenu.h" +#include "minecraft/world/inventory/HorseInventoryMenu.h" +#include "minecraft/world/inventory/MerchantMenu.h" +#include "minecraft/world/inventory/ResultSlot.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/TrapMenu.h" +#include "minecraft/world/item/ComplexItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSettings.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/storage/LevelData.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/scores/Score.h" +#include "minecraft/world/scores/Scoreboard.h" +#include "minecraft/world/scores/criteria/ObjectiveCriteria.h" +#include "minecraft/world/inventory/MerchantContainer.h" + +class Objective; ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, const std::wstring& name, diff --git a/targets/minecraft/server/level/ServerPlayer.h b/targets/minecraft/server/level/ServerPlayer.h index 1f1361497..c3f5faa21 100644 --- a/targets/minecraft/server/level/ServerPlayer.h +++ b/targets/minecraft/server/level/ServerPlayer.h @@ -1,10 +1,19 @@ #pragma once +#include #include +#include +#include +#include +#include #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" #include "minecraft/world/level/ChunkPos.h" +#include "minecraft/commands/CommandsEnum.h" +#include "java/Class.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/world/entity/player/Player.h" class PlayerConnection; class MinecraftServer; @@ -20,6 +29,10 @@ class BeaconTileEntity; class EntityHorse; class Merchant; class ServerLevel; +class AbstractContainerMenu; +class Biome; +class GameType; +class Pos; class ServerPlayer : public Player, public net_minecraft_world_inventory::ContainerListener { diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index 83df78c68..95d143104 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -1,20 +1,16 @@ #include "TrackedEntity.h" #include -#include #include #include - #include #include +#include #include "4J.Common/4J_Compat.h" #include "EntityTracker.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "ServerPlayer.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" @@ -38,7 +34,6 @@ #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" #include "minecraft/server/network/PlayerConnection.h" -#include "minecraft/util/Mth.h" #include "minecraft/world/entity/Creature.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/ExperienceOrb.h" @@ -59,6 +54,7 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/MapItem.h" #include "minecraft/world/level/saveddata/MapItemSavedData.h" +#include "minecraft/world/entity/player/Player.h" class AttributeInstance; class MobEffectInstance; diff --git a/targets/minecraft/server/level/TrackedEntity.h b/targets/minecraft/server/level/TrackedEntity.h index 2569ff888..44fe21884 100644 --- a/targets/minecraft/server/level/TrackedEntity.h +++ b/targets/minecraft/server/level/TrackedEntity.h @@ -2,6 +2,7 @@ #include #include #include +#include // class ServerPlayer; #include "ServerPlayer.h" diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index 3134bd5c1..d83c5b259 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -1,20 +1,16 @@ #include "PendingConnection.h" #include - #include #include #include "4J.Common/4J_Compat.h" #include "4J_Storage.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "PlayerConnection.h" #include "ServerConnection.h" #include "java/Random.h" @@ -25,6 +21,9 @@ #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" #include "minecraft/server/level/ServerPlayer.h" +#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "minecraft/network/packet/DisconnectPacket.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" class Packet; // #if 0 diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index 1e23f378e..f8c65f97c 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -1,7 +1,6 @@ #include "PlayerConnection.h" #include - #include #include #include @@ -16,9 +15,7 @@ #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" #include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "ServerConnection.h" #include "java/Class.h" #include "java/InputOutputStream/ByteArrayInputStream.h" @@ -102,6 +99,7 @@ #include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/network/packet/DisconnectPacket.h" class SavedData; diff --git a/targets/minecraft/stats/Achievement.cpp b/targets/minecraft/stats/Achievement.cpp index 6643d2e1f..89962f9d2 100644 --- a/targets/minecraft/stats/Achievement.cpp +++ b/targets/minecraft/stats/Achievement.cpp @@ -5,8 +5,8 @@ #include "Achievements.h" #include "DescFormatter.h" #include "minecraft/locale/I18n.h" -#include "minecraft/stats/Stat.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/stats/Stat.h" class Item; class Tile; diff --git a/targets/minecraft/stats/CommonStats.cpp b/targets/minecraft/stats/CommonStats.cpp index b2e791216..d26ad7425 100644 --- a/targets/minecraft/stats/CommonStats.cpp +++ b/targets/minecraft/stats/CommonStats.cpp @@ -3,10 +3,10 @@ #include #include "Achievements.h" -#include "minecraft/stats/GenericStats.h" -#include "minecraft/stats/Stats.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/stats/Stats.h" Stat* CommonStats::get_stat(int i) { return Stats::get(i); } diff --git a/targets/minecraft/stats/CommonStats.h b/targets/minecraft/stats/CommonStats.h index 8bb2d0e88..41adbb343 100644 --- a/targets/minecraft/stats/CommonStats.h +++ b/targets/minecraft/stats/CommonStats.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/stats/GenericStats.h b/targets/minecraft/stats/GenericStats.h index 19041b3d6..f8e31f3dd 100644 --- a/targets/minecraft/stats/GenericStats.h +++ b/targets/minecraft/stats/GenericStats.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/stats/Stat.h b/targets/minecraft/stats/Stat.h index 5af20b07e..acaf5b855 100644 --- a/targets/minecraft/stats/Stat.h +++ b/targets/minecraft/stats/Stat.h @@ -1,10 +1,10 @@ #pragma once #include - #include #include #include +#include #include "GenericStats.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/minecraft/stats/Stats.cpp b/targets/minecraft/stats/Stats.cpp index a93ab6ae4..f23d749a3 100644 --- a/targets/minecraft/stats/Stats.cpp +++ b/targets/minecraft/stats/Stats.cpp @@ -7,13 +7,13 @@ #include "GeneralStat.h" #include "ItemStat.h" #include "console_helpers/StringHelpers.h" -#include "minecraft/stats/Stat.h" #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/item/FishingRodItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/MapItem.h" #include "minecraft/world/level/tile/GrassTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/stats/Stat.h" class StatFormatter; diff --git a/targets/minecraft/stats/Stats.h b/targets/minecraft/stats/Stats.h index 8e7244abf..f5954d10e 100644 --- a/targets/minecraft/stats/Stats.h +++ b/targets/minecraft/stats/Stats.h @@ -2,6 +2,7 @@ #include #include +#include #include "Stat.h" diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index 06527f2dc..c7c56bfec 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -10,7 +9,6 @@ #include #include "4J_Profile.h" -#include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/targets/minecraft/util/Mth.cpp b/targets/minecraft/util/Mth.cpp index 1efc5fa4f..8251ed64d 100644 --- a/targets/minecraft/util/Mth.cpp +++ b/targets/minecraft/util/Mth.cpp @@ -1,16 +1,13 @@ #include "minecraft/util/Mth.h" -#include #include #include - #include #include #include #include #include "java/Random.h" -#include "minecraft/util/Mth.h" constexpr size_t SIN_TAB_CNT = 65536; constexpr float SIN_SCALE = SIN_TAB_CNT / (std::numbers::pi_v * 2.0f); diff --git a/targets/minecraft/util/Mth.h b/targets/minecraft/util/Mth.h index 9053758b3..5747465e9 100644 --- a/targets/minecraft/util/Mth.h +++ b/targets/minecraft/util/Mth.h @@ -1,8 +1,10 @@ #pragma once +#include #include #include #include +#include class Random; diff --git a/targets/minecraft/util/WeighedRandom.cpp b/targets/minecraft/util/WeighedRandom.cpp index d6a72d53f..4ee88da58 100644 --- a/targets/minecraft/util/WeighedRandom.cpp +++ b/targets/minecraft/util/WeighedRandom.cpp @@ -1,12 +1,10 @@ #include "minecraft/util/WeighedRandom.h" -#include #include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" -#include "minecraft/util/WeighedRandom.h" int WeighedRandom::getTotalWeight(std::vector* items) { int totalWeight = 0; diff --git a/targets/minecraft/util/WeighedRandom.h b/targets/minecraft/util/WeighedRandom.h index b3247bd22..a5744b7c9 100644 --- a/targets/minecraft/util/WeighedRandom.h +++ b/targets/minecraft/util/WeighedRandom.h @@ -4,6 +4,8 @@ #include "java/Random.h" +class Random; + // 4J - this WeighedRandomItem class was a nested static class within // WeighedRandom, but we need to be able to refer to it externally diff --git a/targets/minecraft/util/WeighedTreasure.cpp b/targets/minecraft/util/WeighedTreasure.cpp index 3f9dff7ef..5ceb16abd 100644 --- a/targets/minecraft/util/WeighedTreasure.cpp +++ b/targets/minecraft/util/WeighedTreasure.cpp @@ -4,6 +4,7 @@ #include "minecraft/world/Container.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" +#include "minecraft/util/WeighedRandom.h" WeighedTreasure::WeighedTreasure(int itemId, int auxValue, int minCount, int maxCount, int weight) diff --git a/targets/minecraft/world/CompoundContainer.cpp b/targets/minecraft/world/CompoundContainer.cpp index bcdbf0be0..a88877a11 100644 --- a/targets/minecraft/world/CompoundContainer.cpp +++ b/targets/minecraft/world/CompoundContainer.cpp @@ -2,6 +2,7 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/network/packet/ContainerOpenPacket.h" +#include "minecraft/world/Container.h" CompoundContainer::CompoundContainer(int name, std::shared_ptr c1, std::shared_ptr c2) { diff --git a/targets/minecraft/world/SimpleContainer.cpp b/targets/minecraft/world/SimpleContainer.cpp index fc5975f14..cd3643c19 100644 --- a/targets/minecraft/world/SimpleContainer.cpp +++ b/targets/minecraft/world/SimpleContainer.cpp @@ -5,6 +5,7 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/world/item/ItemInstance.h" #include "net.minecraft.world.ContainerListener.h" +#include "minecraft/world/Container.h" SimpleContainer::SimpleContainer(int name, std::wstring stringName, bool customName, int size) { diff --git a/targets/minecraft/world/SimpleContainer.h b/targets/minecraft/world/SimpleContainer.h index 50f042cfc..e77f2cf58 100644 --- a/targets/minecraft/world/SimpleContainer.h +++ b/targets/minecraft/world/SimpleContainer.h @@ -3,12 +3,14 @@ #include #include #include +#include #include "Container.h" #include "minecraft/world/Container.h" #include "net.minecraft.world.ContainerListener.h" class ItemInstance; + namespace net_minecraft_world { class ContainerListener; } // namespace net_minecraft_world diff --git a/targets/minecraft/world/damageSource/CombatEntry.cpp b/targets/minecraft/world/damageSource/CombatEntry.cpp index 68d7581ce..d2e942d6e 100644 --- a/targets/minecraft/world/damageSource/CombatEntry.cpp +++ b/targets/minecraft/world/damageSource/CombatEntry.cpp @@ -4,9 +4,9 @@ #include #include "java/Class.h" -#include "minecraft/world/damageSource/CombatTracker.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" +#include "minecraft/world/damageSource/CombatTracker.h" CombatEntry::CombatEntry(DamageSource* source, int time, float health, float damage, CombatTracker::eLOCATION location, diff --git a/targets/minecraft/world/effect/AbsoptionMobEffect.cpp b/targets/minecraft/world/effect/AbsoptionMobEffect.cpp index c301110e0..752c9a00f 100644 --- a/targets/minecraft/world/effect/AbsoptionMobEffect.cpp +++ b/targets/minecraft/world/effect/AbsoptionMobEffect.cpp @@ -2,8 +2,8 @@ #include -#include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/effect/MobEffect.h" AbsoptionMobEffect::AbsoptionMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/targets/minecraft/world/effect/HealthBoostMobEffect.cpp b/targets/minecraft/world/effect/HealthBoostMobEffect.cpp index baf606b80..12836b48b 100644 --- a/targets/minecraft/world/effect/HealthBoostMobEffect.cpp +++ b/targets/minecraft/world/effect/HealthBoostMobEffect.cpp @@ -2,8 +2,8 @@ #include -#include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/effect/MobEffect.h" HealthBoostMobEffect::HealthBoostMobEffect(int id, bool isHarmful, eMinecraftColour color) diff --git a/targets/minecraft/world/effect/MobEffect.cpp b/targets/minecraft/world/effect/MobEffect.cpp index 290079ca3..21f95b080 100644 --- a/targets/minecraft/world/effect/MobEffect.cpp +++ b/targets/minecraft/world/effect/MobEffect.cpp @@ -1,12 +1,33 @@ +#include +#include +#include +#include +#include +#include +#include + #include "minecraft/SharedConstants.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/food/net.minecraft.world.food.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "net.minecraft.world.effect.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "java/Class.h" +#include "strings.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/AbsoptionMobEffect.h" +#include "minecraft/world/effect/AttackDamageMobEffect.h" +#include "minecraft/world/effect/HealthBoostMobEffect.h" +#include "minecraft/world/effect/InstantaneousMobEffect.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/food/FoodData.h" +#include "minecraft/world/level/Level.h" + +class Attribute; MobEffect* MobEffect::effects[NUM_EFFECTS]; diff --git a/targets/minecraft/world/effect/MobEffect.h b/targets/minecraft/world/effect/MobEffect.h index bd40d75ab..bd8fd2350 100644 --- a/targets/minecraft/world/effect/MobEffect.h +++ b/targets/minecraft/world/effect/MobEffect.h @@ -2,6 +2,7 @@ #include #include +#include #include "Minecraft.Client/Common/App_enums.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" diff --git a/targets/minecraft/world/entity/AgeableMob.cpp b/targets/minecraft/world/entity/AgeableMob.cpp index 81736ece5..7ae1b1326 100644 --- a/targets/minecraft/world/entity/AgeableMob.cpp +++ b/targets/minecraft/world/entity/AgeableMob.cpp @@ -6,7 +6,6 @@ #include "java/Class.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/EntityIO.h" -#include "minecraft/world/entity/PathfinderMob.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" @@ -15,6 +14,7 @@ #include "minecraft/world/item/SpawnEggItem.h" #include "minecraft/world/level/Level.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/PathfinderMob.h" class Entity; diff --git a/targets/minecraft/world/entity/DelayedRelease.cpp b/targets/minecraft/world/entity/DelayedRelease.cpp index 555f3ea5b..50c23daf8 100644 --- a/targets/minecraft/world/entity/DelayedRelease.cpp +++ b/targets/minecraft/world/entity/DelayedRelease.cpp @@ -1,6 +1,7 @@ #include "DelayedRelease.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/entity/Entity.h" DelayedRelease::DelayedRelease(Level* level, std::shared_ptr toRelease, int delay) diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp index 8a251f4c9..da7f2a470 100644 --- a/targets/minecraft/world/entity/Entity.cpp +++ b/targets/minecraft/world/entity/Entity.cpp @@ -2,11 +2,9 @@ #include #include - #include #include #include -#include #include #include #include @@ -18,9 +16,6 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "SyncedEntityData.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" @@ -36,7 +31,6 @@ #include "minecraft/sounds/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" -#include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/enchantment/ProtectionEnchantment.h" diff --git a/targets/minecraft/world/entity/Entity.h b/targets/minecraft/world/entity/Entity.h index c516a2a68..cc53d59cc 100644 --- a/targets/minecraft/world/entity/Entity.h +++ b/targets/minecraft/world/entity/Entity.h @@ -2,6 +2,9 @@ #include #include +#include +#include +#include #include "console_helpers/Definitions.h" #include "java/Class.h" @@ -26,6 +29,9 @@ class Explosion; class Tesselator; class Tile; class ItemInstance; +class DoubleTag; +class FloatTag; +template class ListTag; // 4J Stu Added this mainly to allow is to record telemetry for player deaths enum EEntityDamageType { diff --git a/targets/minecraft/world/entity/EntityIO.cpp b/targets/minecraft/world/entity/EntityIO.cpp index 0246b2f78..54f5b2625 100644 --- a/targets/minecraft/world/entity/EntityIO.cpp +++ b/targets/minecraft/world/entity/EntityIO.cpp @@ -1,20 +1,71 @@ #include "EntityIO.h" +#include + #include "Entity.h" #include "Painting.h" #include "java/Class.h" -#include "java/System.h" -#include "minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" #include "minecraft/world/entity/boss/wither/WitherBoss.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "nbt/com.mojang.nbt.h" -#include "net.minecraft.world.entity.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/JavaIntHash.h" +#include "nbt/CompoundTag.h" +#include "strings.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/ItemFrame.h" +#include "minecraft/world/entity/LeashFenceKnotEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/ambient/Bat.h" +#include "minecraft/world/entity/animal/Chicken.h" +#include "minecraft/world/entity/animal/Cow.h" +#include "minecraft/world/entity/animal/EntityHorse.h" +#include "minecraft/world/entity/animal/MushroomCow.h" +#include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/entity/animal/Pig.h" +#include "minecraft/world/entity/animal/Sheep.h" +#include "minecraft/world/entity/animal/SnowMan.h" +#include "minecraft/world/entity/animal/Squid.h" +#include "minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/entity/animal/Wolf.h" +#include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" +#include "minecraft/world/entity/boss/enderdragon/EnderDragon.h" +#include "minecraft/world/entity/item/Boat.h" +#include "minecraft/world/entity/item/FallingTile.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/item/MinecartChest.h" +#include "minecraft/world/entity/item/MinecartFurnace.h" +#include "minecraft/world/entity/item/MinecartHopper.h" +#include "minecraft/world/entity/item/MinecartRideable.h" +#include "minecraft/world/entity/item/MinecartSpawner.h" +#include "minecraft/world/entity/item/MinecartTNT.h" +#include "minecraft/world/entity/item/PrimedTnt.h" +#include "minecraft/world/entity/monster/Blaze.h" +#include "minecraft/world/entity/monster/CaveSpider.h" +#include "minecraft/world/entity/monster/Creeper.h" +#include "minecraft/world/entity/monster/EnderMan.h" +#include "minecraft/world/entity/monster/Ghast.h" +#include "minecraft/world/entity/monster/Giant.h" +#include "minecraft/world/entity/monster/LavaSlime.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/PigZombie.h" +#include "minecraft/world/entity/monster/Silverfish.h" +#include "minecraft/world/entity/monster/Skeleton.h" +#include "minecraft/world/entity/monster/Slime.h" +#include "minecraft/world/entity/monster/Spider.h" +#include "minecraft/world/entity/monster/Witch.h" +#include "minecraft/world/entity/monster/Zombie.h" +#include "minecraft/world/entity/npc/Villager.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/entity/projectile/DragonFireball.h" +#include "minecraft/world/entity/projectile/EyeOfEnderSignal.h" +#include "minecraft/world/entity/projectile/FireworksRocketEntity.h" +#include "minecraft/world/entity/projectile/LargeFireball.h" +#include "minecraft/world/entity/projectile/SmallFireball.h" +#include "minecraft/world/entity/projectile/Snowball.h" +#include "minecraft/world/entity/projectile/ThrownEnderpearl.h" +#include "minecraft/world/entity/projectile/ThrownExpBottle.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#include "minecraft/world/entity/projectile/WitherSkull.h" std::unordered_map* EntityIO::idCreateMap = new std::unordered_map; diff --git a/targets/minecraft/world/entity/EntityIO.h b/targets/minecraft/world/entity/EntityIO.h index a75ddcbae..9ad00800e 100644 --- a/targets/minecraft/world/entity/EntityIO.h +++ b/targets/minecraft/world/entity/EntityIO.h @@ -1,11 +1,20 @@ #pragma once +#include +#include +#include + #include "Entity.h" #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/JavaIntHash.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "java/Class.h" class Level; class CompoundTag; +struct eINSTANCEOFKeyEq; +struct eINSTANCEOFKeyHash; + typedef Entity* (*entityCreateFn)(Level*); class EntityIO { public: diff --git a/targets/minecraft/world/entity/ExperienceOrb.cpp b/targets/minecraft/world/entity/ExperienceOrb.cpp index f49e81e52..ec247fe27 100644 --- a/targets/minecraft/world/entity/ExperienceOrb.cpp +++ b/targets/minecraft/world/entity/ExperienceOrb.cpp @@ -2,7 +2,6 @@ #include #include - #include #include "java/JavaMath.h" @@ -18,6 +17,7 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" const int ExperienceOrb::LIFETIME = 5 * 60 * SharedConstants::TICKS_PER_SECOND; // Five minutes! diff --git a/targets/minecraft/world/entity/FlyingMob.cpp b/targets/minecraft/world/entity/FlyingMob.cpp index 4e2325f8c..a1f1b2184 100644 --- a/targets/minecraft/world/entity/FlyingMob.cpp +++ b/targets/minecraft/world/entity/FlyingMob.cpp @@ -6,6 +6,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Mob.h" FlyingMob::FlyingMob(Level* level) : Mob(level) {} diff --git a/targets/minecraft/world/entity/HangingEntity.cpp b/targets/minecraft/world/entity/HangingEntity.cpp index 278ffe537..868153949 100644 --- a/targets/minecraft/world/entity/HangingEntity.cpp +++ b/targets/minecraft/world/entity/HangingEntity.cpp @@ -1,9 +1,7 @@ #include "HangingEntity.h" #include - #include -#include #include #include @@ -17,6 +15,7 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" void HangingEntity::_init(Level* level) { checkInterval = 0; diff --git a/targets/minecraft/world/entity/ItemFrame.cpp b/targets/minecraft/world/entity/ItemFrame.cpp index 53198fd0e..14dee61dd 100644 --- a/targets/minecraft/world/entity/ItemFrame.cpp +++ b/targets/minecraft/world/entity/ItemFrame.cpp @@ -1,13 +1,9 @@ #include "ItemFrame.h" #include - #include #include "java/Random.h" -#include "minecraft/world/entity/Entity.h" -#include "minecraft/world/entity/HangingEntity.h" -#include "minecraft/world/entity/ItemFrame.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" @@ -17,6 +13,9 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/saveddata/MapItemSavedData.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/HangingEntity.h" +#include "minecraft/world/item/ItemInstance.h" // 4J - added for common ctor code void ItemFrame::_init() { diff --git a/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp b/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp index d843737b6..fc3c1ed33 100644 --- a/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp +++ b/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp @@ -1,9 +1,7 @@ #include "LeashFenceKnotEntity.h" -#include #include -#include "minecraft/world/entity/HangingEntity.h" #include "minecraft/world/entity/Mob.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" @@ -12,6 +10,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/HangingEntity.h" class CompoundTag; class Entity; diff --git a/targets/minecraft/world/entity/LivingEntity.cpp b/targets/minecraft/world/entity/LivingEntity.cpp index a45fc6b4f..c032031ab 100644 --- a/targets/minecraft/world/entity/LivingEntity.cpp +++ b/targets/minecraft/world/entity/LivingEntity.cpp @@ -2,10 +2,8 @@ #include #include - #include #include -#include #include #include #include @@ -33,12 +31,9 @@ #include "minecraft/world/damageSource/EntityDamageSource.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/effect/MobEffectInstance.h" -#include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/EntityEvent.h" #include "minecraft/world/entity/ExperienceOrb.h" -#include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/Mob.h" -#include "minecraft/world/entity/MobType.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" @@ -67,6 +62,8 @@ #include "nbt/ListTag.h" #include "nbt/ShortTag.h" #include "nbt/Tag.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/MobType.h" class Icon; diff --git a/targets/minecraft/world/entity/LivingEntity.h b/targets/minecraft/world/entity/LivingEntity.h index 3b5830d31..977dcdeda 100644 --- a/targets/minecraft/world/entity/LivingEntity.h +++ b/targets/minecraft/world/entity/LivingEntity.h @@ -1,12 +1,17 @@ #pragma once +#include #include #include +#include +#include #include "Entity.h" #include "MobType.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "java/Class.h" +#include "minecraft/world/item/ItemInstance.h" class CombatTracker; class AttributeInstance; @@ -19,6 +24,10 @@ class MobEffect; class HitResult; class Vec3; class Icon; +class DamageSource; +class Level; +class Player; +class Random; class LivingEntity : public Entity { friend class MobSpawner; diff --git a/targets/minecraft/world/entity/Mob.cpp b/targets/minecraft/world/entity/Mob.cpp index 718f20c6d..6103aa113 100644 --- a/targets/minecraft/world/entity/Mob.cpp +++ b/targets/minecraft/world/entity/Mob.cpp @@ -2,17 +2,12 @@ #include #include - #include -#include #include #include #include #include -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" @@ -26,7 +21,6 @@ #include "minecraft/world/entity/HangingEntity.h" #include "minecraft/world/entity/LeashFenceKnotEntity.h" #include "minecraft/world/entity/LivingEntity.h" -#include "minecraft/world/entity/Mob.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/TamableAnimal.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" diff --git a/targets/minecraft/world/entity/Mob.h b/targets/minecraft/world/entity/Mob.h index 716976278..cb0927929 100644 --- a/targets/minecraft/world/entity/Mob.h +++ b/targets/minecraft/world/entity/Mob.h @@ -1,8 +1,14 @@ #pragma once +#include +#include +#include + #include "LivingEntity.h" #include "MobType.h" #include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "java/Class.h" +#include "minecraft/world/entity/Entity.h" class HitResult; class Level; @@ -20,6 +26,8 @@ class Icon; class Pos; class MobGroupData; class Item; +class ItemInstance; +class Player; class Mob : public LivingEntity { friend class MobSpawner; diff --git a/targets/minecraft/world/entity/Painting.cpp b/targets/minecraft/world/entity/Painting.cpp index 9ea04d7bb..3016b9a9e 100644 --- a/targets/minecraft/world/entity/Painting.cpp +++ b/targets/minecraft/world/entity/Painting.cpp @@ -1,18 +1,17 @@ #include "Painting.h" -#include #include #include #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" -#include "minecraft/world/entity/Entity.h" -#include "minecraft/world/entity/HangingEntity.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/HangingEntity.h" typedef Painting::Motive _Motive; const _Motive* Painting::Motive::values[] = { diff --git a/targets/minecraft/world/entity/PathfinderMob.cpp b/targets/minecraft/world/entity/PathfinderMob.cpp index 96763ae1f..0e13ebc25 100644 --- a/targets/minecraft/world/entity/PathfinderMob.cpp +++ b/targets/minecraft/world/entity/PathfinderMob.cpp @@ -19,6 +19,7 @@ #include "minecraft/world/level/pathfinder/Path.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/entity/Mob.h" AttributeModifier* PathfinderMob::SPEED_MODIFIER_FLEEING = (new AttributeModifier(eModifierId_MOB_FLEEING, 2.0f, diff --git a/targets/minecraft/world/entity/PathfinderMob.h b/targets/minecraft/world/entity/PathfinderMob.h index 774e9b620..661195b93 100644 --- a/targets/minecraft/world/entity/PathfinderMob.h +++ b/targets/minecraft/world/entity/PathfinderMob.h @@ -5,6 +5,7 @@ #include "Mob.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/Entity.h" class Level; class Path; diff --git a/targets/minecraft/world/entity/SyncedEntityData.cpp b/targets/minecraft/world/entity/SyncedEntityData.cpp index b24db8a8b..51c154d0d 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.cpp +++ b/targets/minecraft/world/entity/SyncedEntityData.cpp @@ -1,14 +1,14 @@ #include "SyncedEntityData.h" #include - #include #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/Packet.h" -#include "minecraft/world/entity/SyncedEntityData.h" + +class ItemInstance; SynchedEntityData::SynchedEntityData() { m_isDirty = false; diff --git a/targets/minecraft/world/entity/SyncedEntityData.h b/targets/minecraft/world/entity/SyncedEntityData.h index 7a21fefb8..e0340e4e2 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.h +++ b/targets/minecraft/world/entity/SyncedEntityData.h @@ -1,10 +1,10 @@ #pragma once #include - #include #include #include +#include #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/entity/TamableAnimal.cpp b/targets/minecraft/world/entity/TamableAnimal.cpp index 94d9f05c4..b1b8c59d3 100644 --- a/targets/minecraft/world/entity/TamableAnimal.cpp +++ b/targets/minecraft/world/entity/TamableAnimal.cpp @@ -8,7 +8,6 @@ #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/ai/goal/SitGoal.h" #include "minecraft/world/entity/animal/Animal.h" -#include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "nbt/CompoundTag.h" diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp index a3bdcc91d..105ef0f3b 100644 --- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp +++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp @@ -6,6 +6,7 @@ #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "minecraft/util/HtmlString.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" void AttributeModifier::_init(eMODIFIER_ID id, const std::wstring name, double amount, int operation) { diff --git a/targets/minecraft/world/entity/ai/attributes/BaseAttribute.cpp b/targets/minecraft/world/entity/ai/attributes/BaseAttribute.cpp index 2310eebe3..8365a9015 100644 --- a/targets/minecraft/world/entity/ai/attributes/BaseAttribute.cpp +++ b/targets/minecraft/world/entity/ai/attributes/BaseAttribute.cpp @@ -1,5 +1,7 @@ #include "BaseAttribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" + BaseAttribute::BaseAttribute(eATTRIBUTE_ID id, double defaultValue) { this->id = id; this->defaultValue = defaultValue; diff --git a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp index d1bb67d3a..1081599ae 100644 --- a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp +++ b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp @@ -6,6 +6,7 @@ #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" BaseAttributeMap::~BaseAttributeMap() { for (auto it = attributesById.begin(); it != attributesById.end(); ++it) { diff --git a/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h b/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h index 98312b276..6c00e2abc 100644 --- a/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h +++ b/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.h @@ -5,6 +5,7 @@ #include "AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" class Attribute; class BaseAttributeMap; diff --git a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h index b6bd3f2d8..d5be1828c 100644 --- a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h +++ b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h @@ -2,6 +2,7 @@ #include "BaseAttribute.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" class RangedAttribute : public BaseAttribute { private: diff --git a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp index 2b9b8252b..fcc636786 100644 --- a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp +++ b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp @@ -6,6 +6,7 @@ #include "AttributeInstance.h" #include "ModifiableAttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" #include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" AttributeInstance* ServersideAttributeMap::getInstance(Attribute* attribute) { diff --git a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp index 8e0fd27e3..54d7fbf87 100644 --- a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp @@ -1,6 +1,5 @@ #include "AvoidPlayerGoal.h" -#include #include #include diff --git a/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp b/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp index 3e7649924..edd4ed59d 100644 --- a/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp @@ -3,11 +3,11 @@ #include "java/Random.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/entity/Mob.h" -#include "minecraft/world/entity/ai/goal/DoorInteractGoal.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/DoorTile.h" #include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/entity/ai/goal/DoorInteractGoal.h" BreakDoorGoal::BreakDoorGoal(Mob* mob) : DoorInteractGoal(mob) { breakTime = 0; diff --git a/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp b/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp index c596ea334..56eec9395 100644 --- a/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp @@ -1,6 +1,5 @@ #include "BreedGoal.h" -#include #include #include diff --git a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp index 213fcd45c..73f2e257a 100644 --- a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp @@ -9,6 +9,7 @@ #include "minecraft/world/entity/ai/navigation/PathNavigation.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" FleeSunGoal::FleeSunGoal(PathfinderMob* mob, double speedModifier) { this->mob = mob; diff --git a/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp b/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp index 9eb22f35f..771c71878 100644 --- a/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp @@ -1,6 +1,5 @@ #include "FollowParentGoal.h" -#include #include #include diff --git a/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp b/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp index e0ee53251..e947a2e34 100644 --- a/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp +++ b/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp @@ -1,11 +1,9 @@ #include "minecraft/world/entity/ai/goal/GoalSelector.h" #include -#include #include #include "Goal.h" -#include "minecraft/world/entity/ai/goal/GoalSelector.h" class Level; diff --git a/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp index 147c6efa2..5a4a1b572 100644 --- a/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp @@ -2,9 +2,9 @@ #include -#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" #include "minecraft/world/entity/npc/Villager.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" class Entity; class Mob; diff --git a/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp b/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp index 2e0f0dab4..ae9821b36 100644 --- a/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp @@ -1,8 +1,8 @@ #include "OpenDoorGoal.h" #include "minecraft/world/entity/Mob.h" -#include "minecraft/world/entity/ai/goal/DoorInteractGoal.h" #include "minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/entity/ai/goal/DoorInteractGoal.h" OpenDoorGoal::OpenDoorGoal(Mob* mob, bool closeDoorAfter) : DoorInteractGoal(mob) { diff --git a/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp b/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp index 6eab57eba..54017a072 100644 --- a/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp @@ -1,6 +1,5 @@ #include "PlayGoal.h" -#include #include #include #include diff --git a/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp b/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp index 9b5a658de..922134c1c 100644 --- a/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp @@ -1,6 +1,5 @@ #include "TakeFlowerGoal.h" -#include #include #include "java/Random.h" diff --git a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp index 20922981c..03a2b3cf4 100644 --- a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp @@ -3,9 +3,9 @@ #include "java/Random.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/PathfinderMob.h" -#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" #include "minecraft/world/entity/ai/village/Village.h" #include "minecraft/world/entity/animal/VillagerGolem.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" DefendVillageTargetGoal::DefendVillageTargetGoal(VillagerGolem* golem) : TargetGoal(golem, false, true) { diff --git a/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp index 061165f98..4f3ea9185 100644 --- a/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp @@ -1,13 +1,12 @@ #include "HurtByTargetGoal.h" -#include #include #include #include "minecraft/world/entity/PathfinderMob.h" -#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" class Entity; diff --git a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp index 9374a9d94..5e1583965 100644 --- a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp +++ b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp @@ -1,7 +1,6 @@ #include "NearestAttackableTargetGoal.h" #include -#include #include #include "java/Class.h" @@ -10,9 +9,9 @@ #include "minecraft/world/entity/EntitySelector.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/PathfinderMob.h" -#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/ai/goal/target/TargetGoal.h" SubselectEntitySelector::SubselectEntitySelector( NearestAttackableTargetGoal* parent, EntitySelector* subselector) { diff --git a/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp b/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp index 3b4d7d5a8..91f528cc6 100644 --- a/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp +++ b/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp @@ -1,7 +1,6 @@ #include "PathNavigation.h" #include - #include #include "minecraft/util/Mth.h" @@ -15,6 +14,7 @@ #include "minecraft/world/level/pathfinder/Path.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" class Entity; diff --git a/targets/minecraft/world/entity/ai/util/RandomPos.cpp b/targets/minecraft/world/entity/ai/util/RandomPos.cpp index 309251b01..621b5996c 100644 --- a/targets/minecraft/world/entity/ai/util/RandomPos.cpp +++ b/targets/minecraft/world/entity/ai/util/RandomPos.cpp @@ -6,6 +6,7 @@ #include "minecraft/Pos.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/PathfinderMob.h" +#include "minecraft/world/phys/Vec3.h" Vec3 RandomPos::tempDir = Vec3(0, 0, 0); diff --git a/targets/minecraft/world/entity/ai/village/Village.cpp b/targets/minecraft/world/entity/ai/village/Village.cpp index 360625808..1eb47fa00 100644 --- a/targets/minecraft/world/entity/ai/village/Village.cpp +++ b/targets/minecraft/world/entity/ai/village/Village.cpp @@ -1,7 +1,6 @@ #include "Village.h" #include - #include #include #include @@ -20,6 +19,10 @@ #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/ai/village/DoorInfo.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/phys/Vec3.h" class Entity; diff --git a/targets/minecraft/world/entity/ai/village/VillageSiege.cpp b/targets/minecraft/world/entity/ai/village/VillageSiege.cpp index f73d7a127..faf2e45e3 100644 --- a/targets/minecraft/world/entity/ai/village/VillageSiege.cpp +++ b/targets/minecraft/world/entity/ai/village/VillageSiege.cpp @@ -1,8 +1,6 @@ #include "VillageSiege.h" #include - -#include #include #include #include @@ -16,6 +14,7 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/MobSpawner.h" +#include "minecraft/world/phys/Vec3.h" VillageSiege::VillageSiege(Level* level) { hasSetupSiege = false; diff --git a/targets/minecraft/world/entity/ai/village/Villages.cpp b/targets/minecraft/world/entity/ai/village/Villages.cpp index 9ab4f6cd4..37df4cb19 100644 --- a/targets/minecraft/world/entity/ai/village/Villages.cpp +++ b/targets/minecraft/world/entity/ai/village/Villages.cpp @@ -1,7 +1,6 @@ #include "Villages.h" #include - #include #include "minecraft/Pos.h" @@ -10,6 +9,9 @@ #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/entity/ai/village/DoorInfo.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/level/saveddata/SavedData.h" const std::wstring Villages::VILLAGE_FILE_ID = L"villages"; diff --git a/targets/minecraft/world/entity/ambient/AmbientCreature.cpp b/targets/minecraft/world/entity/ambient/AmbientCreature.cpp index 563549920..e9f68e95d 100644 --- a/targets/minecraft/world/entity/ambient/AmbientCreature.cpp +++ b/targets/minecraft/world/entity/ambient/AmbientCreature.cpp @@ -2,6 +2,8 @@ #include +#include "minecraft/world/entity/Mob.h" + class Level; AmbientCreature::AmbientCreature(Level* level) : Mob(level) {} diff --git a/targets/minecraft/world/entity/ambient/Bat.cpp b/targets/minecraft/world/entity/ambient/Bat.cpp index 17c9492f5..edbf4cd8b 100644 --- a/targets/minecraft/world/entity/ambient/Bat.cpp +++ b/targets/minecraft/world/entity/ambient/Bat.cpp @@ -1,7 +1,6 @@ #include "Bat.h" #include - #include #include #include @@ -12,13 +11,13 @@ #include "minecraft/util/Mth.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/ambient/AmbientCreature.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/level/Calendar.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/ambient/AmbientCreature.h" Bat::Bat(Level* level) : AmbientCreature(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/animal/Animal.cpp b/targets/minecraft/world/entity/animal/Animal.cpp index 78b3f5e66..49941b830 100644 --- a/targets/minecraft/world/entity/animal/Animal.cpp +++ b/targets/minecraft/world/entity/animal/Animal.cpp @@ -1,21 +1,35 @@ #include "Animal.h" #include +#include +#include +#include +#include #include "java/Random.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "nbt/com.mojang.nbt.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Class.h" +#include "nbt/CompoundTag.h" +#include "strings.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/damageSource/EntityDamageSource.h" +#include "minecraft/world/entity/AgeableMob.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/projectile/Arrow.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" Animal::Animal(Level* level) : AgableMob(level) { // inLove = 0; diff --git a/targets/minecraft/world/entity/animal/Animal.h b/targets/minecraft/world/entity/animal/Animal.h index 8c38af10b..61c3b38aa 100644 --- a/targets/minecraft/world/entity/animal/Animal.h +++ b/targets/minecraft/world/entity/animal/Animal.h @@ -1,10 +1,15 @@ #pragma once +#include +#include + #include "minecraft/world/entity/AgeableMob.h" #include "minecraft/world/entity/Creature.h" +#include "minecraft/world/entity/player/Player.h" class Level; class CompoundTag; class DamageSource; +class ItemInstance; class Animal : public AgableMob, public Creature { private: diff --git a/targets/minecraft/world/entity/animal/Chicken.cpp b/targets/minecraft/world/entity/animal/Chicken.cpp index fe69ff10e..51b7b33d1 100644 --- a/targets/minecraft/world/entity/animal/Chicken.cpp +++ b/targets/minecraft/world/entity/animal/Chicken.cpp @@ -14,12 +14,12 @@ #include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" #include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" #include "minecraft/world/entity/ai/goal/TemptGoal.h" -#include "minecraft/world/entity/animal/Animal.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/entity/animal/Animal.h" void Chicken::_init() { sheared = false; diff --git a/targets/minecraft/world/entity/animal/Cow.cpp b/targets/minecraft/world/entity/animal/Cow.cpp index a12908a9a..6833f50d6 100644 --- a/targets/minecraft/world/entity/animal/Cow.cpp +++ b/targets/minecraft/world/entity/animal/Cow.cpp @@ -16,7 +16,6 @@ #include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" #include "minecraft/world/entity/ai/goal/TemptGoal.h" #include "minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "minecraft/world/entity/animal/Animal.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" @@ -24,6 +23,7 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/entity/animal/Animal.h" Cow::Cow(Level* level) : Animal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp index 85c11697d..ea9cfe2ce 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.cpp +++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp @@ -1,7 +1,6 @@ #include "EntityHorse.h" #include - #include #include #include @@ -37,7 +36,6 @@ #include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" #include "minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.h" #include "minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "minecraft/world/entity/animal/Animal.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" @@ -50,6 +48,8 @@ #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/entity/animal/Animal.h" +#include "minecraft/world/entity/player/Player.h" class EntitySelector; class Path; diff --git a/targets/minecraft/world/entity/animal/EntityHorse.h b/targets/minecraft/world/entity/animal/EntityHorse.h index ff7793525..db6573851 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.h +++ b/targets/minecraft/world/entity/animal/EntityHorse.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/entity/animal/MushroomCow.cpp b/targets/minecraft/world/entity/animal/MushroomCow.cpp index fb93db10c..324fc9d49 100644 --- a/targets/minecraft/world/entity/animal/MushroomCow.cpp +++ b/targets/minecraft/world/entity/animal/MushroomCow.cpp @@ -5,7 +5,6 @@ #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/PathfinderMob.h" -#include "minecraft/world/entity/animal/Cow.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" @@ -16,6 +15,7 @@ #include "minecraft/world/level/tile/PlantTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/animal/Cow.h" MushroomCow::MushroomCow(Level* level) : Cow(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index d34fadb5f..3636eecd2 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -1,7 +1,6 @@ #include "Ocelot.h" #include - #include #include @@ -49,6 +48,7 @@ #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" const double Ocelot::SNEAK_SPEED_MOD = 0.6; const double Ocelot::WALK_SPEED_MOD = 0.8; diff --git a/targets/minecraft/world/entity/animal/Pig.cpp b/targets/minecraft/world/entity/animal/Pig.cpp index b9c451e00..b777fb728 100644 --- a/targets/minecraft/world/entity/animal/Pig.cpp +++ b/targets/minecraft/world/entity/animal/Pig.cpp @@ -1,7 +1,6 @@ #include "Pig.h" #include - #include #include @@ -22,7 +21,6 @@ #include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" #include "minecraft/world/entity/ai/goal/TemptGoal.h" #include "minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "minecraft/world/entity/animal/Animal.h" #include "minecraft/world/entity/monster/PigZombie.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" @@ -30,6 +28,7 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/animal/Animal.h" Pig::Pig(Level* level) : Animal(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/animal/Sheep.cpp b/targets/minecraft/world/entity/animal/Sheep.cpp index 1e5b5aeaf..0e561e66e 100644 --- a/targets/minecraft/world/entity/animal/Sheep.cpp +++ b/targets/minecraft/world/entity/animal/Sheep.cpp @@ -1,7 +1,6 @@ #include "Sheep.h" #include - #include #include #include @@ -24,7 +23,6 @@ #include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" #include "minecraft/world/entity/ai/goal/TemptGoal.h" #include "minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "minecraft/world/entity/animal/Animal.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Inventory.h" @@ -38,6 +36,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/animal/Animal.h" const float Sheep::COLOR[Sheep::COLOR_LENGTH][3] = { {1.0f, 1.0f, 1.0f}, // white diff --git a/targets/minecraft/world/entity/animal/SnowMan.cpp b/targets/minecraft/world/entity/animal/SnowMan.cpp index 6753eebb6..c1f8c96c9 100644 --- a/targets/minecraft/world/entity/animal/SnowMan.cpp +++ b/targets/minecraft/world/entity/animal/SnowMan.cpp @@ -17,7 +17,6 @@ #include "minecraft/world/entity/ai/goal/RangedAttackGoal.h" #include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" #include "minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "minecraft/world/entity/animal/Golem.h" #include "minecraft/world/entity/monster/Enemy.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" @@ -26,6 +25,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/animal/Golem.h" SnowMan::SnowMan(Level* level) : Golem(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/animal/Squid.cpp b/targets/minecraft/world/entity/animal/Squid.cpp index 1186ca0f6..22c94f216 100644 --- a/targets/minecraft/world/entity/animal/Squid.cpp +++ b/targets/minecraft/world/entity/animal/Squid.cpp @@ -1,7 +1,6 @@ #include "Squid.h" #include - #include #include @@ -9,7 +8,6 @@ #include "minecraft/SharedConstants.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/animal/WaterAnimal.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/item/DyePowderItem.h" #include "minecraft/world/item/Item.h" @@ -17,6 +15,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/animal/WaterAnimal.h" void Squid::_init() { xBodyRot = xBodyRotO = 0.0f; diff --git a/targets/minecraft/world/entity/animal/VillagerGolem.cpp b/targets/minecraft/world/entity/animal/VillagerGolem.cpp index 55ae94a50..d7a55a212 100644 --- a/targets/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/targets/minecraft/world/entity/animal/VillagerGolem.cpp @@ -30,7 +30,6 @@ #include "minecraft/world/entity/ai/navigation/PathNavigation.h" #include "minecraft/world/entity/ai/village/Village.h" #include "minecraft/world/entity/ai/village/Villages.h" -#include "minecraft/world/entity/animal/Golem.h" #include "minecraft/world/entity/monster/Enemy.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" @@ -39,6 +38,7 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/animal/Golem.h" VillagerGolem::VillagerGolem(Level* level) : Golem(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/animal/Wolf.h b/targets/minecraft/world/entity/animal/Wolf.h index 80241f4ae..1815ab1da 100644 --- a/targets/minecraft/world/entity/animal/Wolf.h +++ b/targets/minecraft/world/entity/animal/Wolf.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp index 53cdc90c2..8b78b5d25 100644 --- a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp +++ b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp @@ -1,6 +1,7 @@ #include "MultiEntityMobPart.h" #include "MultiEntityMob.h" +#include "minecraft/world/entity/Entity.h" MultiEntityMobPart::MultiEntityMobPart( std::shared_ptr parentMob, const std::wstring& id, float w, diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp index b286a3817..43e33a777 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp @@ -1,11 +1,16 @@ #include "EnderCrystal.h" +#include +#include + #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "net.minecraft.world.entity.boss.enderdragon.h" +#include "java/Random.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/boss/enderdragon/EnderDragon.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" void EnderCrystal::_init(Level* level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.h b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.h index 1c357807a..4b905e2ae 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.h +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.h @@ -1,6 +1,9 @@ #pragma once #include "minecraft/world/entity/Entity.h" +#include "java/Class.h" + +class Level; class EnderCrystal : public Entity { public: diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 36a8a4ae4..d83f40644 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -2,23 +2,34 @@ #include #include -#include +#include +#include #include "minecraft/SharedConstants.h" -#include "minecraft/client/renderer/Textures.h" -#include "minecraft/stdafx.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "minecraft/world/entity/boss/net.minecraft.world.entity.boss.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.entity.boss.enderdragon.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/boss/MultiEntityMob.h" +#include "minecraft/world/entity/boss/MultiEntityMobPart.h" +#include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/DragonFireball.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/pathfinder/BinaryHeap.h" +#include "minecraft/world/level/pathfinder/Node.h" +#include "minecraft/world/level/pathfinder/Path.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TheEndPortalTile.h" #define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1 @@ -518,11 +529,6 @@ void EnderDragon::aiStep() { yRotA += yRotD * ((0.7f / distToTarget) / rotSpeed); yRot += yRotA; } else { - // setSynchedAction(e_EnderdragonAction_Sitting_Flaming); -#if PRINT_DRAGON_STATE_CHANGE_MESSAGES - // app.DebugPrintf("Dragon action is now : - // SittingFlaming\n"); -#endif // m_actionTicks = FLAME_TICKS; } } else { diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h index 4af80c755..c844f6823 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -1,15 +1,30 @@ #pragma once +#include +#include +#include +#include + #include "minecraft/stdafx.h" #include "minecraft/world/entity/boss/BossMob.h" #include "minecraft/world/entity/boss/MultiEntityMob.h" #include "minecraft/world/entity/monster/Enemy.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "strings.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/Vec3.h" class MultiEntityMobPart; class EnderCrystal; class Node; class BinaryHeap; class Path; +class DamageSource; +class Entity; +class Level; class EnderDragon : public Mob, public BossMob, diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp index db8d086bb..a9c5c4001 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -1,20 +1,45 @@ #include "WitherBoss.h" +#include +#include +#include +#include +#include + #include "minecraft/sounds/SoundTypes.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h" -#include "minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "SharedConstants.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/RandomLookAroundGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/RangedAttackGoal.h" +#include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" +#include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/monster/Enemy.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/WitherSkull.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" bool LivingEntitySelector::matches(std::shared_ptr entity) const { if (entity->instanceof(eTYPE_LIVINGENTITY)) { diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.h b/targets/minecraft/world/entity/boss/wither/WitherBoss.h index efbe6eef2..cc99e87e6 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.h @@ -1,9 +1,21 @@ #pragma once +#include +#include + #include "minecraft/stdafx.h" #include "minecraft/world/entity/boss/BossMob.h" #include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/RangedAttackMob.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "strings.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/MobType.h" + +class Entity; +class Level; +class LivingEntity; class LivingEntitySelector : public EntitySelector { public: diff --git a/targets/minecraft/world/entity/global/LightningBolt.cpp b/targets/minecraft/world/entity/global/LightningBolt.cpp index 3f7e29e96..b387a13f9 100644 --- a/targets/minecraft/world/entity/global/LightningBolt.cpp +++ b/targets/minecraft/world/entity/global/LightningBolt.cpp @@ -1,8 +1,6 @@ #include "LightningBolt.h" #include - -#include #include #include @@ -12,13 +10,13 @@ #include "minecraft/sounds/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" -#include "minecraft/world/entity/global/GlobalEntity.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/tile/FireTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/global/GlobalEntity.h" LightningBolt::LightningBolt(Level* level, double x, double y, double z) : life(0), seed(0), flashes(0), GlobalEntity(level) { diff --git a/targets/minecraft/world/entity/item/Boat.cpp b/targets/minecraft/world/entity/item/Boat.cpp index 6e711c457..99cee875c 100644 --- a/targets/minecraft/world/entity/item/Boat.cpp +++ b/targets/minecraft/world/entity/item/Boat.cpp @@ -1,8 +1,6 @@ #include "Boat.h" #include - -#include #include #include #include @@ -21,6 +19,7 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" const double Boat::MAX_SPEED = 0.35; const double Boat::MAX_COLLISION_SPEED = MAX_SPEED * 0.75; diff --git a/targets/minecraft/world/entity/item/FallingTile.cpp b/targets/minecraft/world/entity/item/FallingTile.cpp index 628bd1bb9..9d2264f0d 100644 --- a/targets/minecraft/world/entity/item/FallingTile.cpp +++ b/targets/minecraft/world/entity/item/FallingTile.cpp @@ -1,9 +1,7 @@ #include "FallingTile.h" #include - #include -#include #include #include #include @@ -18,6 +16,7 @@ #include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" #include "nbt/Tag.h" +#include "minecraft/world/entity/Entity.h" // 4J - added for common ctor code void FallingTile::_init() { diff --git a/targets/minecraft/world/entity/item/ItemEntity.cpp b/targets/minecraft/world/entity/item/ItemEntity.cpp index 36933cb9a..2cd3aab12 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.cpp +++ b/targets/minecraft/world/entity/item/ItemEntity.cpp @@ -1,9 +1,7 @@ #include "ItemEntity.h" #include - #include -#include #include #include @@ -23,6 +21,9 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" +#include "SharedConstants.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/item/ItemInstance.h" void ItemEntity::_init() { age = 0; diff --git a/targets/minecraft/world/entity/item/Minecart.cpp b/targets/minecraft/world/entity/item/Minecart.cpp index f93eceecc..0e8c8d9f5 100644 --- a/targets/minecraft/world/entity/item/Minecart.cpp +++ b/targets/minecraft/world/entity/item/Minecart.cpp @@ -3,9 +3,7 @@ #include #include #include - #include -#include #include #include #include @@ -21,7 +19,6 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/SyncedEntityData.h" -#include "minecraft/world/entity/item/Minecart.h" #include "minecraft/world/entity/item/MinecartChest.h" #include "minecraft/world/entity/item/MinecartFurnace.h" #include "minecraft/world/entity/item/MinecartHopper.h" diff --git a/targets/minecraft/world/entity/item/Minecart.h b/targets/minecraft/world/entity/item/Minecart.h index e27baa0e2..75dc03256 100644 --- a/targets/minecraft/world/entity/item/Minecart.h +++ b/targets/minecraft/world/entity/item/Minecart.h @@ -1,10 +1,16 @@ #pragma once #include +#include +#include #include "minecraft/world/entity/Entity.h" +#include "java/Class.h" +#include "minecraft/world/phys/Vec3.h" class DamageSource; class Tickable; +class Level; +class Tile; class Minecart : public Entity { friend class MinecartRenderer; diff --git a/targets/minecraft/world/entity/item/MinecartChest.cpp b/targets/minecraft/world/entity/item/MinecartChest.cpp index 259aa51fc..8bf18675a 100644 --- a/targets/minecraft/world/entity/item/MinecartChest.cpp +++ b/targets/minecraft/world/entity/item/MinecartChest.cpp @@ -3,6 +3,7 @@ #include "minecraft/network/packet/ContainerOpenPacket.h" #include "minecraft/world/level/tile/ChestTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/item/MinecartContainer.h" class Level; diff --git a/targets/minecraft/world/entity/item/MinecartContainer.cpp b/targets/minecraft/world/entity/item/MinecartContainer.cpp index 85935493a..4ca2b6642 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.cpp +++ b/targets/minecraft/world/entity/item/MinecartContainer.cpp @@ -1,11 +1,20 @@ #include "MinecartContainer.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" -#include "net.minecraft.world.entity.item.h" +#include + +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/redstone/Redstone.h" void MinecartContainer::_init() { items = std::vector>(9 * 4); diff --git a/targets/minecraft/world/entity/item/MinecartContainer.h b/targets/minecraft/world/entity/item/MinecartContainer.h index 73321cb91..adaf310e0 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.h +++ b/targets/minecraft/world/entity/item/MinecartContainer.h @@ -1,8 +1,15 @@ #pragma once +#include +#include +#include + #include "Minecart.h" #include "minecraft/world/Container.h" +class ItemInstance; +class Level; + class MinecartContainer : public Minecart, public virtual Container { private: std::vector> items; diff --git a/targets/minecraft/world/entity/item/MinecartFurnace.cpp b/targets/minecraft/world/entity/item/MinecartFurnace.cpp index 954d6a258..a8123d041 100644 --- a/targets/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/targets/minecraft/world/entity/item/MinecartFurnace.cpp @@ -1,7 +1,6 @@ #include "MinecartFurnace.h" #include - #include #include @@ -20,6 +19,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/item/Minecart.h" MinecartFurnace::MinecartFurnace(Level* level) : Minecart(level) { defineSynchedData(); diff --git a/targets/minecraft/world/entity/item/MinecartHopper.cpp b/targets/minecraft/world/entity/item/MinecartHopper.cpp index a5f3f9a0e..3db1e597b 100644 --- a/targets/minecraft/world/entity/item/MinecartHopper.cpp +++ b/targets/minecraft/world/entity/item/MinecartHopper.cpp @@ -1,7 +1,6 @@ #include "minecraft/world/entity/item/MinecartHopper.h" -#include #include #include #include @@ -9,7 +8,6 @@ #include "minecraft/world/entity/EntitySelector.h" #include "minecraft/world/entity/item/ItemEntity.h" #include "minecraft/world/entity/item/MinecartContainer.h" -#include "minecraft/world/entity/item/MinecartHopper.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/HopperTile.h" diff --git a/targets/minecraft/world/entity/item/MinecartHopper.h b/targets/minecraft/world/entity/item/MinecartHopper.h index c00b1d216..842d8d347 100644 --- a/targets/minecraft/world/entity/item/MinecartHopper.h +++ b/targets/minecraft/world/entity/item/MinecartHopper.h @@ -1,7 +1,14 @@ #pragma once +#include +#include + #include "MinecartContainer.h" #include "minecraft/world/level/tile/entity/Hopper.h" +#include "java/Class.h" + +class Entity; +class Level; class MinecartHopper : public MinecartContainer, public Hopper { public: diff --git a/targets/minecraft/world/entity/item/MinecartRideable.cpp b/targets/minecraft/world/entity/item/MinecartRideable.cpp index a6b864ae0..30c5aca5b 100644 --- a/targets/minecraft/world/entity/item/MinecartRideable.cpp +++ b/targets/minecraft/world/entity/item/MinecartRideable.cpp @@ -5,6 +5,7 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/entity/item/Minecart.h" MinecartRideable::MinecartRideable(Level* level) : Minecart(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/item/MinecartSpawner.cpp b/targets/minecraft/world/entity/item/MinecartSpawner.cpp index 23d9ea651..9f58667d3 100644 --- a/targets/minecraft/world/entity/item/MinecartSpawner.cpp +++ b/targets/minecraft/world/entity/item/MinecartSpawner.cpp @@ -4,6 +4,7 @@ #include "minecraft/world/level/BaseMobSpawner.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/item/Minecart.h" MinecartSpawner::MinecartMobSpawner::MinecartMobSpawner( MinecartSpawner* parent) { diff --git a/targets/minecraft/world/entity/item/MinecartTNT.cpp b/targets/minecraft/world/entity/item/MinecartTNT.cpp index 35271587a..5967ac235 100644 --- a/targets/minecraft/world/entity/item/MinecartTNT.cpp +++ b/targets/minecraft/world/entity/item/MinecartTNT.cpp @@ -1,7 +1,6 @@ #include "MinecartTNT.h" #include - #include #include @@ -14,6 +13,7 @@ #include "minecraft/world/level/tile/BaseRailTile.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/item/Minecart.h" void MinecartTNT::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/item/PrimedTnt.cpp b/targets/minecraft/world/entity/item/PrimedTnt.cpp index 6a3d406fd..a7d832102 100644 --- a/targets/minecraft/world/entity/item/PrimedTnt.cpp +++ b/targets/minecraft/world/entity/item/PrimedTnt.cpp @@ -1,7 +1,6 @@ #include "PrimedTnt.h" #include - #include #include #include @@ -10,6 +9,9 @@ #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/level/Level.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" + +class LivingEntity; void PrimedTnt::_init() { life = 0; diff --git a/targets/minecraft/world/entity/monster/Blaze.cpp b/targets/minecraft/world/entity/monster/Blaze.cpp index 29a11762d..b6282ba90 100644 --- a/targets/minecraft/world/entity/monster/Blaze.cpp +++ b/targets/minecraft/world/entity/monster/Blaze.cpp @@ -1,7 +1,6 @@ #include "Blaze.h" #include - #include #include #include @@ -15,13 +14,13 @@ #include "minecraft/world/entity/Mob.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/projectile/SmallFireball.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/monster/Monster.h" Blaze::Blaze(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/monster/CaveSpider.cpp b/targets/minecraft/world/entity/monster/CaveSpider.cpp index 7ac2661e6..8a4c554f0 100644 --- a/targets/minecraft/world/entity/monster/CaveSpider.cpp +++ b/targets/minecraft/world/entity/monster/CaveSpider.cpp @@ -10,8 +10,8 @@ #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "minecraft/world/entity/monster/Spider.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/entity/monster/Spider.h" CaveSpider::CaveSpider(Level* level) : Spider(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/monster/Creeper.cpp b/targets/minecraft/world/entity/monster/Creeper.cpp index b37050c35..9817299f4 100644 --- a/targets/minecraft/world/entity/monster/Creeper.cpp +++ b/targets/minecraft/world/entity/monster/Creeper.cpp @@ -1,7 +1,6 @@ #include "Creeper.h" #include - #include #include @@ -23,13 +22,13 @@ #include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" #include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" #include "minecraft/world/entity/animal/Ocelot.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/monster/Monster.h" void Creeper::_init() { swell = 0; diff --git a/targets/minecraft/world/entity/monster/EnderMan.cpp b/targets/minecraft/world/entity/monster/EnderMan.cpp index 56c35c712..b695b9065 100644 --- a/targets/minecraft/world/entity/monster/EnderMan.cpp +++ b/targets/minecraft/world/entity/monster/EnderMan.cpp @@ -2,12 +2,11 @@ #include #include - +#include #include #include #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" @@ -19,7 +18,6 @@ #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" @@ -32,6 +30,7 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/monster/Monster.h" AttributeModifier* EnderMan::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_ENDERMAN_ATTACKSPEED, 6.2f, diff --git a/targets/minecraft/world/entity/monster/Ghast.cpp b/targets/minecraft/world/entity/monster/Ghast.cpp index 4550f5b87..874d88dde 100644 --- a/targets/minecraft/world/entity/monster/Ghast.cpp +++ b/targets/minecraft/world/entity/monster/Ghast.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -18,7 +17,6 @@ #include "minecraft/world/entity/Mob.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/monster/Enemy.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/LargeFireball.h" @@ -28,6 +26,7 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/monster/Enemy.h" void Ghast::_init() { explosionPower = 1; diff --git a/targets/minecraft/world/entity/monster/Giant.cpp b/targets/minecraft/world/entity/monster/Giant.cpp index 6fb4236be..747997f6a 100644 --- a/targets/minecraft/world/entity/monster/Giant.cpp +++ b/targets/minecraft/world/entity/monster/Giant.cpp @@ -1,9 +1,9 @@ #include "Giant.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/entity/monster/Monster.h" Giant::Giant(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/monster/LavaSlime.cpp b/targets/minecraft/world/entity/monster/LavaSlime.cpp index 5ea2904af..a51fd62e9 100644 --- a/targets/minecraft/world/entity/monster/LavaSlime.cpp +++ b/targets/minecraft/world/entity/monster/LavaSlime.cpp @@ -8,9 +8,10 @@ #include "minecraft/world/Difficulty.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "minecraft/world/entity/monster/Slime.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/monster/Slime.h" LavaSlime::LavaSlime(Level* level) : Slime(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/monster/Monster.cpp b/targets/minecraft/world/entity/monster/Monster.cpp index 9b824540c..b9103bbdd 100644 --- a/targets/minecraft/world/entity/monster/Monster.cpp +++ b/targets/minecraft/world/entity/monster/Monster.cpp @@ -1,7 +1,6 @@ #include "Monster.h" #include - #include #include @@ -16,7 +15,6 @@ #include "minecraft/world/entity/PathfinderMob.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h" -#include "minecraft/world/entity/monster/Enemy.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/enchantment/EnchantmentHelper.h" @@ -24,6 +22,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LightLayer.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/monster/Enemy.h" Monster::Monster(Level* level) : PathfinderMob(level) { xpReward = Enemy::XP_REWARD_MEDIUM; diff --git a/targets/minecraft/world/entity/monster/PigZombie.cpp b/targets/minecraft/world/entity/monster/PigZombie.cpp index 790aba577..baeed9d00 100644 --- a/targets/minecraft/world/entity/monster/PigZombie.cpp +++ b/targets/minecraft/world/entity/monster/PigZombie.cpp @@ -1,6 +1,5 @@ #include "PigZombie.h" -#include #include #include @@ -13,13 +12,13 @@ #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "minecraft/world/entity/monster/Zombie.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/monster/Zombie.h" AttributeModifier* PigZombie::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_PIG_ATTACKSPEED, 0.45, diff --git a/targets/minecraft/world/entity/monster/Silverfish.cpp b/targets/minecraft/world/entity/monster/Silverfish.cpp index 7481476ef..0eb7ebfe9 100644 --- a/targets/minecraft/world/entity/monster/Silverfish.cpp +++ b/targets/minecraft/world/entity/monster/Silverfish.cpp @@ -11,7 +11,6 @@ #include "minecraft/world/damageSource/EntityDamageSource.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/GameRules.h" @@ -19,6 +18,8 @@ #include "minecraft/world/level/tile/StoneMonsterTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/monster/Monster.h" Silverfish::Silverfish(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/monster/Skeleton.cpp b/targets/minecraft/world/entity/monster/Skeleton.cpp index 622043506..425e407be 100644 --- a/targets/minecraft/world/entity/monster/Skeleton.cpp +++ b/targets/minecraft/world/entity/monster/Skeleton.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -31,11 +30,9 @@ #include "minecraft/world/entity/ai/goal/RestrictSunGoal.h" #include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" #include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/Arrow.h" -#include "minecraft/world/item/BowItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/enchantment/Enchantment.h" @@ -47,6 +44,9 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/SkullTileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/monster/Monster.h" +#include "minecraft/world/item/BowItem.h" Skeleton::Skeleton(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/monster/Slime.cpp b/targets/minecraft/world/entity/monster/Slime.cpp index 1fd0b4a0b..cd1a4bb34 100644 --- a/targets/minecraft/world/entity/monster/Slime.cpp +++ b/targets/minecraft/world/entity/monster/Slime.cpp @@ -2,7 +2,6 @@ #include #include - #include #include @@ -24,6 +23,7 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Mob.h" void Slime::_init() { jumpDelay = 0; diff --git a/targets/minecraft/world/entity/monster/Spider.cpp b/targets/minecraft/world/entity/monster/Spider.cpp index 8466b7519..88dd54358 100644 --- a/targets/minecraft/world/entity/monster/Spider.cpp +++ b/targets/minecraft/world/entity/monster/Spider.cpp @@ -2,7 +2,6 @@ #include #include - #include #include @@ -16,12 +15,13 @@ #include "minecraft/world/entity/MobGroupData.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/monster/Skeleton.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/monster/Monster.h" Spider::Spider(Level* level) : Monster(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/monster/Witch.cpp b/targets/minecraft/world/entity/monster/Witch.cpp index 39b150490..1cd1aaed8 100644 --- a/targets/minecraft/world/entity/monster/Witch.cpp +++ b/targets/minecraft/world/entity/monster/Witch.cpp @@ -1,6 +1,5 @@ #include "Witch.h" -#include #include #include @@ -25,7 +24,6 @@ #include "minecraft/world/entity/ai/goal/RangedAttackGoal.h" #include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" #include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/ThrownPotion.h" @@ -35,6 +33,7 @@ #include "minecraft/world/item/alchemy/PotionBrewing.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/monster/Monster.h" AttributeModifier* Witch::SPEED_MODIFIER_DRINKING = (new AttributeModifier(eModifierId_MOB_WITCH_DRINKSPEED, -0.25f, diff --git a/targets/minecraft/world/entity/monster/Zombie.cpp b/targets/minecraft/world/entity/monster/Zombie.cpp index 17b826db4..ecffae228 100644 --- a/targets/minecraft/world/entity/monster/Zombie.cpp +++ b/targets/minecraft/world/entity/monster/Zombie.cpp @@ -1,7 +1,6 @@ #include "Zombie.h" #include - #include #include #include @@ -37,7 +36,6 @@ #include "minecraft/world/entity/ai/goal/target/HurtByTargetGoal.h" #include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h" #include "minecraft/world/entity/ai/navigation/PathNavigation.h" -#include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/npc/Villager.h" #include "minecraft/world/entity/player/Abilities.h" @@ -50,6 +48,9 @@ #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" +#include "SharedConstants.h" +#include "minecraft/world/entity/MobType.h" +#include "minecraft/world/entity/monster/Monster.h" Attribute* Zombie::SPAWN_REINFORCEMENTS_CHANCE = (new RangedAttribute(eAttributeId_ZOMBIE_SPAWNREINFORCEMENTS, 0, 0, 1)); diff --git a/targets/minecraft/world/entity/npc/Villager.cpp b/targets/minecraft/world/entity/npc/Villager.cpp index 26bd8c967..f9decf992 100644 --- a/targets/minecraft/world/entity/npc/Villager.cpp +++ b/targets/minecraft/world/entity/npc/Villager.cpp @@ -1,23 +1,60 @@ #include "Villager.h" -#include "minecraft/client/renderer/Textures.h" -#include "minecraft/stdafx.h" +#include +#include +#include + #include "minecraft/util/Mth.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h" -#include "minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h" -#include "minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "nbt/com.mojang.nbt.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "Pos.h" +#include "SharedConstants.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "minecraft/sounds/SoundTypes.h" +#include "strings.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/AgeableMob.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/EntityEvent.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/SyncedEntityData.h" +#include "minecraft/world/entity/ai/attributes/AttributeInstance.h" +#include "minecraft/world/entity/ai/goal/AvoidPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/FloatGoal.h" +#include "minecraft/world/entity/ai/goal/GoalSelector.h" +#include "minecraft/world/entity/ai/goal/InteractGoal.h" +#include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.h" +#include "minecraft/world/entity/ai/goal/MakeLoveGoal.h" +#include "minecraft/world/entity/ai/goal/MoveIndoorsGoal.h" +#include "minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.h" +#include "minecraft/world/entity/ai/goal/OpenDoorGoal.h" +#include "minecraft/world/entity/ai/goal/PlayGoal.h" +#include "minecraft/world/entity/ai/goal/RandomStrollGoal.h" +#include "minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.h" +#include "minecraft/world/entity/ai/goal/TakeFlowerGoal.h" +#include "minecraft/world/entity/ai/goal/TradeWithPlayerGoal.h" +#include "minecraft/world/entity/ai/navigation/PathNavigation.h" +#include "minecraft/world/entity/ai/village/Village.h" +#include "minecraft/world/entity/ai/village/Villages.h" +#include "minecraft/world/entity/monster/SharedMonsterAttributes.h" +#include "minecraft/world/entity/monster/Zombie.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/item/enchantment/EnchantmentInstance.h" +#include "minecraft/world/item/trading/Merchant.h" +#include "minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" namespace { struct VillagerShuffleRandom { diff --git a/targets/minecraft/world/entity/npc/Villager.h b/targets/minecraft/world/entity/npc/Villager.h index 430fe3fd2..050ce17e5 100644 --- a/targets/minecraft/world/entity/npc/Villager.h +++ b/targets/minecraft/world/entity/npc/Villager.h @@ -1,14 +1,25 @@ #pragma once +#include +#include +#include +#include +#include + #include "Npc.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/entity/AgeableMob.h" #include "minecraft/world/item/trading/Merchant.h" +#include "java/Class.h" +#include "minecraft/world/item/ItemInstance.h" class Level; class Village; class MerchantRecipeList; class MerchantRecipe; +class Entity; +class Player; +class Random; class Villager : public AgableMob, public Npc, public Merchant { public: diff --git a/targets/minecraft/world/entity/player/Inventory.cpp b/targets/minecraft/world/entity/player/Inventory.cpp index b09c2fa3b..cca07fc84 100644 --- a/targets/minecraft/world/entity/player/Inventory.cpp +++ b/targets/minecraft/world/entity/player/Inventory.cpp @@ -1,11 +1,21 @@ #include "Inventory.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include +#include + #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "nbt/com.mojang.nbt.h" -#include "net.minecraft.world.entity.player.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "minecraft/stats/GenericStats.h" +#include "strings.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/Tile.h" const int Inventory::POP_TIME_DURATION = 5; const int Inventory::MAX_INVENTORY_STACK_SIZE = 64; diff --git a/targets/minecraft/world/entity/player/Inventory.h b/targets/minecraft/world/entity/player/Inventory.h index 7b61aa727..c1416dce9 100644 --- a/targets/minecraft/world/entity/player/Inventory.h +++ b/targets/minecraft/world/entity/player/Inventory.h @@ -1,10 +1,17 @@ #pragma once +#include +#include +#include + #include "minecraft/world/Container.h" #include "minecraft/world/item/ItemInstance.h" #include "nbt/ListTag.h" class Player; class CompoundTag; +class Item; +class Tile; +template class ListTag; class Inventory : public Container { public: diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp index 1b0aad26f..b82c08fdc 100644 --- a/targets/minecraft/world/entity/player/Player.cpp +++ b/targets/minecraft/world/entity/player/Player.cpp @@ -10,9 +10,7 @@ #include "Player.h" #include -#include #include - #include #include #include @@ -27,9 +25,6 @@ #include "Minecraft.Client/Common/src/DLC/DLCManager.h" #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/Direction.h" @@ -57,8 +52,6 @@ #include "minecraft/world/entity/item/Minecart.h" #include "minecraft/world/entity/monster/Monster.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "minecraft/world/entity/player/Abilities.h" -#include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/Arrow.h" #include "minecraft/world/food/FoodConstants.h" #include "minecraft/world/food/FoodData.h" @@ -87,6 +80,10 @@ #include "minecraft/world/scores/criteria/ObjectiveCriteria.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/item/ItemInstance.h" class ModelPart; class Objective; diff --git a/targets/minecraft/world/entity/player/Player.h b/targets/minecraft/world/entity/player/Player.h index 67efc5696..f0310f329 100644 --- a/targets/minecraft/world/entity/player/Player.h +++ b/targets/minecraft/world/entity/player/Player.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "4J.Common/4J_Compat.h" #include "Abilities.h" diff --git a/targets/minecraft/world/entity/projectile/Arrow.cpp b/targets/minecraft/world/entity/projectile/Arrow.cpp index 7b8ae0518..91f6ddb8d 100644 --- a/targets/minecraft/world/entity/projectile/Arrow.cpp +++ b/targets/minecraft/world/entity/projectile/Arrow.cpp @@ -2,8 +2,6 @@ #include #include - -#include #include #include #include @@ -33,6 +31,7 @@ #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" // base damage, multiplied with velocity const double Arrow::ARROW_BASE_DAMAGE = 2.0f; diff --git a/targets/minecraft/world/entity/projectile/DragonFireball.cpp b/targets/minecraft/world/entity/projectile/DragonFireball.cpp index 297041f57..6dac15745 100644 --- a/targets/minecraft/world/entity/projectile/DragonFireball.cpp +++ b/targets/minecraft/world/entity/projectile/DragonFireball.cpp @@ -1,18 +1,17 @@ #include "DragonFireball.h" #include - -#include #include #include "java/JavaMath.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/LivingEntity.h" -#include "minecraft/world/entity/projectile/Fireball.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "minecraft/world/entity/projectile/Fireball.h" class Entity; diff --git a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp index 37a0aea41..57f1b4648 100644 --- a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp +++ b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp @@ -14,6 +14,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/Entity.h" void EyeOfEnderSignal::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/projectile/Fireball.cpp b/targets/minecraft/world/entity/projectile/Fireball.cpp index 118ab3c6a..44094e82a 100644 --- a/targets/minecraft/world/entity/projectile/Fireball.cpp +++ b/targets/minecraft/world/entity/projectile/Fireball.cpp @@ -2,9 +2,7 @@ #include #include - #include -#include #include #include #include @@ -24,6 +22,7 @@ #include "nbt/CompoundTag.h" #include "nbt/DoubleTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/entity/Entity.h" // 4J - added common ctor code. void Fireball::_init() { diff --git a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp index 5622d71f8..78c09d121 100644 --- a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp +++ b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp @@ -1,7 +1,6 @@ #include "FireworksRocketEntity.h" #include - #include #include @@ -16,6 +15,7 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" FireworksRocketEntity::FireworksRocketEntity(Level* level) : Entity(level) { defineSynchedData(); diff --git a/targets/minecraft/world/entity/projectile/FishingHook.cpp b/targets/minecraft/world/entity/projectile/FishingHook.cpp index 0efb5a7fc..9a0fff7dd 100644 --- a/targets/minecraft/world/entity/projectile/FishingHook.cpp +++ b/targets/minecraft/world/entity/projectile/FishingHook.cpp @@ -2,8 +2,6 @@ #include #include - -#include #include #include #include @@ -25,6 +23,7 @@ #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" // 4J - added common ctor code. void FishingHook::_init() { diff --git a/targets/minecraft/world/entity/projectile/LargeFireball.cpp b/targets/minecraft/world/entity/projectile/LargeFireball.cpp index 02de91210..08803c34d 100644 --- a/targets/minecraft/world/entity/projectile/LargeFireball.cpp +++ b/targets/minecraft/world/entity/projectile/LargeFireball.cpp @@ -5,11 +5,11 @@ #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" -#include "minecraft/world/entity/projectile/Fireball.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/HitResult.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/projectile/Fireball.h" LargeFireball::LargeFireball(Level* level) : Fireball(level) { explosionPower = 1; diff --git a/targets/minecraft/world/entity/projectile/SmallFireball.cpp b/targets/minecraft/world/entity/projectile/SmallFireball.cpp index e17e844dc..65a28e9f5 100644 --- a/targets/minecraft/world/entity/projectile/SmallFireball.cpp +++ b/targets/minecraft/world/entity/projectile/SmallFireball.cpp @@ -4,10 +4,10 @@ #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" -#include "minecraft/world/entity/projectile/Fireball.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/entity/projectile/Fireball.h" SmallFireball::SmallFireball(Level* level) : Fireball(level) { setSize(5 / 16.0f, 5 / 16.0f); diff --git a/targets/minecraft/world/entity/projectile/Snowball.cpp b/targets/minecraft/world/entity/projectile/Snowball.cpp index 787846ef3..201309736 100644 --- a/targets/minecraft/world/entity/projectile/Snowball.cpp +++ b/targets/minecraft/world/entity/projectile/Snowball.cpp @@ -3,9 +3,9 @@ #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" -#include "minecraft/world/entity/projectile/Throwable.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/entity/projectile/Throwable.h" class LivingEntity; diff --git a/targets/minecraft/world/entity/projectile/Throwable.cpp b/targets/minecraft/world/entity/projectile/Throwable.cpp index 39ae5d76e..52b49211a 100644 --- a/targets/minecraft/world/entity/projectile/Throwable.cpp +++ b/targets/minecraft/world/entity/projectile/Throwable.cpp @@ -2,21 +2,21 @@ #include #include - -#include #include #include #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/player/Player.h" void Throwable::_throwableInit() { xTile = -1; diff --git a/targets/minecraft/world/entity/projectile/ThrownEgg.cpp b/targets/minecraft/world/entity/projectile/ThrownEgg.cpp index c81731e8d..3127bf114 100644 --- a/targets/minecraft/world/entity/projectile/ThrownEgg.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownEgg.cpp @@ -6,9 +6,9 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Chicken.h" -#include "minecraft/world/entity/projectile/Throwable.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/entity/projectile/Throwable.h" void ThrownEgg::_init() { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp index 0ada74647..712825e50 100644 --- a/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp @@ -7,9 +7,9 @@ #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" -#include "minecraft/world/entity/projectile/Throwable.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/entity/projectile/Throwable.h" ThrownEnderpearl::ThrownEnderpearl(Level* level) : Throwable(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp b/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp index 4c367794b..6b18e78e8 100644 --- a/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp @@ -3,9 +3,9 @@ #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/world/entity/ExperienceOrb.h" -#include "minecraft/world/entity/projectile/Throwable.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/entity/projectile/Throwable.h" class LivingEntity; diff --git a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp index f421bf8df..b19917b56 100644 --- a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp @@ -1,8 +1,6 @@ #include "ThrownPotion.h" #include - -#include #include #include @@ -11,7 +9,6 @@ #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/effect/MobEffectInstance.h" #include "minecraft/world/entity/LivingEntity.h" -#include "minecraft/world/entity/projectile/Throwable.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/PotionItem.h" @@ -20,6 +17,7 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/entity/projectile/Throwable.h" class Entity; diff --git a/targets/minecraft/world/entity/projectile/WitherSkull.cpp b/targets/minecraft/world/entity/projectile/WitherSkull.cpp index e1646e35e..7846d6a7b 100644 --- a/targets/minecraft/world/entity/projectile/WitherSkull.cpp +++ b/targets/minecraft/world/entity/projectile/WitherSkull.cpp @@ -1,7 +1,6 @@ #include "WitherSkull.h" #include - #include #include "minecraft/SharedConstants.h" @@ -12,11 +11,11 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/SyncedEntityData.h" -#include "minecraft/world/entity/projectile/Fireball.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/entity/projectile/Fireball.h" WitherSkull::WitherSkull(Level* level) : Fireball(level) { defineSynchedData(); diff --git a/targets/minecraft/world/food/FoodData.cpp b/targets/minecraft/world/food/FoodData.cpp index 5285f7972..3d54ae913 100644 --- a/targets/minecraft/world/food/FoodData.cpp +++ b/targets/minecraft/world/food/FoodData.cpp @@ -7,7 +7,6 @@ #include "minecraft/world/Difficulty.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/food/FoodData.h" #include "minecraft/world/item/FoodItem.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/inventory/AbstractContainerMenu.cpp b/targets/minecraft/world/inventory/AbstractContainerMenu.cpp index 0542a61b6..bea5c3b46 100644 --- a/targets/minecraft/world/inventory/AbstractContainerMenu.cpp +++ b/targets/minecraft/world/inventory/AbstractContainerMenu.cpp @@ -8,9 +8,9 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" // 4J Stu - The java does not have ctor here (being an abstract) but we need one // to initialise the member variables diff --git a/targets/minecraft/world/inventory/AnimalChest.cpp b/targets/minecraft/world/inventory/AnimalChest.cpp index f02b6c660..584c9f103 100644 --- a/targets/minecraft/world/inventory/AnimalChest.cpp +++ b/targets/minecraft/world/inventory/AnimalChest.cpp @@ -1,6 +1,7 @@ #include "AnimalChest.h" #include "strings.h" +#include "minecraft/world/SimpleContainer.h" AnimalChest::AnimalChest(const std::wstring& name, int size) : SimpleContainer(IDS_CONTAINER_ANIMAL, name, false, size) {} diff --git a/targets/minecraft/world/inventory/AnimalChest.h b/targets/minecraft/world/inventory/AnimalChest.h index 82edddae5..3465c12b9 100644 --- a/targets/minecraft/world/inventory/AnimalChest.h +++ b/targets/minecraft/world/inventory/AnimalChest.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "minecraft/world/SimpleContainer.h" class AnimalChest : public SimpleContainer { diff --git a/targets/minecraft/world/inventory/AnvilMenu.cpp b/targets/minecraft/world/inventory/AnvilMenu.cpp index 2e8407bb3..f099c08f7 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.cpp +++ b/targets/minecraft/world/inventory/AnvilMenu.cpp @@ -1,12 +1,31 @@ #include "AnvilMenu.h" +#include +#include +#include +#include + #include "console_helpers/StringHelpers.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "net.minecraft.world.inventory.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/RepairContainer.h" +#include "minecraft/world/inventory/RepairResultSlot.h" +#include "minecraft/world/inventory/ResultContainer.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" AnvilMenu::AnvilMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt, std::shared_ptr player) { diff --git a/targets/minecraft/world/inventory/AnvilMenu.h b/targets/minecraft/world/inventory/AnvilMenu.h index eea6ab5a0..d1e3001c2 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.h +++ b/targets/minecraft/world/inventory/AnvilMenu.h @@ -1,7 +1,15 @@ #pragma once +#include +#include + #include "AbstractContainerMenu.h" +class Container; +class Inventory; +class Level; +class Player; + class AnvilMenu : public AbstractContainerMenu { friend class RepairResultSlot; diff --git a/targets/minecraft/world/inventory/ArmorSlot.cpp b/targets/minecraft/world/inventory/ArmorSlot.cpp index e150faaf3..391d3e58f 100644 --- a/targets/minecraft/world/inventory/ArmorSlot.cpp +++ b/targets/minecraft/world/inventory/ArmorSlot.cpp @@ -1,10 +1,10 @@ #include "ArmorSlot.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ArmorItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/inventory/Slot.h" ArmorSlot::ArmorSlot(int slotNum, std::shared_ptr container, int id, int x, int y) diff --git a/targets/minecraft/world/inventory/BeaconMenu.cpp b/targets/minecraft/world/inventory/BeaconMenu.cpp index ea9d87753..46d3a6539 100644 --- a/targets/minecraft/world/inventory/BeaconMenu.cpp +++ b/targets/minecraft/world/inventory/BeaconMenu.cpp @@ -2,12 +2,12 @@ #include -#include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/inventory/Slot.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" class Container; diff --git a/targets/minecraft/world/inventory/BrewingStandMenu.cpp b/targets/minecraft/world/inventory/BrewingStandMenu.cpp index a63b595dd..867ce7648 100644 --- a/targets/minecraft/world/inventory/BrewingStandMenu.cpp +++ b/targets/minecraft/world/inventory/BrewingStandMenu.cpp @@ -5,13 +5,13 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/inventory/Slot.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/alchemy/PotionBrewing.h" #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" BrewingStandMenu::BrewingStandMenu( std::shared_ptr inventory, diff --git a/targets/minecraft/world/inventory/ContainerMenu.cpp b/targets/minecraft/world/inventory/ContainerMenu.cpp index a7d8eb854..61e06f340 100644 --- a/targets/minecraft/world/inventory/ContainerMenu.cpp +++ b/targets/minecraft/world/inventory/ContainerMenu.cpp @@ -9,9 +9,9 @@ #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" ContainerMenu::ContainerMenu(std::shared_ptr inventory, std::shared_ptr container) diff --git a/targets/minecraft/world/inventory/CraftingContainer.cpp b/targets/minecraft/world/inventory/CraftingContainer.cpp index 3340a2aad..8a36270ed 100644 --- a/targets/minecraft/world/inventory/CraftingContainer.cpp +++ b/targets/minecraft/world/inventory/CraftingContainer.cpp @@ -3,6 +3,8 @@ #include #include "AbstractContainerMenu.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/item/ItemInstance.h" CraftingContainer::~CraftingContainer() {} diff --git a/targets/minecraft/world/inventory/CraftingContainer.h b/targets/minecraft/world/inventory/CraftingContainer.h index 7c9a9b3cf..f35c1dfd8 100644 --- a/targets/minecraft/world/inventory/CraftingContainer.h +++ b/targets/minecraft/world/inventory/CraftingContainer.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "minecraft/world/Container.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/inventory/CraftingMenu.cpp b/targets/minecraft/world/inventory/CraftingMenu.cpp index a8a9c4a20..5f6829f61 100644 --- a/targets/minecraft/world/inventory/CraftingMenu.cpp +++ b/targets/minecraft/world/inventory/CraftingMenu.cpp @@ -8,12 +8,12 @@ #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/crafting/Recipes.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" const int CraftingMenu::RESULT_SLOT = 0; const int CraftingMenu::CRAFT_SLOT_START = 1; diff --git a/targets/minecraft/world/inventory/EnchantmentContainer.cpp b/targets/minecraft/world/inventory/EnchantmentContainer.cpp index f4e773d1c..151f342d7 100644 --- a/targets/minecraft/world/inventory/EnchantmentContainer.cpp +++ b/targets/minecraft/world/inventory/EnchantmentContainer.cpp @@ -1,6 +1,11 @@ #include "EnchantmentContainer.h" -#include "net.minecraft.world.inventory.h" +#include +#include + +#include "strings.h" +#include "minecraft/world/SimpleContainer.h" +#include "minecraft/world/inventory/EnchantmentMenu.h" EnchantmentContainer::EnchantmentContainer(EnchantmentMenu* menu) : SimpleContainer(IDS_ENCHANT, L"", false, 1), m_menu(menu) {} diff --git a/targets/minecraft/world/inventory/EnchantmentMenu.cpp b/targets/minecraft/world/inventory/EnchantmentMenu.cpp index 15e29f6de..129aa70b6 100644 --- a/targets/minecraft/world/inventory/EnchantmentMenu.cpp +++ b/targets/minecraft/world/inventory/EnchantmentMenu.cpp @@ -1,17 +1,14 @@ #include "EnchantmentMenu.h" -#include #include #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/EnchantmentContainer.h" #include "minecraft/world/inventory/EnchantmentSlot.h" #include "minecraft/world/inventory/Slot.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" #include "minecraft/world/item/EnchantedBookItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" @@ -19,6 +16,8 @@ #include "minecraft/world/item/enchantment/EnchantmentInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" EnchantmentMenu::EnchantmentMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) { diff --git a/targets/minecraft/world/inventory/FireworksMenu.cpp b/targets/minecraft/world/inventory/FireworksMenu.cpp index a20a436e0..617f86b81 100644 --- a/targets/minecraft/world/inventory/FireworksMenu.cpp +++ b/targets/minecraft/world/inventory/FireworksMenu.cpp @@ -8,12 +8,12 @@ #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/crafting/FireworksRecipe.h" #include "minecraft/world/item/crafting/Recipes.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" FireworksMenu::FireworksMenu(std::shared_ptr inventory, Level* level, int xt, int yt, int zt) diff --git a/targets/minecraft/world/inventory/FurnaceMenu.cpp b/targets/minecraft/world/inventory/FurnaceMenu.cpp index 6ecbd2078..aab46c441 100644 --- a/targets/minecraft/world/inventory/FurnaceMenu.cpp +++ b/targets/minecraft/world/inventory/FurnaceMenu.cpp @@ -7,13 +7,13 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" #include "minecraft/world/item/CoalItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/crafting/FurnaceRecipes.h" #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" FurnaceMenu::FurnaceMenu(std::shared_ptr inventory, std::shared_ptr furnace) diff --git a/targets/minecraft/world/inventory/FurnaceResultSlot.cpp b/targets/minecraft/world/inventory/FurnaceResultSlot.cpp index 0639ab242..d79391f98 100644 --- a/targets/minecraft/world/inventory/FurnaceResultSlot.cpp +++ b/targets/minecraft/world/inventory/FurnaceResultSlot.cpp @@ -7,11 +7,11 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/ExperienceOrb.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/crafting/FurnaceRecipes.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/inventory/Slot.h" class Container; diff --git a/targets/minecraft/world/inventory/HopperMenu.cpp b/targets/minecraft/world/inventory/HopperMenu.cpp index 365aba045..76fa31822 100644 --- a/targets/minecraft/world/inventory/HopperMenu.cpp +++ b/targets/minecraft/world/inventory/HopperMenu.cpp @@ -2,9 +2,10 @@ #include -#include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" HopperMenu::HopperMenu(std::shared_ptr inventory, std::shared_ptr hopper) { diff --git a/targets/minecraft/world/inventory/HorseInventoryMenu.cpp b/targets/minecraft/world/inventory/HorseInventoryMenu.cpp index 9e696fb45..8d7a83cc6 100644 --- a/targets/minecraft/world/inventory/HorseInventoryMenu.cpp +++ b/targets/minecraft/world/inventory/HorseInventoryMenu.cpp @@ -4,10 +4,11 @@ #include "minecraft/world/entity/animal/EntityHorse.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" HorseSaddleSlot::HorseSaddleSlot(std::shared_ptr horseInventory) : Slot(horseInventory, EntityHorse::INV_SLOT_SADDLE, 8, 18) {} diff --git a/targets/minecraft/world/inventory/InventoryMenu.cpp b/targets/minecraft/world/inventory/InventoryMenu.cpp index d65f36a7b..862ee38ed 100644 --- a/targets/minecraft/world/inventory/InventoryMenu.cpp +++ b/targets/minecraft/world/inventory/InventoryMenu.cpp @@ -10,12 +10,12 @@ #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/crafting/ArmorRecipes.h" #include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/Slot.h" const int InventoryMenu::RESULT_SLOT = 0; const int InventoryMenu::CRAFT_SLOT_START = 1; diff --git a/targets/minecraft/world/inventory/MerchantContainer.cpp b/targets/minecraft/world/inventory/MerchantContainer.cpp index e70e19742..a8b97f765 100644 --- a/targets/minecraft/world/inventory/MerchantContainer.cpp +++ b/targets/minecraft/world/inventory/MerchantContainer.cpp @@ -5,6 +5,7 @@ #include "minecraft/world/item/trading/Merchant.h" #include "minecraft/world/item/trading/MerchantRecipe.h" #include "minecraft/world/item/trading/MerchantRecipeList.h" +#include "minecraft/world/Container.h" MerchantContainer::~MerchantContainer() {} diff --git a/targets/minecraft/world/inventory/MerchantMenu.cpp b/targets/minecraft/world/inventory/MerchantMenu.cpp index 246f802e4..5369d174c 100644 --- a/targets/minecraft/world/inventory/MerchantMenu.cpp +++ b/targets/minecraft/world/inventory/MerchantMenu.cpp @@ -4,12 +4,13 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/AbstractContainerMenu.h" #include "minecraft/world/inventory/MerchantContainer.h" #include "minecraft/world/inventory/MerchantResultSlot.h" #include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/trading/Merchant.h" MerchantMenu::MerchantMenu(std::shared_ptr inventory, std::shared_ptr merchant, Level* level) { diff --git a/targets/minecraft/world/inventory/MerchantResultSlot.cpp b/targets/minecraft/world/inventory/MerchantResultSlot.cpp index 86c930cbc..a7abb097b 100644 --- a/targets/minecraft/world/inventory/MerchantResultSlot.cpp +++ b/targets/minecraft/world/inventory/MerchantResultSlot.cpp @@ -5,10 +5,10 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/inventory/MerchantContainer.h" #include "minecraft/world/inventory/MerchantMenu.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/trading/Merchant.h" #include "minecraft/world/item/trading/MerchantRecipe.h" +#include "minecraft/world/inventory/Slot.h" MerchantResultSlot::MerchantResultSlot(Player* player, std::shared_ptr merchant, diff --git a/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp b/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp index fbc5d86bd..b155adc88 100644 --- a/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp +++ b/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp @@ -1,7 +1,15 @@ #include "PlayerEnderChestContainer.h" +#include +#include + #include "minecraft/network/packet/ContainerOpenPacket.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/SimpleContainer.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/entity/EnderChestTileEntity.h" PlayerEnderChestContainer::PlayerEnderChestContainer() : SimpleContainer(IDS_TILE_ENDERCHEST, L"", false, 9 * 3) { diff --git a/targets/minecraft/world/inventory/PlayerEnderChestContainer.h b/targets/minecraft/world/inventory/PlayerEnderChestContainer.h index 1e2586da7..9f0b57b9b 100644 --- a/targets/minecraft/world/inventory/PlayerEnderChestContainer.h +++ b/targets/minecraft/world/inventory/PlayerEnderChestContainer.h @@ -7,6 +7,8 @@ class ItemInstance; class EnderChestTileEntity; +class CompoundTag; +template class ListTag; class PlayerEnderChestContainer : public SimpleContainer { private: diff --git a/targets/minecraft/world/inventory/RepairResultSlot.cpp b/targets/minecraft/world/inventory/RepairResultSlot.cpp index 2c4942202..b3bd8e427 100644 --- a/targets/minecraft/world/inventory/RepairResultSlot.cpp +++ b/targets/minecraft/world/inventory/RepairResultSlot.cpp @@ -5,11 +5,11 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/inventory/AnvilMenu.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/inventory/Slot.h" RepairResultSlot::RepairResultSlot(AnvilMenu* menu, int xt, int yt, int zt, std::shared_ptr container, diff --git a/targets/minecraft/world/inventory/ResultContainer.cpp b/targets/minecraft/world/inventory/ResultContainer.cpp index 37e4f2969..cd9860d59 100644 --- a/targets/minecraft/world/inventory/ResultContainer.cpp +++ b/targets/minecraft/world/inventory/ResultContainer.cpp @@ -1,5 +1,7 @@ #include "ResultContainer.h" +#include "minecraft/world/Container.h" + ResultContainer::ResultContainer() : Container() {} unsigned int ResultContainer::getContainerSize() { return 1; } diff --git a/targets/minecraft/world/inventory/ResultSlot.cpp b/targets/minecraft/world/inventory/ResultSlot.cpp index 1169e564d..5a32c6b40 100644 --- a/targets/minecraft/world/inventory/ResultSlot.cpp +++ b/targets/minecraft/world/inventory/ResultSlot.cpp @@ -6,10 +6,10 @@ #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/inventory/Slot.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/inventory/Slot.h" ResultSlot::ResultSlot(Player* player, std::shared_ptr craftSlots, std::shared_ptr container, int id, int x, diff --git a/targets/minecraft/world/inventory/Slot.cpp b/targets/minecraft/world/inventory/Slot.cpp index 264703bd6..c6f57dc56 100644 --- a/targets/minecraft/world/inventory/Slot.cpp +++ b/targets/minecraft/world/inventory/Slot.cpp @@ -8,6 +8,7 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/item/crafting/ArmorDyeRecipe.h" #include "minecraft/world/item/crafting/Recipes.h" +#include "minecraft/world/item/ItemInstance.h" class Icon; class Player; diff --git a/targets/minecraft/world/item/AnvilTileItem.cpp b/targets/minecraft/world/item/AnvilTileItem.cpp index cbd09cc10..41babae5c 100644 --- a/targets/minecraft/world/item/AnvilTileItem.cpp +++ b/targets/minecraft/world/item/AnvilTileItem.cpp @@ -1,8 +1,8 @@ #include "AnvilTileItem.h" -#include "minecraft/world/item/MultiTextureTileItem.h" #include "minecraft/world/level/tile/AnvilTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/MultiTextureTileItem.h" AnvilTileItem::AnvilTileItem(Tile* tile) : MultiTextureTileItem(tile->id - 256, tile, (int*)AnvilTile::ANVIL_NAMES, diff --git a/targets/minecraft/world/item/ArmorItem.cpp b/targets/minecraft/world/item/ArmorItem.cpp index 2c834369a..1448fed7d 100644 --- a/targets/minecraft/world/item/ArmorItem.cpp +++ b/targets/minecraft/world/item/ArmorItem.cpp @@ -1,7 +1,6 @@ #include "ArmorItem.h" #include - #include #include @@ -17,12 +16,12 @@ #include "minecraft/world/entity/EntitySelector.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/Mob.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/DispenserTile.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/item/Item.h" class Entity; class Icon; diff --git a/targets/minecraft/world/item/AuxDataTileItem.cpp b/targets/minecraft/world/item/AuxDataTileItem.cpp index 210bfb83d..bc351e2b0 100644 --- a/targets/minecraft/world/item/AuxDataTileItem.cpp +++ b/targets/minecraft/world/item/AuxDataTileItem.cpp @@ -1,7 +1,7 @@ #include "AuxDataTileItem.h" -#include "minecraft/world/item/TileItem.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/TileItem.h" AuxDataTileItem::AuxDataTileItem(int id, Tile* parentTile) : TileItem(id) { this->parentTile = parentTile; diff --git a/targets/minecraft/world/item/BedItem.cpp b/targets/minecraft/world/item/BedItem.cpp index e1701cff5..1587ccc5e 100644 --- a/targets/minecraft/world/item/BedItem.cpp +++ b/targets/minecraft/world/item/BedItem.cpp @@ -7,11 +7,11 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/BedTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" BedItem::BedItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/BoatItem.cpp b/targets/minecraft/world/item/BoatItem.cpp index 5d2fa7d9b..0d96097f3 100644 --- a/targets/minecraft/world/item/BoatItem.cpp +++ b/targets/minecraft/world/item/BoatItem.cpp @@ -1,13 +1,25 @@ #include "BoatItem.h" +#include +#include +#include +#include +#include + #include "ItemInstance.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "minecraft/world/phys/Vec3.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "java/Class.h" +#include "strings.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/item/Boat.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" +#include "minecraft/world/phys/HitResult.h" BoatItem::BoatItem(int id) : Item(id) { maxStackSize = 1; } diff --git a/targets/minecraft/world/item/BookItem.cpp b/targets/minecraft/world/item/BookItem.cpp index ad760aa64..1508eeabf 100644 --- a/targets/minecraft/world/item/BookItem.cpp +++ b/targets/minecraft/world/item/BookItem.cpp @@ -2,8 +2,8 @@ #include -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Item.h" BookItem::BookItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/BottleItem.cpp b/targets/minecraft/world/item/BottleItem.cpp index 8ab3efa1b..12d585dd5 100644 --- a/targets/minecraft/world/item/BottleItem.cpp +++ b/targets/minecraft/world/item/BottleItem.cpp @@ -4,12 +4,12 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/PotionItem.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/item/Item.h" BottleItem::BottleItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/BowItem.cpp b/targets/minecraft/world/item/BowItem.cpp index 4cee3a56a..0f24d6826 100644 --- a/targets/minecraft/world/item/BowItem.cpp +++ b/targets/minecraft/world/item/BowItem.cpp @@ -9,11 +9,11 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/Arrow.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/enchantment/Enchantment.h" #include "minecraft/world/item/enchantment/EnchantmentHelper.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" class Icon; diff --git a/targets/minecraft/world/item/BowItem.h b/targets/minecraft/world/item/BowItem.h index 7612f73f8..4d2bb2ed1 100644 --- a/targets/minecraft/world/item/BowItem.h +++ b/targets/minecraft/world/item/BowItem.h @@ -4,6 +4,7 @@ #include "Item.h" #include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/UseAnim.h" class Player; class Level; diff --git a/targets/minecraft/world/item/BowlFoodItem.cpp b/targets/minecraft/world/item/BowlFoodItem.cpp index 5489c65c6..d8f59680f 100644 --- a/targets/minecraft/world/item/BowlFoodItem.cpp +++ b/targets/minecraft/world/item/BowlFoodItem.cpp @@ -2,9 +2,9 @@ #include +#include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/FoodItem.h" #include "minecraft/world/item/Item.h" -#include "minecraft/world/item/ItemInstance.h" BowlFoodItem::BowlFoodItem(int id, int nutrition) : FoodItem(id, nutrition, false) { diff --git a/targets/minecraft/world/item/BucketItem.cpp b/targets/minecraft/world/item/BucketItem.cpp index 9bee7d363..b375b9da8 100644 --- a/targets/minecraft/world/item/BucketItem.cpp +++ b/targets/minecraft/world/item/BucketItem.cpp @@ -17,13 +17,13 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/item/Item.h" BucketItem::BucketItem(int id, int content) : Item(id) { maxStackSize = 1; diff --git a/targets/minecraft/world/item/CarrotOnAStickItem.cpp b/targets/minecraft/world/item/CarrotOnAStickItem.cpp index 5de3564e4..b6b26ea65 100644 --- a/targets/minecraft/world/item/CarrotOnAStickItem.cpp +++ b/targets/minecraft/world/item/CarrotOnAStickItem.cpp @@ -7,8 +7,8 @@ #include "minecraft/world/entity/animal/Pig.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/FishingRodItem.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Item.h" CarrotOnAStickItem::CarrotOnAStickItem(int id) : Item(id) { setMaxStackSize(1); diff --git a/targets/minecraft/world/item/CoalItem.cpp b/targets/minecraft/world/item/CoalItem.cpp index 6b28395d5..a512ff229 100644 --- a/targets/minecraft/world/item/CoalItem.cpp +++ b/targets/minecraft/world/item/CoalItem.cpp @@ -1,9 +1,12 @@ #include "CoalItem.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/net.minecraft.world.h" -#include "net.minecraft.world.item.h" +#include +#include + +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" CoalItem::CoalItem(int id) : Item(id) { setStackedByData(true); diff --git a/targets/minecraft/world/item/CoalItem.h b/targets/minecraft/world/item/CoalItem.h index fdd15ee61..b90d4c6d4 100644 --- a/targets/minecraft/world/item/CoalItem.h +++ b/targets/minecraft/world/item/CoalItem.h @@ -3,6 +3,7 @@ #include "Item.h" class ItemInstance; +class Icon; class CoalItem : public Item { private: diff --git a/targets/minecraft/world/item/ColoredTileItem.cpp b/targets/minecraft/world/item/ColoredTileItem.cpp index d28fa974d..e8f65e78e 100644 --- a/targets/minecraft/world/item/ColoredTileItem.cpp +++ b/targets/minecraft/world/item/ColoredTileItem.cpp @@ -3,8 +3,8 @@ #include #include "minecraft/world/item/ItemInstance.h" -#include "minecraft/world/item/TileItem.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/TileItem.h" ColoredTileItem::ColoredTileItem(int id, bool stackedByData) : TileItem(id) { this->colorTile = Tile::tiles[getTileId()]; diff --git a/targets/minecraft/world/item/DiggerItem.cpp b/targets/minecraft/world/item/DiggerItem.cpp index 92f213f7d..db02e7b6c 100644 --- a/targets/minecraft/world/item/DiggerItem.cpp +++ b/targets/minecraft/world/item/DiggerItem.cpp @@ -5,9 +5,10 @@ #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/item/Item.h" DiggerItem::DiggerItem(int id, float attackDamage, const Tier* tier, std::vector* tiles) diff --git a/targets/minecraft/world/item/DiggerItem.h b/targets/minecraft/world/item/DiggerItem.h index 1ad9ba7f7..b79adbb06 100644 --- a/targets/minecraft/world/item/DiggerItem.h +++ b/targets/minecraft/world/item/DiggerItem.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "Item.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" diff --git a/targets/minecraft/world/item/DoorItem.cpp b/targets/minecraft/world/item/DoorItem.cpp index e461ae5f2..3da99117c 100644 --- a/targets/minecraft/world/item/DoorItem.cpp +++ b/targets/minecraft/world/item/DoorItem.cpp @@ -7,11 +7,11 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" DoorItem::DoorItem(int id, Material* material) : Item(id) { this->material = material; diff --git a/targets/minecraft/world/item/DyePowderItem.cpp b/targets/minecraft/world/item/DyePowderItem.cpp index 452632dfc..e03f7fbe3 100644 --- a/targets/minecraft/world/item/DyePowderItem.cpp +++ b/targets/minecraft/world/item/DyePowderItem.cpp @@ -2,17 +2,31 @@ #include "DyePowderItem.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "nbt/com.mojang.nbt.h" -#include "net.minecraft.world.item.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Random.h" +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/Sheep.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/CocoaTile.h" +#include "minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/level/tile/CropTile.h" +#include "minecraft/world/level/tile/DirectionalTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/MushroomPlantTile.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/SaplingPlantTile.h" +#include "minecraft/world/level/tile/StemTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" + +class Icon; DyePowderItem::DyePowderItem(int id) : Item(id) { setStackedByData(true); diff --git a/targets/minecraft/world/item/DyePowderItem.h b/targets/minecraft/world/item/DyePowderItem.h index 5ed4091b1..fbe562926 100644 --- a/targets/minecraft/world/item/DyePowderItem.h +++ b/targets/minecraft/world/item/DyePowderItem.h @@ -1,10 +1,15 @@ #pragma once +#include +#include + #include "Item.h" class Player; class Mob; class Level; +class Icon; +class ItemInstance; class DyePowderItem : public Item { public: diff --git a/targets/minecraft/world/item/EggItem.cpp b/targets/minecraft/world/item/EggItem.cpp index 01e664d77..6d2ed728d 100644 --- a/targets/minecraft/world/item/EggItem.cpp +++ b/targets/minecraft/world/item/EggItem.cpp @@ -8,9 +8,9 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/ThrownEgg.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" EggItem::EggItem(int id) : Item(id) { maxStackSize = 16; } diff --git a/targets/minecraft/world/item/EmptyMapItem.cpp b/targets/minecraft/world/item/EmptyMapItem.cpp index 73e6ceae5..45ff3509d 100644 --- a/targets/minecraft/world/item/EmptyMapItem.cpp +++ b/targets/minecraft/world/item/EmptyMapItem.cpp @@ -4,10 +4,10 @@ #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/ComplexItem.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/MapItem.h" +#include "minecraft/world/item/ComplexItem.h" +#include "minecraft/world/item/Item.h" EmptyMapItem::EmptyMapItem(int id) : ComplexItem(id) {} diff --git a/targets/minecraft/world/item/EnchantedBookItem.cpp b/targets/minecraft/world/item/EnchantedBookItem.cpp index 136715927..e8cd91179 100644 --- a/targets/minecraft/world/item/EnchantedBookItem.cpp +++ b/targets/minecraft/world/item/EnchantedBookItem.cpp @@ -5,12 +5,13 @@ #include "java/Random.h" #include "minecraft/util/HtmlString.h" #include "minecraft/util/WeighedTreasure.h" -#include "minecraft/world/item/Item.h" -#include "minecraft/world/item/Rarity.h" #include "minecraft/world/item/enchantment/Enchantment.h" #include "minecraft/world/item/enchantment/EnchantmentInstance.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Rarity.h" const std::wstring EnchantedBookItem::TAG_STORED_ENCHANTMENTS = L"StoredEnchantments"; diff --git a/targets/minecraft/world/item/EnchantedBookItem.h b/targets/minecraft/world/item/EnchantedBookItem.h index 018eb33ad..d33f916bb 100644 --- a/targets/minecraft/world/item/EnchantedBookItem.h +++ b/targets/minecraft/world/item/EnchantedBookItem.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "Item.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/item/EnderEyeItem.cpp b/targets/minecraft/world/item/EnderEyeItem.cpp index ab8f37204..713b1667a 100644 --- a/targets/minecraft/world/item/EnderEyeItem.cpp +++ b/targets/minecraft/world/item/EnderEyeItem.cpp @@ -10,7 +10,6 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/EyeOfEnderSignal.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" @@ -19,6 +18,7 @@ #include "minecraft/world/level/tile/TheEndPortalFrameTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/item/Item.h" EnderEyeItem::EnderEyeItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/EnderpearlItem.cpp b/targets/minecraft/world/item/EnderpearlItem.cpp index 851b958c7..d2fd09035 100644 --- a/targets/minecraft/world/item/EnderpearlItem.cpp +++ b/targets/minecraft/world/item/EnderpearlItem.cpp @@ -7,9 +7,9 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/ThrownEnderpearl.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" EnderpearlItem::EnderpearlItem(int id) : Item(id) { maxStackSize = 16; } diff --git a/targets/minecraft/world/item/ExperienceItem.cpp b/targets/minecraft/world/item/ExperienceItem.cpp index 207faa5fb..c4843292d 100644 --- a/targets/minecraft/world/item/ExperienceItem.cpp +++ b/targets/minecraft/world/item/ExperienceItem.cpp @@ -7,9 +7,9 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/ThrownExpBottle.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" ExperienceItem::ExperienceItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/FireChargeItem.cpp b/targets/minecraft/world/item/FireChargeItem.cpp index a0721cb40..9252a31cf 100644 --- a/targets/minecraft/world/item/FireChargeItem.cpp +++ b/targets/minecraft/world/item/FireChargeItem.cpp @@ -8,10 +8,10 @@ #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" FireChargeItem::FireChargeItem(int id) : Item(id) { m_dragonFireballIcon = nullptr; diff --git a/targets/minecraft/world/item/FireworksChargeItem.cpp b/targets/minecraft/world/item/FireworksChargeItem.cpp index 1451d3988..17ed15fa2 100644 --- a/targets/minecraft/world/item/FireworksChargeItem.cpp +++ b/targets/minecraft/world/item/FireworksChargeItem.cpp @@ -1,8 +1,19 @@ #include "FireworksChargeItem.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/net.minecraft.world.h" -#include "net.minecraft.world.item.h" +#include + +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "nbt/IntArrayTag.h" +#include "strings.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/FireworksItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" + +class Tag; FireworksChargeItem::FireworksChargeItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/FireworksChargeItem.h b/targets/minecraft/world/item/FireworksChargeItem.h index 565807036..01f21bf50 100644 --- a/targets/minecraft/world/item/FireworksChargeItem.h +++ b/targets/minecraft/world/item/FireworksChargeItem.h @@ -2,11 +2,18 @@ #include #include +#include #include "Item.h" #include "nbt/CompoundTag.h" #include "nbt/Tag.h" +class CompoundTag; +class HtmlString; +class Icon; +class ItemInstance; +class Tag; + class FireworksChargeItem : public Item { private: Icon* overlay; diff --git a/targets/minecraft/world/item/FireworksItem.cpp b/targets/minecraft/world/item/FireworksItem.cpp index 9641e3605..eedb00b08 100644 --- a/targets/minecraft/world/item/FireworksItem.cpp +++ b/targets/minecraft/world/item/FireworksItem.cpp @@ -1,11 +1,21 @@ #include "FireworksItem.h" +#include +#include + #include "console_helpers/StringHelpers.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "net.minecraft.world.item.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/FireworksRocketEntity.h" +#include "minecraft/world/item/FireworksChargeItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" const std::wstring FireworksItem::TAG_FIREWORKS = L"Fireworks"; const std::wstring FireworksItem::TAG_EXPLOSION = L"Explosion"; diff --git a/targets/minecraft/world/item/FireworksItem.h b/targets/minecraft/world/item/FireworksItem.h index 1340804a3..dc1360566 100644 --- a/targets/minecraft/world/item/FireworksItem.h +++ b/targets/minecraft/world/item/FireworksItem.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Item.h" class FireworksItem : public Item { diff --git a/targets/minecraft/world/item/FishingRodItem.cpp b/targets/minecraft/world/item/FishingRodItem.cpp index fc1a1af73..667b22748 100644 --- a/targets/minecraft/world/item/FishingRodItem.cpp +++ b/targets/minecraft/world/item/FishingRodItem.cpp @@ -8,9 +8,9 @@ #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/FishingHook.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" class Icon; diff --git a/targets/minecraft/world/item/FlintAndSteelItem.cpp b/targets/minecraft/world/item/FlintAndSteelItem.cpp index 16d49a8ec..823e4b094 100644 --- a/targets/minecraft/world/item/FlintAndSteelItem.cpp +++ b/targets/minecraft/world/item/FlintAndSteelItem.cpp @@ -6,11 +6,11 @@ #include "minecraft/sounds/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/PortalTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" FlintAndSteelItem::FlintAndSteelItem(int id) : Item(id) { maxStackSize = 1; diff --git a/targets/minecraft/world/item/FoodItem.cpp b/targets/minecraft/world/item/FoodItem.cpp index b1a0f0e77..ca1248442 100644 --- a/targets/minecraft/world/item/FoodItem.cpp +++ b/targets/minecraft/world/item/FoodItem.cpp @@ -7,9 +7,9 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/food/FoodConstants.h" #include "minecraft/world/food/FoodData.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" void FoodItem::_init() { // 4J Initialisers diff --git a/targets/minecraft/world/item/FoodItem.h b/targets/minecraft/world/item/FoodItem.h index 1fe2f174c..c3d71bda2 100644 --- a/targets/minecraft/world/item/FoodItem.h +++ b/targets/minecraft/world/item/FoodItem.h @@ -4,6 +4,7 @@ #include "Item.h" #include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/UseAnim.h" class Player; class Level; diff --git a/targets/minecraft/world/item/GoldenAppleItem.cpp b/targets/minecraft/world/item/GoldenAppleItem.cpp index 7da37f5a0..17e42e4ed 100644 --- a/targets/minecraft/world/item/GoldenAppleItem.cpp +++ b/targets/minecraft/world/item/GoldenAppleItem.cpp @@ -1,9 +1,16 @@ #include "GoldenAppleItem.h" +#include + #include "minecraft/SharedConstants.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/net.minecraft.world.level.h" +#include "strings.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/FoodItem.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Rarity.h" +#include "minecraft/world/level/Level.h" GoldenAppleItem::GoldenAppleItem(int id, int nutrition, float saturationMod, bool isMeat) diff --git a/targets/minecraft/world/item/GoldenAppleItem.h b/targets/minecraft/world/item/GoldenAppleItem.h index 24f91fd36..9a6d18eaa 100644 --- a/targets/minecraft/world/item/GoldenAppleItem.h +++ b/targets/minecraft/world/item/GoldenAppleItem.h @@ -1,6 +1,7 @@ #pragma once #include "FoodItem.h" +#include "minecraft/world/item/Item.h" class GoldenAppleItem : public FoodItem { public: diff --git a/targets/minecraft/world/item/HangingEntityItem.cpp b/targets/minecraft/world/item/HangingEntityItem.cpp index 2ecdb53dd..34ca838c7 100644 --- a/targets/minecraft/world/item/HangingEntityItem.cpp +++ b/targets/minecraft/world/item/HangingEntityItem.cpp @@ -1,15 +1,24 @@ #include "HangingEntityItem.h" -#include "minecraft/net.minecraft.h" +#include +#include +#include +#include + #include "minecraft/stats/GenericStats.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" #include "minecraft/world/entity/HangingEntity.h" #include "minecraft/world/entity/ItemFrame.h" #include "minecraft/world/entity/Painting.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.item.h" +#include "Direction.h" +#include "Facing.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "strings.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" HangingEntityItem::HangingEntityItem(int id, eINSTANCEOF eClassType) : Item(id) { diff --git a/targets/minecraft/world/item/HangingEntityItem.h b/targets/minecraft/world/item/HangingEntityItem.h index b2e4eee9b..fa35c54e4 100644 --- a/targets/minecraft/world/item/HangingEntityItem.h +++ b/targets/minecraft/world/item/HangingEntityItem.h @@ -7,6 +7,7 @@ #include "java/Class.h" class HangingEntity; +class Level; class HangingEntityItem : public Item { private: diff --git a/targets/minecraft/world/item/HatchetItem.cpp b/targets/minecraft/world/item/HatchetItem.cpp index 0208e4b4c..654386075 100644 --- a/targets/minecraft/world/item/HatchetItem.cpp +++ b/targets/minecraft/world/item/HatchetItem.cpp @@ -3,11 +3,11 @@ #include #include -#include "minecraft/world/item/DiggerItem.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/ChestTile.h" #include "minecraft/world/level/tile/HalfSlabTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DiggerItem.h" std::vector* HatchetItem::diggables = nullptr; diff --git a/targets/minecraft/world/item/HatchetItem.h b/targets/minecraft/world/item/HatchetItem.h index cdaa4f98c..6bcd13d0c 100644 --- a/targets/minecraft/world/item/HatchetItem.h +++ b/targets/minecraft/world/item/HatchetItem.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "DiggerItem.h" diff --git a/targets/minecraft/world/item/HoeItem.cpp b/targets/minecraft/world/item/HoeItem.cpp index e44f59927..f919aaa28 100644 --- a/targets/minecraft/world/item/HoeItem.cpp +++ b/targets/minecraft/world/item/HoeItem.cpp @@ -3,10 +3,10 @@ #include #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" HoeItem::HoeItem(int id, const Tier* tier) : Item(id) { this->tier = tier; diff --git a/targets/minecraft/world/item/Item.cpp b/targets/minecraft/world/item/Item.cpp index 8c9c37fda..f963a95d4 100644 --- a/targets/minecraft/world/item/Item.cpp +++ b/targets/minecraft/world/item/Item.cpp @@ -1,22 +1,83 @@ #include "Item.h" +#include +#include + #include "HangingEntityItem.h" #include "MapItem.h" -#include "minecraft/locale/net.minecraft.locale.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/util/HtmlString.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/food/net.minecraft.world.food.h" -#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" #include "minecraft/world/phys/Vec3.h" -#include "net.minecraft.world.item.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/Random.h" +#include "minecraft/stats/Stats.h" +#include "strings.h" +#include "minecraft/world/Icon.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/item/Minecart.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/BedItem.h" +#include "minecraft/world/item/BoatItem.h" +#include "minecraft/world/item/BookItem.h" +#include "minecraft/world/item/BottleItem.h" +#include "minecraft/world/item/BowItem.h" +#include "minecraft/world/item/BowlFoodItem.h" +#include "minecraft/world/item/BucketItem.h" +#include "minecraft/world/item/CarrotOnAStickItem.h" +#include "minecraft/world/item/ClockItem.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/CompassItem.h" +#include "minecraft/world/item/DoorItem.h" +#include "minecraft/world/item/DyePowderItem.h" +#include "minecraft/world/item/EggItem.h" +#include "minecraft/world/item/EmptyMapItem.h" +#include "minecraft/world/item/EnchantedBookItem.h" +#include "minecraft/world/item/EnderEyeItem.h" +#include "minecraft/world/item/EnderpearlItem.h" +#include "minecraft/world/item/ExperienceItem.h" +#include "minecraft/world/item/FireChargeItem.h" +#include "minecraft/world/item/FireworksChargeItem.h" +#include "minecraft/world/item/FireworksItem.h" +#include "minecraft/world/item/FishingRodItem.h" +#include "minecraft/world/item/FlintAndSteelItem.h" +#include "minecraft/world/item/FoodItem.h" +#include "minecraft/world/item/GoldenAppleItem.h" +#include "minecraft/world/item/HatchetItem.h" +#include "minecraft/world/item/HoeItem.h" +#include "minecraft/world/item/LeashItem.h" +#include "minecraft/world/item/MilkBucketItem.h" +#include "minecraft/world/item/MinecartItem.h" +#include "minecraft/world/item/NameTagItem.h" +#include "minecraft/world/item/PickaxeItem.h" +#include "minecraft/world/item/PlanterTileItem.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/item/Rarity.h" +#include "minecraft/world/item/RecordingItem.h" +#include "minecraft/world/item/RedStoneItem.h" +#include "minecraft/world/item/SaddleItem.h" +#include "minecraft/world/item/SeedFoodItem.h" +#include "minecraft/world/item/SeedItem.h" +#include "minecraft/world/item/ShearsItem.h" +#include "minecraft/world/item/ShovelItem.h" +#include "minecraft/world/item/SignItem.h" +#include "minecraft/world/item/SimpleFoiledItem.h" +#include "minecraft/world/item/SkullItem.h" +#include "minecraft/world/item/SnowballItem.h" +#include "minecraft/world/item/SpawnEggItem.h" +#include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/WeaponItem.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/CauldronTile.h" +#include "minecraft/world/level/tile/ComparatorTile.h" +#include "minecraft/world/level/tile/RepeaterTile.h" +#include "minecraft/world/level/tile/Tile.h" typedef Item::Tier _Tier; diff --git a/targets/minecraft/world/item/Item.h b/targets/minecraft/world/item/Item.h index 12377619a..ee99c4a89 100644 --- a/targets/minecraft/world/item/Item.h +++ b/targets/minecraft/world/item/Item.h @@ -1,9 +1,14 @@ #pragma once +#include +#include +#include + #include "Rarity.h" #include "UseAnim.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/item/ItemInstance.h" class MapItem; class Mob; @@ -24,6 +29,7 @@ class LivingEntity; class HtmlString; class Tile; class Entity; +class Rarity; #define ITEM_ICON_COLUMNS 16 diff --git a/targets/minecraft/world/item/ItemInstance.cpp b/targets/minecraft/world/item/ItemInstance.cpp index 24b6763ec..63e407ef4 100644 --- a/targets/minecraft/world/item/ItemInstance.cpp +++ b/targets/minecraft/world/item/ItemInstance.cpp @@ -2,8 +2,6 @@ #include #include - -#include #include #include #include @@ -22,7 +20,6 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/BowItem.h" -#include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/MapItem.h" #include "minecraft/world/item/UseAnim.h" #include "minecraft/world/item/alchemy/PotionMacros.h" diff --git a/targets/minecraft/world/item/ItemInstance.h b/targets/minecraft/world/item/ItemInstance.h index 62c739177..9342c4bc2 100644 --- a/targets/minecraft/world/item/ItemInstance.h +++ b/targets/minecraft/world/item/ItemInstance.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + #include "UseAnim.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" #include "nbt/com.mojang.nbt.h" @@ -21,6 +25,8 @@ class Icon; class HtmlString; class Tile; class Item; +class Tag; +template class ListTag; // 4J Stu - While this is not really an abstract class, we don't want to make // new instances of it, mainly because there are too many ctors and that doesn't diff --git a/targets/minecraft/world/item/LeafTileItem.cpp b/targets/minecraft/world/item/LeafTileItem.cpp index 82fcf446e..36bde9f30 100644 --- a/targets/minecraft/world/item/LeafTileItem.cpp +++ b/targets/minecraft/world/item/LeafTileItem.cpp @@ -3,10 +3,10 @@ #include #include "minecraft/world/item/ItemInstance.h" -#include "minecraft/world/item/TileItem.h" #include "minecraft/world/level/FoliageColor.h" #include "minecraft/world/level/tile/LeafTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/TileItem.h" LeafTileItem::LeafTileItem(int id) : TileItem(id) { setMaxDamage(0); diff --git a/targets/minecraft/world/item/LeashItem.cpp b/targets/minecraft/world/item/LeashItem.cpp index ea4fe330b..79471af9c 100644 --- a/targets/minecraft/world/item/LeashItem.cpp +++ b/targets/minecraft/world/item/LeashItem.cpp @@ -6,10 +6,10 @@ #include "minecraft/world/entity/LeashFenceKnotEntity.h" #include "minecraft/world/entity/Mob.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/item/Item.h" class Entity; diff --git a/targets/minecraft/world/item/MapItem.cpp b/targets/minecraft/world/item/MapItem.cpp index 9e2f66d3c..776eacf85 100644 --- a/targets/minecraft/world/item/MapItem.cpp +++ b/targets/minecraft/world/item/MapItem.cpp @@ -3,7 +3,6 @@ #include #include #include - #include #include @@ -15,8 +14,6 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" -#include "minecraft/world/item/ComplexItem.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" @@ -26,6 +23,8 @@ #include "minecraft/world/level/saveddata/MapItemSavedData.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/ComplexItem.h" +#include "minecraft/world/item/Item.h" class SavedData; diff --git a/targets/minecraft/world/item/MilkBucketItem.cpp b/targets/minecraft/world/item/MilkBucketItem.cpp index 46ee9a417..1a4baceca 100644 --- a/targets/minecraft/world/item/MilkBucketItem.cpp +++ b/targets/minecraft/world/item/MilkBucketItem.cpp @@ -4,9 +4,9 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" MilkBucketItem::MilkBucketItem(int id) : Item(id) { setMaxStackSize(1); } diff --git a/targets/minecraft/world/item/MilkBucketItem.h b/targets/minecraft/world/item/MilkBucketItem.h index 0a6445386..482d588ac 100644 --- a/targets/minecraft/world/item/MilkBucketItem.h +++ b/targets/minecraft/world/item/MilkBucketItem.h @@ -2,6 +2,7 @@ #include "Item.h" #include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/UseAnim.h" class MilkBucketItem : public Item { private: diff --git a/targets/minecraft/world/item/MinecartItem.cpp b/targets/minecraft/world/item/MinecartItem.cpp index bd58be3d0..0249646e7 100644 --- a/targets/minecraft/world/item/MinecartItem.cpp +++ b/targets/minecraft/world/item/MinecartItem.cpp @@ -9,12 +9,12 @@ #include "minecraft/core/DefaultDispenseItemBehavior.h" #include "minecraft/core/FacingEnum.h" #include "minecraft/world/entity/item/Minecart.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/BaseRailTile.h" #include "minecraft/world/level/tile/DispenserTile.h" #include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/item/Item.h" std::shared_ptr MinecartItem::MinecartDispenseBehavior::execute( BlockSource* source, std::shared_ptr dispensed, diff --git a/targets/minecraft/world/item/MultiTextureTileItem.cpp b/targets/minecraft/world/item/MultiTextureTileItem.cpp index 8f4dd3be5..3378446d8 100644 --- a/targets/minecraft/world/item/MultiTextureTileItem.cpp +++ b/targets/minecraft/world/item/MultiTextureTileItem.cpp @@ -3,9 +3,9 @@ #include #include "minecraft/world/item/ItemInstance.h" -#include "minecraft/world/item/TileItem.h" #include "minecraft/world/item/crafting/Recipes.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/TileItem.h" MultiTextureTileItem::MultiTextureTileItem(int id, Tile* parentTile, int* nameExtensions, int iLength, diff --git a/targets/minecraft/world/item/NameTagItem.cpp b/targets/minecraft/world/item/NameTagItem.cpp index 07912462c..303271ff3 100644 --- a/targets/minecraft/world/item/NameTagItem.cpp +++ b/targets/minecraft/world/item/NameTagItem.cpp @@ -6,8 +6,8 @@ #include "java/Class.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/Mob.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Item.h" NameTagItem::NameTagItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/PickaxeItem.cpp b/targets/minecraft/world/item/PickaxeItem.cpp index ac9cc5834..ad8ff99f1 100644 --- a/targets/minecraft/world/item/PickaxeItem.cpp +++ b/targets/minecraft/world/item/PickaxeItem.cpp @@ -3,10 +3,10 @@ #include #include -#include "minecraft/world/item/DiggerItem.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/HalfSlabTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DiggerItem.h" std::vector PickaxeItem::diggables; diff --git a/targets/minecraft/world/item/PickaxeItem.h b/targets/minecraft/world/item/PickaxeItem.h index 152223582..2e282ba08 100644 --- a/targets/minecraft/world/item/PickaxeItem.h +++ b/targets/minecraft/world/item/PickaxeItem.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "DiggerItem.h" diff --git a/targets/minecraft/world/item/PistonTileItem.cpp b/targets/minecraft/world/item/PistonTileItem.cpp index 9f5126ae1..4dbae78a6 100644 --- a/targets/minecraft/world/item/PistonTileItem.cpp +++ b/targets/minecraft/world/item/PistonTileItem.cpp @@ -1,7 +1,7 @@ #include "PistonTileItem.h" -#include "minecraft/world/item/TileItem.h" #include "minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/world/item/TileItem.h" PistonTileItem::PistonTileItem(int id) : TileItem(id) {} diff --git a/targets/minecraft/world/item/PlanterTileItem.cpp b/targets/minecraft/world/item/PlanterTileItem.cpp index 3e1f4771b..2f2beda07 100644 --- a/targets/minecraft/world/item/PlanterTileItem.cpp +++ b/targets/minecraft/world/item/PlanterTileItem.cpp @@ -7,11 +7,11 @@ #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/world/item/Item.h" TilePlanterItem::TilePlanterItem(int id, Tile* tile) : Item(id) { this->tileId = tile->id; diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp index 68ca25252..286bb12ab 100644 --- a/targets/minecraft/world/item/PotionItem.cpp +++ b/targets/minecraft/world/item/PotionItem.cpp @@ -1,19 +1,33 @@ #include "PotionItem.h" +#include + #include "console_helpers/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/sounds/SoundTypes.h" -#include "minecraft/stdafx.h" #include "minecraft/world/effect/MobEffectInstance.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" #include "minecraft/world/item/alchemy/PotionMacros.h" -#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" -#include "net.minecraft.world.item.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/entity/ai/attributes/AttributeModifier.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Inventory.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/projectile/ThrownPotion.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/level/Level.h" + +class Icon; const std::wstring PotionItem::DEFAULT_ICON = L"potion"; const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash"; diff --git a/targets/minecraft/world/item/PotionItem.h b/targets/minecraft/world/item/PotionItem.h index 84c11a9fd..bd44ff360 100644 --- a/targets/minecraft/world/item/PotionItem.h +++ b/targets/minecraft/world/item/PotionItem.h @@ -1,8 +1,17 @@ #pragma once +#include +#include +#include +#include +#include + #include "Item.h" +#include "minecraft/world/item/UseAnim.h" class MobEffectInstance; +class Icon; +class ItemInstance; class PotionItem : public Item { private: diff --git a/targets/minecraft/world/item/RecordingItem.cpp b/targets/minecraft/world/item/RecordingItem.cpp index ee6ecd9e9..043ee8a07 100644 --- a/targets/minecraft/world/item/RecordingItem.cpp +++ b/targets/minecraft/world/item/RecordingItem.cpp @@ -1,7 +1,6 @@ #include "RecordingItem.h" #include - #include #include #include @@ -11,13 +10,13 @@ #include "minecraft/util/HtmlString.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" -#include "minecraft/world/item/Rarity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/JukeboxTile.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/Rarity.h" std::unordered_map RecordingItem::BY_NAME; diff --git a/targets/minecraft/world/item/RedStoneItem.cpp b/targets/minecraft/world/item/RedStoneItem.cpp index f81b1f8b1..4660239fa 100644 --- a/targets/minecraft/world/item/RedStoneItem.cpp +++ b/targets/minecraft/world/item/RedStoneItem.cpp @@ -4,11 +4,11 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/RedStoneDustTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" RedStoneItem::RedStoneItem(int id) : Item(id) {} diff --git a/targets/minecraft/world/item/SaddleItem.cpp b/targets/minecraft/world/item/SaddleItem.cpp index 3e91f56e2..d41143752 100644 --- a/targets/minecraft/world/item/SaddleItem.cpp +++ b/targets/minecraft/world/item/SaddleItem.cpp @@ -5,8 +5,8 @@ #include "java/Class.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/animal/Pig.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/Item.h" SaddleItem::SaddleItem(int id) : Item(id) { maxStackSize = 1; } diff --git a/targets/minecraft/world/item/SeedFoodItem.cpp b/targets/minecraft/world/item/SeedFoodItem.cpp index 39f6cdb10..23e5cae64 100644 --- a/targets/minecraft/world/item/SeedFoodItem.cpp +++ b/targets/minecraft/world/item/SeedFoodItem.cpp @@ -4,9 +4,9 @@ #include "minecraft/Facing.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/FoodItem.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/FoodItem.h" SeedFoodItem::SeedFoodItem(int id, int nutrition, float saturationMod, int resultId, int targetLand) diff --git a/targets/minecraft/world/item/ShearsItem.cpp b/targets/minecraft/world/item/ShearsItem.cpp index e9f6d4290..e2cdd545a 100644 --- a/targets/minecraft/world/item/ShearsItem.cpp +++ b/targets/minecraft/world/item/ShearsItem.cpp @@ -2,9 +2,9 @@ #include -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/Item.h" ShearsItem::ShearsItem(int itemId) : Item(itemId) { setMaxStackSize(1); diff --git a/targets/minecraft/world/item/ShovelItem.cpp b/targets/minecraft/world/item/ShovelItem.cpp index 316f05899..04295d426 100644 --- a/targets/minecraft/world/item/ShovelItem.cpp +++ b/targets/minecraft/world/item/ShovelItem.cpp @@ -2,10 +2,10 @@ #include -#include "minecraft/world/item/DiggerItem.h" #include "minecraft/world/level/tile/GrassTile.h" #include "minecraft/world/level/tile/MycelTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/DiggerItem.h" std::vector* ShovelItem::diggables = nullptr; diff --git a/targets/minecraft/world/item/ShovelItem.h b/targets/minecraft/world/item/ShovelItem.h index 8eac32c36..8b05b9606 100644 --- a/targets/minecraft/world/item/ShovelItem.h +++ b/targets/minecraft/world/item/ShovelItem.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "DiggerItem.h" diff --git a/targets/minecraft/world/item/SignItem.cpp b/targets/minecraft/world/item/SignItem.cpp index a862f622f..faa2a8175 100644 --- a/targets/minecraft/world/item/SignItem.cpp +++ b/targets/minecraft/world/item/SignItem.cpp @@ -5,12 +5,12 @@ #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/SignTileEntity.h" +#include "minecraft/world/item/Item.h" SignItem::SignItem(int id) : Item(id) { // 4J-PB - Changed for TU9 diff --git a/targets/minecraft/world/item/SkullItem.cpp b/targets/minecraft/world/item/SkullItem.cpp index c9d407cc9..e4c9d8438 100644 --- a/targets/minecraft/world/item/SkullItem.cpp +++ b/targets/minecraft/world/item/SkullItem.cpp @@ -1,12 +1,19 @@ #include "SkullItem.h" -#include "minecraft/net.minecraft.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" +#include "Facing.h" +#include "nbt/CompoundTag.h" +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/SkullTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" const unsigned int SkullItem::NAMES[SKULL_COUNT] = { IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_WITHER, IDS_ITEM_SKULL_ZOMBIE, diff --git a/targets/minecraft/world/item/SkullItem.h b/targets/minecraft/world/item/SkullItem.h index 16a97ca71..4cbf3f2cf 100644 --- a/targets/minecraft/world/item/SkullItem.h +++ b/targets/minecraft/world/item/SkullItem.h @@ -1,7 +1,15 @@ #pragma once +#include +#include + #include "Item.h" +class Icon; +class ItemInstance; +class Level; +class Player; + class SkullItem : public Item { private: static const int SKULL_COUNT = 5; diff --git a/targets/minecraft/world/item/SnowItem.cpp b/targets/minecraft/world/item/SnowItem.cpp index 856bc68fe..00d04332d 100644 --- a/targets/minecraft/world/item/SnowItem.cpp +++ b/targets/minecraft/world/item/SnowItem.cpp @@ -4,11 +4,11 @@ #include #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/AuxDataTileItem.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/world/item/AuxDataTileItem.h" SnowItem::SnowItem(int id, Tile* parentTile) : AuxDataTileItem(id, parentTile) {} diff --git a/targets/minecraft/world/item/SnowballItem.cpp b/targets/minecraft/world/item/SnowballItem.cpp index 91498a9b2..aecf50aad 100644 --- a/targets/minecraft/world/item/SnowballItem.cpp +++ b/targets/minecraft/world/item/SnowballItem.cpp @@ -7,9 +7,9 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/Snowball.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/item/Item.h" class Entity; diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index 8f61ac6e9..f9f04d2d1 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -1,19 +1,30 @@ #include "SpawnEggItem.h" +#include +#include + #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/stdafx.h" #include "minecraft/util/Mth.h" #include "minecraft/world/Difficulty.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" #include "minecraft/world/phys/HitResult.h" +#include "Facing.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/Random.h" +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/EntityIO.h" +#include "minecraft/world/entity/Mob.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" SpawnEggItem::SpawnEggItem(int id) : Item(id) { setMaxStackSize(16); // 4J-PB brought forward. It is 64 on PC, but we'll diff --git a/targets/minecraft/world/item/SpawnEggItem.h b/targets/minecraft/world/item/SpawnEggItem.h index 816efea2d..db9608607 100644 --- a/targets/minecraft/world/item/SpawnEggItem.h +++ b/targets/minecraft/world/item/SpawnEggItem.h @@ -1,6 +1,14 @@ #pragma once +#include +#include + #include "Item.h" +#include "minecraft/world/entity/Entity.h" + +class Icon; +class Level; +class Player; class SpawnEggItem : public Item { private: diff --git a/targets/minecraft/world/item/StoneSlabTileItem.cpp b/targets/minecraft/world/item/StoneSlabTileItem.cpp index edb7afe11..24fed7a43 100644 --- a/targets/minecraft/world/item/StoneSlabTileItem.cpp +++ b/targets/minecraft/world/item/StoneSlabTileItem.cpp @@ -5,10 +5,10 @@ #include "minecraft/Facing.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/ItemInstance.h" -#include "minecraft/world/item/TileItem.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/HalfSlabTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/item/TileItem.h" StoneSlabTileItem::StoneSlabTileItem(int id, HalfSlabTile* halfTile, HalfSlabTile* fullTile, bool full) diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp index 8bd70f847..e95c659dc 100644 --- a/targets/minecraft/world/item/TileItem.cpp +++ b/targets/minecraft/world/item/TileItem.cpp @@ -12,12 +12,12 @@ #include "minecraft/world/Icon.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/world/item/Item.h" TileItem::TileItem(int id) : Item(id) { this->tileId = id + 256; diff --git a/targets/minecraft/world/item/WaterLilyTileItem.cpp b/targets/minecraft/world/item/WaterLilyTileItem.cpp index e9ae70465..6ca71237f 100644 --- a/targets/minecraft/world/item/WaterLilyTileItem.cpp +++ b/targets/minecraft/world/item/WaterLilyTileItem.cpp @@ -4,12 +4,12 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/ColoredTileItem.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/HitResult.h" +#include "minecraft/world/item/ColoredTileItem.h" WaterLilyTileItem::WaterLilyTileItem(int id) : ColoredTileItem(id, false) {} diff --git a/targets/minecraft/world/item/WeaponItem.cpp b/targets/minecraft/world/item/WeaponItem.cpp index 0dd8ed31a..73270bfaf 100644 --- a/targets/minecraft/world/item/WeaponItem.cpp +++ b/targets/minecraft/world/item/WeaponItem.cpp @@ -5,10 +5,11 @@ #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/entity/ai/attributes/Attribute.h" +#include "minecraft/world/item/Item.h" WeaponItem::WeaponItem(int id, const Tier* tier) : Item(id), tier(tier) { maxStackSize = 1; diff --git a/targets/minecraft/world/item/WeaponItem.h b/targets/minecraft/world/item/WeaponItem.h index bdebb9cd6..65d4a3b52 100644 --- a/targets/minecraft/world/item/WeaponItem.h +++ b/targets/minecraft/world/item/WeaponItem.h @@ -3,6 +3,7 @@ #include "Item.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" #include "minecraft/world/item/UseAnim.h" +#include "minecraft/world/item/UseAnim.h" class WeaponItem : public Item { private: diff --git a/targets/minecraft/world/item/WoolTileItem.cpp b/targets/minecraft/world/item/WoolTileItem.cpp index c465432ec..fedf17b97 100644 --- a/targets/minecraft/world/item/WoolTileItem.cpp +++ b/targets/minecraft/world/item/WoolTileItem.cpp @@ -1,8 +1,12 @@ #include "WoolTileItem.h" -#include "DyePowderItem.h" +#include + #include "ItemInstance.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "strings.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/level/tile/Tile.h" const unsigned int WoolTileItem::COLOR_DESCS[] = { IDS_TILE_CLOTH_BLACK, IDS_TILE_CLOTH_RED, IDS_TILE_CLOTH_GREEN, diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp index dcce6949d..0ffe99285 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -1,10 +1,15 @@ #include "PotionBrewing.h" +#include + #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "strings.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" const int PotionBrewing::DEFAULT_APPEARANCES[] = { IDS_POTION_PREFIX_MUNDANE, IDS_POTION_PREFIX_UNINTERESTING, diff --git a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp index da460d6ff..6da7868bb 100644 --- a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp +++ b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp @@ -1,20 +1,19 @@ #include "ArmorDyeRecipe.h" #include - #include #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "minecraft/world/entity/animal/Sheep.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/ArmorItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/crafting/Recipes.h" -#include "minecraft/world/item/crafting/Recipy.h" #include "minecraft/world/item/crafting/ShapedRecipy.h" #include "minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/Recipy.h" bool ArmorDyeRecipe::matches(std::shared_ptr craftSlots, Level* level) { diff --git a/targets/minecraft/world/item/crafting/Recipes.cpp b/targets/minecraft/world/item/crafting/Recipes.cpp index 4645caf84..f6da5b95d 100644 --- a/targets/minecraft/world/item/crafting/Recipes.cpp +++ b/targets/minecraft/world/item/crafting/Recipes.cpp @@ -1,8 +1,6 @@ #include "minecraft/world/item/crafting/Recipes.h" #include - -#include #include #include #include diff --git a/targets/minecraft/world/item/crafting/Recipes.h b/targets/minecraft/world/item/crafting/Recipes.h index 6ea368017..c30125d0b 100644 --- a/targets/minecraft/world/item/crafting/Recipes.h +++ b/targets/minecraft/world/item/crafting/Recipes.h @@ -18,6 +18,7 @@ import net.minecraft.world.level.tile.Tile; #include #include #include +#include #include "Recipy.h" #include "java/Class.h" diff --git a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp index 12884f54d..234d743b5 100644 --- a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp @@ -9,12 +9,11 @@ #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Recipes.h" -#include "Recipy.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/ItemInstance.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/item/crafting/Recipy.h" // 4J-PB - for new crafting - Adding group to define type of item that the // recipe produces diff --git a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp index 46f23f086..57689e263 100644 --- a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp @@ -7,17 +7,15 @@ #include "ShapelessRecipy.h" #include - #include #include #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Recipes.h" -#include "Recipy.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/crafting/Recipy.h" ShapelessRecipy::ShapelessRecipy(ItemInstance* result, std::vector* ingredients, diff --git a/targets/minecraft/world/item/crafting/ShapelessRecipy.h b/targets/minecraft/world/item/crafting/ShapelessRecipy.h index deefb5ca7..ffd7c35c3 100644 --- a/targets/minecraft/world/item/crafting/ShapelessRecipy.h +++ b/targets/minecraft/world/item/crafting/ShapelessRecipy.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "minecraft/world/item/crafting/Recipy.h" diff --git a/targets/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp b/targets/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp index bd2f59270..e85ad23e6 100644 --- a/targets/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/ArrowDamageEnchantment.cpp @@ -1,6 +1,8 @@ #include "ArrowDamageEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" ArrowDamageEnchantment::ArrowDamageEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::bow) { diff --git a/targets/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp b/targets/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp index e150ecaf9..5448e6b79 100644 --- a/targets/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/ArrowFireEnchantment.cpp @@ -1,6 +1,8 @@ #include "ArrowFireEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" ArrowFireEnchantment::ArrowFireEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::bow) { diff --git a/targets/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp b/targets/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp index 028b33ded..a64456543 100644 --- a/targets/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.cpp @@ -1,6 +1,8 @@ #include "ArrowInfiniteEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" ArrowInfiniteEnchantment::ArrowInfiniteEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::bow) { diff --git a/targets/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp b/targets/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp index 13e5c96f7..cff7d5802 100644 --- a/targets/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/ArrowKnockbackEnchantment.cpp @@ -1,6 +1,8 @@ #include "ArrowKnockbackEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" ArrowKnockbackEnchantment::ArrowKnockbackEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::bow) { diff --git a/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp b/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp index 4e8dd9275..51fd612c0 100644 --- a/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp @@ -1,8 +1,15 @@ #include "DamageEnchantment.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include + #include "strings.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/MobType.h" +#include "minecraft/world/item/HatchetItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" const int DamageEnchantment::names[] = {IDS_ENCHANTMENT_DAMAGE_ALL, IDS_ENCHANTMENT_DAMAGE_UNDEAD, diff --git a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp index d250a11d1..563d34047 100644 --- a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp @@ -1,8 +1,12 @@ #include "DigDurabilityEnchantment.h" #include "java/Random.h" -#include "minecraft/world/item/net.minecraft.world.item.h" #include "strings.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" DigDurabilityEnchantment::DigDurabilityEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::digger) { diff --git a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h index 23237a1e7..e048af063 100644 --- a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h +++ b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h @@ -1,8 +1,13 @@ #pragma once +#include + #include "Enchantment.h" #include "java/Random.h" +class ItemInstance; +class Random; + class DigDurabilityEnchantment : public Enchantment { public: DigDurabilityEnchantment(int id, int frequency); diff --git a/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp b/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp index 7394eac67..0c7e5cd3f 100644 --- a/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp @@ -1,7 +1,12 @@ #include "DiggingEnchantment.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include + #include "strings.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" DiggingEnchantment::DiggingEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::digger) { diff --git a/targets/minecraft/world/item/enchantment/Enchantment.cpp b/targets/minecraft/world/item/enchantment/Enchantment.cpp index 52c5e9a73..11abcdcde 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.cpp +++ b/targets/minecraft/world/item/enchantment/Enchantment.cpp @@ -1,9 +1,29 @@ #include "Enchantment.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "net.minecraft.world.item.enchantment.h" +#include +#include + #include "strings.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/util/HtmlString.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/ArrowDamageEnchantment.h" +#include "minecraft/world/item/enchantment/ArrowFireEnchantment.h" +#include "minecraft/world/item/enchantment/ArrowInfiniteEnchantment.h" +#include "minecraft/world/item/enchantment/ArrowKnockbackEnchantment.h" +#include "minecraft/world/item/enchantment/DamageEnchantment.h" +#include "minecraft/world/item/enchantment/DigDurabilityEnchantment.h" +#include "minecraft/world/item/enchantment/DiggingEnchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" +#include "minecraft/world/item/enchantment/FireAspectEnchantment.h" +#include "minecraft/world/item/enchantment/KnockbackEnchantment.h" +#include "minecraft/world/item/enchantment/LootBonusEnchantment.h" +#include "minecraft/world/item/enchantment/OxygenEnchantment.h" +#include "minecraft/world/item/enchantment/ProtectionEnchantment.h" +#include "minecraft/world/item/enchantment/ThornsEnchantment.h" +#include "minecraft/world/item/enchantment/UntouchingEnchantment.h" +#include "minecraft/world/item/enchantment/WaterWorkerEnchantment.h" // Enchantment *Enchantment::enchantments[256]; std::vector Enchantment::enchantments = diff --git a/targets/minecraft/world/item/enchantment/Enchantment.h b/targets/minecraft/world/item/enchantment/Enchantment.h index cfa099272..bc42a5c1c 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.h +++ b/targets/minecraft/world/item/enchantment/Enchantment.h @@ -2,6 +2,7 @@ #include #include +#include #include "EnchantmentCategory.h" #include "minecraft/util/HtmlString.h" @@ -10,6 +11,7 @@ class DamageSource; class LivingEntity; class ItemInstance; class Mob; +class EnchantmentCategory; class Enchantment // implements Descriptive { { diff --git a/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp b/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp index 4bc047e7b..c581f4ac9 100644 --- a/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp +++ b/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/world/item/enchantment/Enchantment.h" -#include "strings.h" +#include "minecraft/util/WeighedRandom.h" EnchantmentInstance::EnchantmentInstance(Enchantment* enchantment, int level) : WeighedRandomItem(enchantment->getFrequency()), diff --git a/targets/minecraft/world/item/enchantment/FireAspectEnchantment.cpp b/targets/minecraft/world/item/enchantment/FireAspectEnchantment.cpp index 23eaf4cfe..f3af50fe2 100644 --- a/targets/minecraft/world/item/enchantment/FireAspectEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/FireAspectEnchantment.cpp @@ -1,6 +1,8 @@ #include "FireAspectEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" FireAspectEnchantment::FireAspectEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::weapon) { diff --git a/targets/minecraft/world/item/enchantment/KnockbackEnchantment.cpp b/targets/minecraft/world/item/enchantment/KnockbackEnchantment.cpp index 4d93fb2f0..bf32c5783 100644 --- a/targets/minecraft/world/item/enchantment/KnockbackEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/KnockbackEnchantment.cpp @@ -1,6 +1,8 @@ #include "KnockbackEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" KnockbackEnchantment::KnockbackEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::weapon) { diff --git a/targets/minecraft/world/item/enchantment/LootBonusEnchantment.cpp b/targets/minecraft/world/item/enchantment/LootBonusEnchantment.cpp index 87c70ddef..644d47b54 100644 --- a/targets/minecraft/world/item/enchantment/LootBonusEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/LootBonusEnchantment.cpp @@ -1,6 +1,8 @@ #include "LootBonusEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" LootBonusEnchantment::LootBonusEnchantment(int id, int frequency, const EnchantmentCategory* cat) diff --git a/targets/minecraft/world/item/enchantment/LootBonusEnchantment.h b/targets/minecraft/world/item/enchantment/LootBonusEnchantment.h index 09c452974..d13015846 100644 --- a/targets/minecraft/world/item/enchantment/LootBonusEnchantment.h +++ b/targets/minecraft/world/item/enchantment/LootBonusEnchantment.h @@ -2,6 +2,8 @@ #include "Enchantment.h" +class EnchantmentCategory; + class LootBonusEnchantment : public Enchantment { public: LootBonusEnchantment(int id, int frequency, const EnchantmentCategory* cat); diff --git a/targets/minecraft/world/item/enchantment/OxygenEnchantment.cpp b/targets/minecraft/world/item/enchantment/OxygenEnchantment.cpp index d0fcab355..52eb7925e 100644 --- a/targets/minecraft/world/item/enchantment/OxygenEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/OxygenEnchantment.cpp @@ -1,6 +1,8 @@ #include "OxygenEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" OxygenEnchantment::OxygenEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::armor_head) { diff --git a/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp b/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp index dd3927d76..20a463047 100644 --- a/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp @@ -1,10 +1,12 @@ #include "ProtectionEnchantment.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "net.minecraft.world.item.enchantment.h" #include "strings.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" const int ProtectionEnchantment::names[] = { IDS_ENCHANTMENT_PROTECT_ALL, IDS_ENCHANTMENT_PROTECT_FIRE, diff --git a/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp b/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp index 4afe10083..0bd85c385 100644 --- a/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp @@ -1,10 +1,17 @@ #include "ThornsEnchantment.h" -#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "net.minecraft.world.item.enchantment.h" #include "strings.h" +#include "java/Random.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/world/damageSource/DamageSource.h" +#include "minecraft/world/entity/Entity.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/item/ArmorItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" const float ThornsEnchantment::CHANCE_PER_LEVEl = 0.15f; diff --git a/targets/minecraft/world/item/enchantment/ThornsEnchantment.h b/targets/minecraft/world/item/enchantment/ThornsEnchantment.h index b3fd8a954..cf9485471 100644 --- a/targets/minecraft/world/item/enchantment/ThornsEnchantment.h +++ b/targets/minecraft/world/item/enchantment/ThornsEnchantment.h @@ -6,6 +6,7 @@ class Random; class Entity; +class LivingEntity; class ThornsEnchantment : public Enchantment { private: diff --git a/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp b/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp index 6517d85f2..99f72828d 100644 --- a/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp @@ -1,7 +1,12 @@ #include "UntouchingEnchantment.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include + #include "strings.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" UntouchingEnchantment::UntouchingEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::digger) { diff --git a/targets/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp b/targets/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp index 3227f7bc6..32696ab2e 100644 --- a/targets/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/WaterWorkerEnchantment.cpp @@ -1,6 +1,8 @@ #include "WaterWorkerEnchantment.h" #include "strings.h" +#include "minecraft/world/item/enchantment/Enchantment.h" +#include "minecraft/world/item/enchantment/EnchantmentCategory.h" WaterWorkerEnchantment::WaterWorkerEnchantment(int id, int frequency) : Enchantment(id, frequency, EnchantmentCategory::armor_head) { diff --git a/targets/minecraft/world/item/trading/MerchantRecipe.cpp b/targets/minecraft/world/item/trading/MerchantRecipe.cpp index 46d594c22..500d6f776 100644 --- a/targets/minecraft/world/item/trading/MerchantRecipe.cpp +++ b/targets/minecraft/world/item/trading/MerchantRecipe.cpp @@ -3,6 +3,7 @@ #include #include "nbt/CompoundTag.h" +#include "minecraft/world/item/ItemInstance.h" class Item; class Tile; diff --git a/targets/minecraft/world/level/BaseMobSpawner.cpp b/targets/minecraft/world/level/BaseMobSpawner.cpp index 4ace4ecf4..871997721 100644 --- a/targets/minecraft/world/level/BaseMobSpawner.cpp +++ b/targets/minecraft/world/level/BaseMobSpawner.cpp @@ -9,13 +9,14 @@ #include "minecraft/world/entity/EntityIO.h" #include "minecraft/world/entity/Mob.h" #include "minecraft/world/entity/item/Minecart.h" -#include "minecraft/world/level/BaseMobSpawner.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" #include "nbt/Tag.h" +#include "minecraft/util/WeighedRandom.h" +#include "minecraft/world/entity/Entity.h" BaseMobSpawner::BaseMobSpawner() { spawnPotentials = nullptr; diff --git a/targets/minecraft/world/level/BaseMobSpawner.h b/targets/minecraft/world/level/BaseMobSpawner.h index d4554ed7b..4e9bee397 100644 --- a/targets/minecraft/world/level/BaseMobSpawner.h +++ b/targets/minecraft/world/level/BaseMobSpawner.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "minecraft/util/WeighedRandom.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/level/ChunkPos.cpp b/targets/minecraft/world/level/ChunkPos.cpp index 7ea241092..b08c043ae 100644 --- a/targets/minecraft/world/level/ChunkPos.cpp +++ b/targets/minecraft/world/level/ChunkPos.cpp @@ -1,14 +1,11 @@ #include "minecraft/world/level/ChunkPos.h" -#include - #include #include #include "console_helpers/StringHelpers.h" #include "minecraft/world/entity/Entity.h" -#include "minecraft/world/level/ChunkPos.h" #include "minecraft/world/level/TilePos.h" ChunkPos::ChunkPos(int x, int z) : x(x), z(z) {} diff --git a/targets/minecraft/world/level/ChunkPos.h b/targets/minecraft/world/level/ChunkPos.h index becabfc14..7cb44997b 100644 --- a/targets/minecraft/world/level/ChunkPos.h +++ b/targets/minecraft/world/level/ChunkPos.h @@ -2,6 +2,7 @@ #include #include +#include class Entity; class TilePos; diff --git a/targets/minecraft/world/level/Explosion.cpp b/targets/minecraft/world/level/Explosion.cpp index 3c822d202..c4dc64a4d 100644 --- a/targets/minecraft/world/level/Explosion.cpp +++ b/targets/minecraft/world/level/Explosion.cpp @@ -2,14 +2,10 @@ #include #include - #include #include #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" @@ -23,6 +19,9 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/phys/Vec3.h" Explosion::Explosion(Level* level, std::shared_ptr source, double x, double y, double z, float r) { diff --git a/targets/minecraft/world/level/Explosion.h b/targets/minecraft/world/level/Explosion.h index d07604a3b..f6cb758a6 100644 --- a/targets/minecraft/world/level/Explosion.h +++ b/targets/minecraft/world/level/Explosion.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "TilePos.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index b12f9e829..57e4a32b4 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -2,7 +2,7 @@ #include #include - +#include #include #include #include @@ -20,9 +20,6 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/FrameProfiler.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" @@ -70,6 +67,10 @@ #include "minecraft/world/phys/Vec3.h" #include "minecraft/world/scores/Scoreboard.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/phys/AABB.h" class CompoundTag; class ItemInstance; diff --git a/targets/minecraft/world/level/Level.h b/targets/minecraft/world/level/Level.h index 2991f9566..db14dbd27 100644 --- a/targets/minecraft/world/level/Level.h +++ b/targets/minecraft/world/level/Level.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "4J.Common/4J_Compat.h" #include "ChunkPos.h" diff --git a/targets/minecraft/world/level/MobSpawner.cpp b/targets/minecraft/world/level/MobSpawner.cpp index 340c7d4d4..1d9c61e94 100644 --- a/targets/minecraft/world/level/MobSpawner.cpp +++ b/targets/minecraft/world/level/MobSpawner.cpp @@ -15,11 +15,12 @@ #include "minecraft/world/entity/Mob.h" #include "minecraft/world/entity/MobCategory.h" #include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/level/ChunkPos.h" #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/TilePos.h" class MobGroupData; diff --git a/targets/minecraft/world/level/MobSpawner.h b/targets/minecraft/world/level/MobSpawner.h index 5f70a0f8e..d49be9dca 100644 --- a/targets/minecraft/world/level/MobSpawner.h +++ b/targets/minecraft/world/level/MobSpawner.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "minecraft/world/entity/Mob.h" #include "minecraft/world/level/TilePos.h" diff --git a/targets/minecraft/world/level/PortalForcer.cpp b/targets/minecraft/world/level/PortalForcer.cpp index dd5758e01..379269113 100644 --- a/targets/minecraft/world/level/PortalForcer.cpp +++ b/targets/minecraft/world/level/PortalForcer.cpp @@ -13,6 +13,7 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" +#include "Pos.h" PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, int64_t time) : Pos(x, y, z) { diff --git a/targets/minecraft/world/level/Region.h b/targets/minecraft/world/level/Region.h index daefa41fe..9a6be7f96 100644 --- a/targets/minecraft/world/level/Region.h +++ b/targets/minecraft/world/level/Region.h @@ -6,6 +6,7 @@ #include "LevelSource.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/LightLayer.h" class Material; class TileEntity; diff --git a/targets/minecraft/world/level/TilePos.cpp b/targets/minecraft/world/level/TilePos.cpp index 39c966c73..8140b4034 100644 --- a/targets/minecraft/world/level/TilePos.cpp +++ b/targets/minecraft/world/level/TilePos.cpp @@ -3,7 +3,6 @@ #include "minecraft/world/level/TilePos.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/level/TilePos.h" #include "minecraft/world/phys/Vec3.h" TilePos::TilePos(int x, int y, int z) { diff --git a/targets/minecraft/world/level/biome/BeachBiome.cpp b/targets/minecraft/world/level/biome/BeachBiome.cpp index bbf94afba..a895c65ed 100644 --- a/targets/minecraft/world/level/biome/BeachBiome.cpp +++ b/targets/minecraft/world/level/biome/BeachBiome.cpp @@ -1,11 +1,11 @@ #include "BeachBiome.h" #include - #include #include "BiomeDecorator.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" BeachBiome::BeachBiome(int id) : Biome(id) { // remove default mob spawn settings diff --git a/targets/minecraft/world/level/biome/Biome.cpp b/targets/minecraft/world/level/biome/Biome.cpp index a177348aa..95d85f3ed 100644 --- a/targets/minecraft/world/level/biome/Biome.cpp +++ b/targets/minecraft/world/level/biome/Biome.cpp @@ -1,7 +1,6 @@ #include "minecraft/world/level/biome/Biome.h" #include - #include #include #include @@ -13,7 +12,6 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/world/entity/MobCategory.h" #include "minecraft/world/level/biome/BeachBiome.h" -#include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/biome/BiomeDecorator.h" #include "minecraft/world/level/biome/DesertBiome.h" #include "minecraft/world/level/biome/ExtremeHillsBiome.h" diff --git a/targets/minecraft/world/level/biome/Biome.h b/targets/minecraft/world/level/biome/Biome.h index bd29b43d1..46d484947 100644 --- a/targets/minecraft/world/level/biome/Biome.h +++ b/targets/minecraft/world/level/biome/Biome.h @@ -1,9 +1,15 @@ #pragma once +#include +#include +#include +#include + #include "Minecraft.Client/Common/App_enums.h" #include "minecraft/util/WeighedRandom.h" #include "minecraft/world/entity/Mob.h" #include "minecraft/world/level/LevelSource.h" +#include "java/Class.h" class Feature; class MobCategory; @@ -13,6 +19,8 @@ class BasicTree; class BirchFeature; class SwampTreeFeature; class ChunkRebuildData; +class Level; +class Random; class Biome { friend class ChunkRebuildData; diff --git a/targets/minecraft/world/level/biome/BiomeCache.cpp b/targets/minecraft/world/level/biome/BiomeCache.cpp index c15b6c9ab..e65ba4dfe 100644 --- a/targets/minecraft/world/level/biome/BiomeCache.cpp +++ b/targets/minecraft/world/level/biome/BiomeCache.cpp @@ -4,6 +4,7 @@ #include "BiomeSource.h" #include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/level/biome/Biome.h" BiomeCache::Block::Block(int x, int z, BiomeCache* parent) { // temps = std::vector(ZONE_SIZE * ZONE_SIZE, false); diff --git a/targets/minecraft/world/level/biome/BiomeCache.h b/targets/minecraft/world/level/biome/BiomeCache.h index 23feb50be..06c1be427 100644 --- a/targets/minecraft/world/level/biome/BiomeCache.h +++ b/targets/minecraft/world/level/biome/BiomeCache.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/biome/BiomeDecorator.cpp b/targets/minecraft/world/level/biome/BiomeDecorator.cpp index 903b88ee6..4cc0fee56 100644 --- a/targets/minecraft/world/level/biome/BiomeDecorator.cpp +++ b/targets/minecraft/world/level/biome/BiomeDecorator.cpp @@ -3,9 +3,6 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp index f473fe11c..da03ea842 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.cpp +++ b/targets/minecraft/world/level/biome/BiomeSource.cpp @@ -1,15 +1,24 @@ #include "BiomeSource.h" +#include +#include + #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" -#include "net.minecraft.world.level.biome.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "strings.h" +#include "minecraft/world/level/ChunkPos.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/biome/BiomeCache.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" +#include "minecraft/world/level/storage/LevelData.h" // 4J - removal of separate temperature & downfall layers brought forward // from 1.2.3 diff --git a/targets/minecraft/world/level/biome/BiomeSource.h b/targets/minecraft/world/level/biome/BiomeSource.h index 6fcea0d97..4e2ea561b 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.h +++ b/targets/minecraft/world/level/biome/BiomeSource.h @@ -1,14 +1,21 @@ #pragma once +#include +#include +#include +#include + #include "Biome.h" #include "BiomeCache.h" #include "BiomeSource.h" #include "minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h" +#include "minecraft/world/level/biome/BiomeSource.h" class ChunkPos; class Level; class Layer; class TilePos; class LevelType; +class Random; class BiomeSource { private: diff --git a/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp b/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp index 7db14e1b4..c647ac5ce 100644 --- a/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp +++ b/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp @@ -7,6 +7,7 @@ #include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/levelgen/feature/OreFeature.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" ExtremeHillsBiome::ExtremeHillsBiome(int id) : Biome(id) { silverfishFeature = new OreFeature(Tile::monsterStoneEgg_Id, 8); diff --git a/targets/minecraft/world/level/biome/FixedBiomeSource.h b/targets/minecraft/world/level/biome/FixedBiomeSource.h index f83269113..933906801 100644 --- a/targets/minecraft/world/level/biome/FixedBiomeSource.h +++ b/targets/minecraft/world/level/biome/FixedBiomeSource.h @@ -1,7 +1,7 @@ #pragma once #include - #include +#include #include "BiomeSource.h" diff --git a/targets/minecraft/world/level/biome/ForestBiome.cpp b/targets/minecraft/world/level/biome/ForestBiome.cpp index c8b1cb85c..109cb7aee 100644 --- a/targets/minecraft/world/level/biome/ForestBiome.cpp +++ b/targets/minecraft/world/level/biome/ForestBiome.cpp @@ -8,6 +8,7 @@ #include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h" #include "minecraft/world/level/levelgen/feature/BirchFeature.h" #include "minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "minecraft/world/level/biome/Biome.h" ForestBiome::ForestBiome(int id) : Biome(id) { friendlies_wolf.push_back(new MobSpawnerData( diff --git a/targets/minecraft/world/level/biome/HellBiome.cpp b/targets/minecraft/world/level/biome/HellBiome.cpp index f2255c234..229f063e9 100644 --- a/targets/minecraft/world/level/biome/HellBiome.cpp +++ b/targets/minecraft/world/level/biome/HellBiome.cpp @@ -3,6 +3,7 @@ #include #include "java/Class.h" +#include "minecraft/world/level/biome/Biome.h" HellBiome::HellBiome(int id) : Biome(id) { enemies.clear(); diff --git a/targets/minecraft/world/level/biome/IceBiome.cpp b/targets/minecraft/world/level/biome/IceBiome.cpp index ea2f7f89d..e9e076cb7 100644 --- a/targets/minecraft/world/level/biome/IceBiome.cpp +++ b/targets/minecraft/world/level/biome/IceBiome.cpp @@ -1,3 +1,5 @@ #include "IceBiome.h" +#include "minecraft/world/level/biome/Biome.h" + IceBiome::IceBiome(int id) : Biome(id) {}; \ No newline at end of file diff --git a/targets/minecraft/world/level/biome/JungleBiome.cpp b/targets/minecraft/world/level/biome/JungleBiome.cpp index 2360c48f4..c9770b67e 100644 --- a/targets/minecraft/world/level/biome/JungleBiome.cpp +++ b/targets/minecraft/world/level/biome/JungleBiome.cpp @@ -2,9 +2,6 @@ #include -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" @@ -19,6 +16,7 @@ #include "minecraft/world/level/tile/TallGrassPlantTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/biome/Biome.h" JungleBiome::JungleBiome(int id) : Biome(id) { decorator->treeCount = 50; diff --git a/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp b/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp index 1e5a2b4e5..6ef60838a 100644 --- a/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp +++ b/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp @@ -1,12 +1,12 @@ #include "MushroomIslandBiome.h" #include - #include #include "BiomeDecorator.h" #include "java/Class.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" MushroomIslandBiome::MushroomIslandBiome(int id) : Biome(id) { decorator->treeCount = -100; diff --git a/targets/minecraft/world/level/biome/RainforestBiome.cpp b/targets/minecraft/world/level/biome/RainforestBiome.cpp index bb26b4b8e..787ef3431 100644 --- a/targets/minecraft/world/level/biome/RainforestBiome.cpp +++ b/targets/minecraft/world/level/biome/RainforestBiome.cpp @@ -3,6 +3,7 @@ #include "java/Random.h" #include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h" #include "minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "minecraft/world/level/biome/Biome.h" RainforestBiome::RainforestBiome(int id) : Biome(id) {} diff --git a/targets/minecraft/world/level/biome/TaigaBiome.cpp b/targets/minecraft/world/level/biome/TaigaBiome.cpp index fb95a3186..fe3530e2e 100644 --- a/targets/minecraft/world/level/biome/TaigaBiome.cpp +++ b/targets/minecraft/world/level/biome/TaigaBiome.cpp @@ -7,6 +7,7 @@ #include "minecraft/world/level/biome/BiomeDecorator.h" #include "minecraft/world/level/levelgen/feature/PineFeature.h" #include "minecraft/world/level/levelgen/feature/SpruceFeature.h" +#include "minecraft/world/level/biome/Biome.h" TaigaBiome::TaigaBiome(int id) : Biome(id) { friendlies_wolf.push_back(new MobSpawnerData( diff --git a/targets/minecraft/world/level/biome/TheEndBiome.cpp b/targets/minecraft/world/level/biome/TheEndBiome.cpp index 6c2253f19..74cdd947c 100644 --- a/targets/minecraft/world/level/biome/TheEndBiome.cpp +++ b/targets/minecraft/world/level/biome/TheEndBiome.cpp @@ -1,12 +1,12 @@ #include "TheEndBiome.h" #include - #include #include "TheEndBiomeDecorator.h" #include "java/Class.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" TheEndBiome::TheEndBiome(int id) : Biome(id) { enemies.clear(); diff --git a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp index c51bd2220..4e019ab6f 100644 --- a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp +++ b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp @@ -1,9 +1,17 @@ #include "TheEndBiomeDecorator.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include + +#include "java/Random.h" +#include "minecraft/world/entity/boss/enderdragon/EnderDragon.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/BiomeDecorator.h" +#include "minecraft/world/level/levelgen/feature/EndPodiumFeature.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/levelgen/feature/SpikeFeature.h" +#include "minecraft/world/level/tile/Tile.h" + +class Biome; // Spike centre positions, calculated using // for(int i=0;i<8;i++) diff --git a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.h b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.h index 82a3bc9ca..efd784137 100644 --- a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.h +++ b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.h @@ -1,6 +1,9 @@ #pragma once #include "BiomeDecorator.h" +class Biome; +class Feature; + class TheEndBiomeDecorator : public BiomeDecorator { public: typedef struct { diff --git a/targets/minecraft/world/level/chunk/BlockReplacements.h b/targets/minecraft/world/level/chunk/BlockReplacements.h index 1b8452b30..b585242ca 100644 --- a/targets/minecraft/world/level/chunk/BlockReplacements.h +++ b/targets/minecraft/world/level/chunk/BlockReplacements.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp index f9108e9f5..814a7302e 100644 --- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -3,13 +3,11 @@ #include #include #include - +#include #include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/Definitions.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/DataLayer.h b/targets/minecraft/world/level/chunk/DataLayer.h index 255346513..1ae6659e0 100644 --- a/targets/minecraft/world/level/chunk/DataLayer.h +++ b/targets/minecraft/world/level/chunk/DataLayer.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp b/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp index 9da1c30e7..7d1c59843 100644 --- a/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp @@ -3,8 +3,9 @@ #include "java/Arrays.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/chunk/LevelChunk.h" class Entity; class EntitySelector; diff --git a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h index 0298bce67..aa22f8493 100644 --- a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h +++ b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h @@ -1,9 +1,9 @@ #pragma once #include - #include #include #include +#include #include "LevelChunk.h" #include "console_helpers/Definitions.h" diff --git a/targets/minecraft/world/level/chunk/LevelChunk.cpp b/targets/minecraft/world/level/chunk/LevelChunk.cpp index 52d47e4e3..400ea0e51 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/LevelChunk.cpp @@ -1,7 +1,6 @@ #include "LevelChunk.h" #include - #include #include #include @@ -10,9 +9,6 @@ #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "SparseLightStorage.h" #include "java/Class.h" #include "java/Random.h" @@ -37,8 +33,6 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/biome/BiomeSource.h" #include "minecraft/world/level/chunk/ChunkSource.h" -#include "minecraft/world/level/chunk/CompressedTileStorage.h" -#include "minecraft/world/level/chunk/SparseDataStorage.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/ChestTile.h" @@ -48,6 +42,10 @@ #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/chunk/CompressedTileStorage.h" +#include "minecraft/world/level/chunk/SparseDataStorage.h" class DataInputStream; class DataOutputStream; diff --git a/targets/minecraft/world/level/chunk/LevelChunk.h b/targets/minecraft/world/level/chunk/LevelChunk.h index bbf7bf0b9..09b65208a 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.h +++ b/targets/minecraft/world/level/chunk/LevelChunk.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp index 2802cda1d..5e0d1e058 100644 --- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp +++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp @@ -1,9 +1,10 @@ #include "ReadOnlyChunkCache.h" #include "minecraft/world/level/Level.h" +#include "minecraft/world/level/chunk/storage/ChunkStorage.h" +#include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/chunk/EmptyLevelChunk.h" #include "minecraft/world/level/chunk/LevelChunk.h" -#include "minecraft/world/level/chunk/storage/ChunkStorage.h" ReadOnlyChunkCache::ReadOnlyChunkCache(Level* level, ChunkStorage* storage) { chunks = std::vector(LEN * LEN); diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h index 6ef1ba569..d67357d78 100644 --- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h +++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp index 4b028125c..a2208dd6a 100644 --- a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp @@ -3,13 +3,10 @@ #include #include #include - #include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp index 313e0d82a..cdbfcb8ba 100644 --- a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp @@ -3,13 +3,10 @@ #include #include #include - #include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp b/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp index 95a88515c..8f42fe94a 100644 --- a/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp @@ -2,8 +2,9 @@ #include "java/Random.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/LightLayer.h" +#include "minecraft/world/level/chunk/LevelChunk.h" class Entity; diff --git a/targets/minecraft/world/level/chunk/WaterLevelChunk.h b/targets/minecraft/world/level/chunk/WaterLevelChunk.h index 5dce4df6a..be7f659ee 100644 --- a/targets/minecraft/world/level/chunk/WaterLevelChunk.h +++ b/targets/minecraft/world/level/chunk/WaterLevelChunk.h @@ -1,9 +1,9 @@ #pragma once #include - #include #include #include +#include #include "LevelChunk.h" #include "console_helpers/Definitions.h" diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 7f8e21533..93d4c0a9c 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -10,9 +9,6 @@ #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/C4JThread.h" #include "console_helpers/ThreadName.h" #include "console_helpers/compression.h" @@ -23,8 +19,6 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" -#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" -#include "minecraft/world/level/chunk/storage/RegionFileCache.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" @@ -34,6 +28,9 @@ #include "nbt/CompoundTag.h" #include "nbt/NbtIo.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" +#include "minecraft/world/level/chunk/storage/OldChunkStorage.h" +#include "minecraft/world/level/chunk/storage/RegionFileCache.h" class DataInput; diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h index 403ddb8bf..e85be5113 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index e82ffa5ae..761aa3609 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -12,9 +11,6 @@ #include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/Definitions.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" @@ -34,6 +30,7 @@ #include "nbt/ListTag.h" #include "nbt/NbtIo.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage = nullptr; diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp index fcd3b688f..a270fca01 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -1,15 +1,11 @@ #include "RegionFile.h" #include - #include #include #include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/compression.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.h b/targets/minecraft/world/level/chunk/storage/RegionFile.h index 049431186..ae1030fed 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.h +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp index 332127c30..b0a2a7b38 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp @@ -4,8 +4,9 @@ #include "console_helpers/StringHelpers.h" #include "java/File.h" -#include "minecraft/world/level/chunk/storage/RegionFile.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/chunk/storage/RegionFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" class DataInputStream; class DataOutputStream; diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index f0b7e737c..3149a98ea 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -1,7 +1,6 @@ #include "Dimension.h" #include - #include #include "HellDimension.h" @@ -25,6 +24,8 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" +#include "minecraft/world/phys/Vec3.h" class Pos; diff --git a/targets/minecraft/world/level/dimension/Dimension.h b/targets/minecraft/world/level/dimension/Dimension.h index f64863169..466ab95e0 100644 --- a/targets/minecraft/world/level/dimension/Dimension.h +++ b/targets/minecraft/world/level/dimension/Dimension.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include "java/File.h" diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index 818bd2c04..94e72a895 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -16,6 +16,7 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/phys/Vec3.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" void HellDimension::init() { biomeSource = new FixedBiomeSource(Biome::hell, 1, 0); diff --git a/targets/minecraft/world/level/levelgen/CanyonFeature.h b/targets/minecraft/world/level/levelgen/CanyonFeature.h index af77a87ad..406890ad2 100644 --- a/targets/minecraft/world/level/levelgen/CanyonFeature.h +++ b/targets/minecraft/world/level/levelgen/CanyonFeature.h @@ -1,7 +1,7 @@ #pragma once #include - #include +#include #include "LargeFeature.h" #include "minecraft/world/level/levelgen/LargeFeature.h" diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp index 4c3ba27e1..0a9ab9e1a 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -2,18 +2,17 @@ #include #include - +#include #include #include #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" #if defined(__linux__) #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #endif -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/world/entity/MobCategory.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.h b/targets/minecraft/world/level/levelgen/CustomLevelSource.h index 019ae32d3..9bcaf00c9 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/levelgen/DungeonFeature.h b/targets/minecraft/world/level/levelgen/DungeonFeature.h index 9d51f94ab..c094b3dc5 100644 --- a/targets/minecraft/world/level/levelgen/DungeonFeature.h +++ b/targets/minecraft/world/level/levelgen/DungeonFeature.h @@ -1,7 +1,7 @@ #pragma once #include - #include +#include #include "LargeFeature.h" #include "minecraft/world/level/levelgen/LargeFeature.h" diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp index c5bd65d00..ff9641be6 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -1,18 +1,18 @@ #include "FlatLevelSource.h" +#include +#include #include #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" #include "minecraft/world/level/levelgen/structure/VillageFeature.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" // FlatLevelSource::villageFeature = new VillageFeature(1); diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.h b/targets/minecraft/world/level/levelgen/FlatLevelSource.h index 15dabd66b..e7dedc253 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.h +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.h @@ -1,9 +1,9 @@ #pragma once #include - #include #include +#include #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/chunk/ChunkSource.h" diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index 67b58dd5c..597c929ff 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -1,13 +1,11 @@ #include "HellFlatLevelSource.h" +#include +#include #include #include #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" @@ -16,6 +14,8 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/HeavyTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" HellFlatLevelSource::HellFlatLevelSource(Level* level, int64_t seed) { int xzSize = level->getLevelData()->getXZSize(); diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h index a8b43a9d0..419fa5be2 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h @@ -1,8 +1,8 @@ #pragma once #include - #include #include +#include #include "LargeFeature.h" #include "LargeHellCaveFeature.h" diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index 251e392f5..4dc4acc04 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -1,20 +1,16 @@ #include "HellRandomLevelSource.h" +#include +#include #include #include #include #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/world/entity/MobCategory.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/LevelChunk.h" -#include "minecraft/world/level/levelgen/LargeFeature.h" -#include "minecraft/world/level/levelgen/LargeHellCaveFeature.h" #include "minecraft/world/level/levelgen/feature/FlowerFeature.h" #include "minecraft/world/level/levelgen/feature/HellFireFeature.h" #include "minecraft/world/level/levelgen/feature/HellPortalFeature.h" @@ -26,6 +22,10 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/HeavyTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/LargeHellCaveFeature.h" HellRandomLevelSource::HellRandomLevelSource(Level* level, int64_t seed) { int xzSize = level->getLevelData()->getXZSize(); diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h index 067205ba5..fd61f5bf0 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/levelgen/LargeCaveFeature.h b/targets/minecraft/world/level/levelgen/LargeCaveFeature.h index 60a61ebaa..c01d47ef3 100644 --- a/targets/minecraft/world/level/levelgen/LargeCaveFeature.h +++ b/targets/minecraft/world/level/levelgen/LargeCaveFeature.h @@ -1,8 +1,8 @@ #pragma once #include - #include +#include #include "LargeFeature.h" #include "minecraft/world/level/levelgen/LargeFeature.h" diff --git a/targets/minecraft/world/level/levelgen/LargeFeature.cpp b/targets/minecraft/world/level/levelgen/LargeFeature.cpp index 52423f3a9..0b2743979 100644 --- a/targets/minecraft/world/level/levelgen/LargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/LargeFeature.cpp @@ -2,13 +2,11 @@ #include "LargeFeature.h" #include - #include #include #include "java/Random.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/LargeFeature.h" class ChunkSource; diff --git a/targets/minecraft/world/level/levelgen/LargeFeature.h b/targets/minecraft/world/level/levelgen/LargeFeature.h index d90e58d34..2f76ecb5e 100644 --- a/targets/minecraft/world/level/levelgen/LargeFeature.h +++ b/targets/minecraft/world/level/levelgen/LargeFeature.h @@ -1,7 +1,13 @@ #pragma once +#include +#include +#include + #include "minecraft/world/level/chunk/ChunkSource.h" class Level; +class ChunkSource; +class Random; class LargeFeature { public: diff --git a/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h b/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h index c5d7d467d..5e093bb78 100644 --- a/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h +++ b/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h @@ -1,8 +1,8 @@ #pragma once #include - #include +#include #include "LargeFeature.h" #include "minecraft/world/level/levelgen/LargeFeature.h" diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp index 01083c547..749ce902c 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -1,11 +1,11 @@ #include "RandomLevelSource.h" +#include +#include +#include + #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/PlatformTime.h" #include "java/Random.h" #include "minecraft/util/Mth.h" @@ -28,6 +28,8 @@ #include "minecraft/world/level/tile/HeavyTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" const double RandomLevelSource::SNOW_SCALE = 0.3; const double RandomLevelSource::SNOW_CUTOFF = 0.5; diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.h b/targets/minecraft/world/level/levelgen/RandomLevelSource.h index 023c361d6..993736b40 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index a763515bd..3b0717f13 100644 --- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -1,12 +1,10 @@ #include "TheEndLevelRandomLevelSource.h" +#include +#include #include #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/BiomeSource.h" @@ -14,6 +12,8 @@ #include "minecraft/world/level/levelgen/synth/PerlinNoise.h" #include "minecraft/world/level/tile/HeavyTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/chunk/ChunkSource.h" TheEndLevelRandomLevelSource::TheEndLevelRandomLevelSource(Level* level, int64_t seed) { diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h index 1657216c1..216db28a0 100644 --- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index 2b90e15a0..76d9ad97c 100644 --- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -1,21 +1,17 @@ #include "BasicTreeFeature.h" #include - #include #include #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" uint8_t BasicTree::axisConversionArray[] = {2, 0, 0, 1, 2, 1}; diff --git a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp index eb092b3d4..5444e495f 100644 --- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -6,10 +6,10 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/tile/LeafTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" BirchFeature::BirchFeature(bool doUpdate) : Feature(doUpdate) {} diff --git a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp index d5200e83e..1648abaa4 100644 --- a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp @@ -2,9 +2,8 @@ #include -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" EndPodiumFeature::EndPodiumFeature(int tile) { this->tile = tile; diff --git a/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp b/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp index 8fa53dcbd..0909ccb75 100644 --- a/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp @@ -2,9 +2,6 @@ #include -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" diff --git a/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp b/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp index 0873c4d48..9db018f09 100644 --- a/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp @@ -2,8 +2,8 @@ #include "java/Random.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" HugeMushroomFeature::HugeMushroomFeature(int forcedType) : Feature(true) { this->forcedType = forcedType; diff --git a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index 5d5572876..b2edfc069 100644 --- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -4,15 +4,12 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/VineTile.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" MegaTreeFeature::MegaTreeFeature(bool doUpdate, int baseHeight, int trunkType, int leafType) diff --git a/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp b/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp index b4f051c42..d41081d95 100644 --- a/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.cpp @@ -1,5 +1,7 @@ #include "NetherSphereFeature.h" +#include "minecraft/world/entity/Entity.h" + class Level; NetherSphere::NetherSphere(Level* level) : Entity(level) { diff --git a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp index b9d45e304..e66392b90 100644 --- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -4,9 +4,6 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp index 2ecb27853..b895f664d 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp @@ -1,8 +1,12 @@ #include "SpikeFeature.h" -#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" +#include + +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" SpikeFeature::SpikeFeature(int tile) { this->tile = tile; diff --git a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 060182393..474c60286 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -6,10 +6,10 @@ #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/tile/LeafTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" SpruceFeature::SpruceFeature(bool doUpdate) : Feature(doUpdate) {} diff --git a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp index a32b79d89..7fc373c21 100644 --- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -4,15 +4,12 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/feature/Feature.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/VineTile.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" TreeFeature::TreeFeature(bool doUpdate) : Feature(doUpdate), diff --git a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp index db97bf5f3..04c0252c3 100644 --- a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp +++ b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp @@ -1,15 +1,12 @@ #include "BoundingBox.h" #include - -#include #include #include #include "console_helpers/StringHelpers.h" #include "java/JavaMath.h" #include "minecraft/Direction.h" -#include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "nbt/IntArrayTag.h" BoundingBox::BoundingBox() { diff --git a/targets/minecraft/world/level/levelgen/structure/BoundingBox.h b/targets/minecraft/world/level/levelgen/structure/BoundingBox.h index d81998bad..b57b78c9b 100644 --- a/targets/minecraft/world/level/levelgen/structure/BoundingBox.h +++ b/targets/minecraft/world/level/levelgen/structure/BoundingBox.h @@ -1,7 +1,12 @@ #pragma once +#include +#include + #include "nbt/IntArrayTag.h" +class IntArrayTag; + class BoundingBox { public: int x0, y0, z0, x1, y1, z1; diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp index 2259894fb..b591ae60f 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp @@ -1,7 +1,6 @@ #include "MineShaftPieces.h" #include - #include #include #include @@ -17,7 +16,6 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/BaseMobSpawner.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/tile/BaseRailTile.h" #include "minecraft/world/level/tile/RailTile.h" #include "minecraft/world/level/tile/Tile.h" @@ -25,6 +23,8 @@ #include "nbt/CompoundTag.h" #include "nbt/IntArrayTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" std::vector MineShaftPieces::smallTreasureItems; ; diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h index de4c3957d..4d3e55ce8 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.h @@ -2,11 +2,13 @@ #include #include +#include #include "StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class BoundingBox; class Random; diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index bc47b6dc2..316d0e81f 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -11,6 +11,8 @@ #include "minecraft/world/level/ChunkPos.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureStart.h" diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h index 73bfa458e..a5ee5c91a 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h @@ -8,6 +8,7 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Random; class ChunkPos; diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp index d0d552857..43c6d00cc 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp @@ -1,7 +1,6 @@ #include "NetherBridgePieces.h" #include - #include #include #include @@ -12,11 +11,12 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/BaseMobSpawner.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" void NetherBridgePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_BridgeCrossing, diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h index e9e96fd80..1aec2602e 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.h @@ -5,6 +5,7 @@ #include "StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class BoundingBox; class Level; diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 89884780a..200fb9ea3 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -11,6 +11,7 @@ #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/BiomeSource.h" +#include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureStart.h" diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h index 27c87ac06..e6104afd3 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h @@ -10,6 +10,7 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Level; class Random; diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index 9501ab503..21e41fb1f 100644 --- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -17,7 +17,6 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" -#include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/tile/FlowerPotTile.h" #include "minecraft/world/level/tile/LeverTile.h" @@ -30,6 +29,8 @@ #include "minecraft/world/level/tile/TripWireSourceTile.h" #include "minecraft/world/level/tile/TripWireTile.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" void ScatteredFeaturePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_DesertPyramidPiece, diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h index 3ee20f12b..326184a38 100644 --- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h +++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h @@ -3,6 +3,7 @@ #include "StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class BoundingBox; class Level; diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index dbd2b3cc1..ef2d4645e 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -23,6 +22,7 @@ #include "minecraft/world/level/biome/BiomeSource.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/levelgen/LargeFeature.h" +#include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureStart.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h index 03c77334c..e8aaf12b4 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h @@ -3,12 +3,14 @@ #include #include #include +#include #include "StructureFeature.h" #include "StructureStart.h" #include "minecraft/world/level/ChunkPos.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Biome; class ChunkPos; diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index ece357db0..b484b3c9f 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -2,7 +2,6 @@ #include #include - #include #include @@ -18,7 +17,6 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/BaseMobSpawner.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/DoorTile.h" @@ -29,6 +27,8 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" int StrongholdPieces::totalWeight = 0; std::list StrongholdPieces::currentPieces; diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h index c656ee464..ad5bdbf62 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.h @@ -5,6 +5,7 @@ #include "StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class BoundingBox; class Level; diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp index c29338ac2..736dd39f5 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -16,7 +15,6 @@ #include "minecraft/world/level/LevelType.h" #include "minecraft/world/level/TilePos.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" -#include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/storage/LevelData.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h index f6fac2aaa..8a05ff84e 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h @@ -1,8 +1,16 @@ #pragma once +#include +#include +#include +#include + #include "StructureFeatureSavedData.h" #include "minecraft/world/level/levelgen/LargeFeature.h" class StructureStart; +class Level; +class Random; +class TilePos; // #define ENABLE_STRUCTURE_SAVING diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp index fb9f3ed46..7fe487571 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp @@ -13,7 +13,6 @@ #include "minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.h" #include "minecraft/world/level/levelgen/structure/StrongholdFeature.h" #include "minecraft/world/level/levelgen/structure/StrongholdPieces.h" -#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureStart.h" #include "minecraft/world/level/levelgen/structure/VillageFeature.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h index 87de9a762..c9e3e9c7e 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h @@ -1,12 +1,14 @@ #pragma once #include +#include #include "nbt/CompoundTag.h" class StructurePiece; class StructureStart; class Level; +class CompoundTag; typedef StructurePiece* (*structurePieceCreateFn)(); typedef StructureStart* (*structureStartCreateFn)(); diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp index e39cacbde..06fbe5037 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp @@ -3,7 +3,6 @@ #include #include "console_helpers/StringHelpers.h" -#include "minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h" #include "minecraft/world/level/saveddata/SavedData.h" #include "nbt/CompoundTag.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h index 06d451f34..a92d04097 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "minecraft/world/level/saveddata/SavedData.h" +class CompoundTag; + class StructureFeatureSavedData : public SavedData { private: static std::wstring TAG_FEATURES; diff --git a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp index 979db90fd..696d502ac 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp @@ -16,7 +16,6 @@ #include "minecraft/world/level/TilePos.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" -#include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/BaseRailTile.h" #include "minecraft/world/level/tile/ChestTile.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StructurePiece.h b/targets/minecraft/world/level/levelgen/structure/StructurePiece.h index d8a831813..e42790ffd 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructurePiece.h +++ b/targets/minecraft/world/level/levelgen/structure/StructurePiece.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "BoundingBox.h" #include "StructureFeatureIO.h" @@ -14,6 +15,8 @@ class BlockSelector; class ChestTileEntity; class WeighedTreasure; class TilePos; +class BoundingBox; +class CompoundTag; /** * diff --git a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp index 15b494999..750b76060 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp @@ -9,6 +9,7 @@ #include "nbt/CompoundTag.h" #include "nbt/IntArrayTag.h" #include "nbt/ListTag.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" StructureStart::StructureStart() { chunkX = chunkZ = 0; diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 05a34a095..6e17328e5 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -14,10 +14,10 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/biome/BiomeSource.h" #include "minecraft/world/level/dimension/Dimension.h" +#include "nbt/CompoundTag.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureStart.h" -#include "nbt/CompoundTag.h" const std::wstring VillageFeature::OPTION_SIZE_MODIFIER = L"size"; const std::wstring VillageFeature::OPTION_SPACING = L"distance"; diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.h b/targets/minecraft/world/level/levelgen/structure/VillageFeature.h index 69649044e..ebcf0ba90 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.h @@ -2,11 +2,13 @@ #include #include #include +#include #include "StructureFeature.h" #include "StructureStart.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Biome; class Level; diff --git a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp index 898be74f2..8c1190463 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp @@ -1,7 +1,6 @@ #include "VillagePieces.h" #include - #include #include @@ -17,11 +16,12 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/biome/BiomeSource.h" #include "minecraft/world/level/dimension/Dimension.h" -#include "minecraft/world/level/levelgen/structure/BoundingBox.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/SandStoneTile.h" #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/levelgen/structure/BoundingBox.h" +#include "minecraft/world/level/levelgen/structure/StructurePiece.h" std::vector VillagePieces::Smithy::treasureItems; diff --git a/targets/minecraft/world/level/levelgen/structure/VillagePieces.h b/targets/minecraft/world/level/levelgen/structure/VillagePieces.h index 9db125a56..ed42a376a 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillagePieces.h +++ b/targets/minecraft/world/level/levelgen/structure/VillagePieces.h @@ -6,6 +6,7 @@ #include "StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" +#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class BiomeSource; class BoundingBox; diff --git a/targets/minecraft/world/level/levelgen/synth/FastNoise.h b/targets/minecraft/world/level/levelgen/synth/FastNoise.h index 71c61b5f3..06d436494 100644 --- a/targets/minecraft/world/level/levelgen/synth/FastNoise.h +++ b/targets/minecraft/world/level/levelgen/synth/FastNoise.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.h b/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.h index 6ed8edac3..d7fced82d 100644 --- a/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.h +++ b/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "Synth.h" diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp index 79505edca..df56f0656 100644 --- a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp @@ -1,17 +1,15 @@ #include "BiomeOverrideLayer.h" #include - #include #include -#include #include "Minecraft.Client/Linux/Linux_App.h" +#include "minecraft/world/level/newbiome/layer/Layer.h" #if defined(__linux__) #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #endif #include "minecraft/world/level/biome/Biome.h" -#include "minecraft/world/level/newbiome/layer/Layer.h" BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { m_biomeOverride = std::vector(width * height); diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h index a976f833b..e7133f034 100644 --- a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h +++ b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include "Layer.h" diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp index c247363e8..8bb96e8d9 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp @@ -1,7 +1,6 @@ #include "minecraft/world/level/newbiome/layer/Layer.h" #include - #include #include @@ -26,6 +25,7 @@ #include "minecraft/world/level/newbiome/layer/VoronoiZoom.h" #include "minecraft/world/level/newbiome/layer/ZoomLayer.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" std::vector> Layer::getDefaultLayers( int64_t seed, LevelType* levelType) { diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.h b/targets/minecraft/world/level/newbiome/layer/Layer.h index 7d1549d01..62b836c6f 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.h +++ b/targets/minecraft/world/level/newbiome/layer/Layer.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/pathfinder/Path.cpp b/targets/minecraft/world/level/pathfinder/Path.cpp index 1dda37b27..5307cacd0 100644 --- a/targets/minecraft/world/level/pathfinder/Path.cpp +++ b/targets/minecraft/world/level/pathfinder/Path.cpp @@ -3,6 +3,8 @@ #include #include "minecraft/world/entity/Entity.h" +#include "minecraft/world/level/pathfinder/Node.h" +#include "minecraft/world/phys/Vec3.h" Path::~Path() { for (size_t i = 0; i < nodes.size(); i++) delete nodes[i]; diff --git a/targets/minecraft/world/level/pathfinder/PathFinder.cpp b/targets/minecraft/world/level/pathfinder/PathFinder.cpp index 1a4529f60..89633970d 100644 --- a/targets/minecraft/world/level/pathfinder/PathFinder.cpp +++ b/targets/minecraft/world/level/pathfinder/PathFinder.cpp @@ -4,8 +4,6 @@ #include #include -#include "BinaryHeap.h" -#include "Node.h" #include "Path.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" @@ -14,6 +12,8 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/pathfinder/BinaryHeap.h" +#include "minecraft/world/level/pathfinder/Node.h" PathFinder::PathFinder(LevelSource* level, bool canPassDoors, bool canOpenDoors, bool avoidWater, bool canFloat) { diff --git a/targets/minecraft/world/level/pathfinder/PathFinder.h b/targets/minecraft/world/level/pathfinder/PathFinder.h index 2f6cd631a..43441c3f5 100644 --- a/targets/minecraft/world/level/pathfinder/PathFinder.h +++ b/targets/minecraft/world/level/pathfinder/PathFinder.h @@ -1,6 +1,7 @@ #pragma once #include #include +#include #include "java/JavaIntHash.h" #include "minecraft/world/level/pathfinder/BinaryHeap.h" diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp index 299ccf05a..bfc209af0 100644 --- a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp +++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp @@ -1,7 +1,6 @@ #include "MapItemSavedData.h" #include - #include #include @@ -15,6 +14,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/storage/LevelData.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/saveddata/SavedData.h" const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1; diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.h b/targets/minecraft/world/level/saveddata/MapItemSavedData.h index 9868c694a..218703af8 100644 --- a/targets/minecraft/world/level/saveddata/MapItemSavedData.h +++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/saveddata/SavedData.cpp b/targets/minecraft/world/level/saveddata/SavedData.cpp index 8428873f5..25680d2fa 100644 --- a/targets/minecraft/world/level/saveddata/SavedData.cpp +++ b/targets/minecraft/world/level/saveddata/SavedData.cpp @@ -3,8 +3,6 @@ #include -#include "minecraft/world/level/saveddata/SavedData.h" - SavedData::SavedData(const std::wstring& id) : id(id) { dirty = false; } void SavedData::setDirty() { setDirty(true); } diff --git a/targets/minecraft/world/level/saveddata/SavedData.h b/targets/minecraft/world/level/saveddata/SavedData.h index 5f7b59d41..5e33855ae 100644 --- a/targets/minecraft/world/level/saveddata/SavedData.h +++ b/targets/minecraft/world/level/saveddata/SavedData.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "java/Class.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index 64a40cb7d..e588b3cea 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -1,10 +1,29 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h" +#include +#include +#include +#include +#include +#include + #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" #include "minecraft/util/ProgressListener.h" -#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h" -#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h" -#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h" +#include "java/InputOutputStream/BufferedOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "nbt/CompoundTag.h" +#include "nbt/NbtIo.h" +#include "strings.h" +#include "minecraft/world/level/chunk/ChunkSource.h" +#include "minecraft/world/level/chunk/storage/RegionFile.h" +#include "minecraft/world/level/chunk/storage/RegionFileCache.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" +#include "minecraft/world/level/storage/DirectoryLevelStorage.h" +#include "minecraft/world/level/storage/LevelData.h" void ConsoleSaveFileConverter::ProcessSimpleFile(ConsoleSaveFile* sourceSave, FileEntry* sourceFileEntry, diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 9e72010b3..fd3ed64ae 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -18,9 +17,6 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/compression.h" #include "java/File.h" @@ -36,6 +32,7 @@ #include "minecraft/world/level/storage/LevelData.h" #include "platform/IPlatformStorage.h" #include "platform/PlatformServices.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #define RESERVE_ALLOCATION MEM_RESERVE #define COMMIT_ALLOCATION MEM_COMMIT diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 5ecb8bee0..272522084 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -4,7 +4,6 @@ #include #include #include - #include #include #include @@ -19,9 +18,6 @@ #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/StringHelpers.h" @@ -40,6 +36,7 @@ #include "minecraft/world/level/storage/LevelData.h" #include "platform/IPlatformStorage.h" #include "platform/PlatformServices.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" class ProgressListener; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index 153295373..8816b9675 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -4,12 +4,9 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include -#include #include - #include #include -#include #include #include @@ -17,7 +14,6 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "console_helpers/Definitions.h" #include "java/System.h" -#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" extern CConsoleMinecraftApp app; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h index d8a837bac..74479035a 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "console_helpers/Definitions.h" diff --git a/targets/minecraft/world/level/storage/DerivedLevelData.h b/targets/minecraft/world/level/storage/DerivedLevelData.h index 7f265e781..80ded27d8 100644 --- a/targets/minecraft/world/level/storage/DerivedLevelData.h +++ b/targets/minecraft/world/level/storage/DerivedLevelData.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 4783b62e0..0a586a853 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -3,7 +3,7 @@ #include #include #include - +#include #include #include #include @@ -14,9 +14,6 @@ #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" @@ -35,14 +32,15 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "minecraft/world/level/storage/LevelStorage.h" -#include "minecraft/world/level/storage/PlayerIO.h" #include "nbt/CompoundTag.h" #include "nbt/DoubleTag.h" #include "nbt/ListTag.h" #include "nbt/NbtIo.h" #include "platform/IPlatformStorage.h" #include "platform/PlatformServices.h" +#include "IPlatformInput.h" +#include "minecraft/world/level/storage/LevelStorage.h" +#include "minecraft/world/level/storage/PlayerIO.h" const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/"); diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h index efb8a40e6..2c3ca2e67 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h @@ -26,7 +26,6 @@ #define END_DIMENSION_MAP_MAPPINGS_SAVE_VERSION 5 #include - #include #include #include diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h index 4c4deecad..75870e2b3 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h @@ -2,6 +2,7 @@ #include #include +#include #include "LevelStorageSource.h" #include "java/File.h" diff --git a/targets/minecraft/world/level/storage/LevelData.h b/targets/minecraft/world/level/storage/LevelData.h index abdff145c..235df4d1f 100644 --- a/targets/minecraft/world/level/storage/LevelData.h +++ b/targets/minecraft/world/level/storage/LevelData.h @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp index c6aaa7234..306164c53 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp @@ -1,7 +1,6 @@ #include "McRegionLevelStorage.h" #include - #include #include diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp index 7bacb0eb2..0664970d0 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp @@ -1,7 +1,6 @@ #include "McRegionLevelStorageSource.h" #include - #include #include "LevelData.h" diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.cpp b/targets/minecraft/world/level/storage/SavedDataStorage.cpp index 3f8fa00b3..2844eaf8e 100644 --- a/targets/minecraft/world/level/storage/SavedDataStorage.cpp +++ b/targets/minecraft/world/level/storage/SavedDataStorage.cpp @@ -1,7 +1,6 @@ #include "SavedDataStorage.h" #include - #include #include @@ -21,6 +20,7 @@ #include "nbt/NbtIo.h" #include "nbt/ShortTag.h" #include "nbt/Tag.h" +#include "minecraft/world/level/saveddata/SavedData.h" SavedDataStorage::SavedDataStorage(LevelStorage* levelStorage) { /* diff --git a/targets/minecraft/world/level/tile/AnvilTile.cpp b/targets/minecraft/world/level/tile/AnvilTile.cpp index 61e66ee7c..095f2385e 100644 --- a/targets/minecraft/world/level/tile/AnvilTile.cpp +++ b/targets/minecraft/world/level/tile/AnvilTile.cpp @@ -1,13 +1,21 @@ #include "AnvilTile.h" -#include "minecraft/net.minecraft.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" -#include "net.minecraft.world.level.tile.h" #include "strings.h" +#include "Direction.h" +#include "Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/item/FallingTile.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/LevelEvent.h" +#include "minecraft/world/level/tile/Tile.h" + +class Icon; const unsigned int AnvilTile::ANVIL_NAMES[ANVIL_NAMES_LENGTH] = { IDS_TILE_ANVIL_INTACT, diff --git a/targets/minecraft/world/level/tile/AnvilTile.h b/targets/minecraft/world/level/tile/AnvilTile.h index 141940a50..7e5b38bc0 100644 --- a/targets/minecraft/world/level/tile/AnvilTile.h +++ b/targets/minecraft/world/level/tile/AnvilTile.h @@ -1,8 +1,12 @@ #pragma once +#include +#include + #include "HeavyTile.h" class FallingTile; +class Icon; class AnvilTile : public HeavyTile { friend class ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/BaseEntityTile.cpp b/targets/minecraft/world/level/tile/BaseEntityTile.cpp index ede66e436..5543ccb57 100644 --- a/targets/minecraft/world/level/tile/BaseEntityTile.cpp +++ b/targets/minecraft/world/level/tile/BaseEntityTile.cpp @@ -3,8 +3,8 @@ #include #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/Tile.h" class Material; diff --git a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp index 849b254c3..4fec9b410 100644 --- a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp @@ -12,6 +12,7 @@ #include "minecraft/world/level/redstone/Redstone.h" #include "minecraft/world/level/tile/FenceTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" BasePressurePlateTile::BasePressurePlateTile(int id, const std::wstring& tex, Material* material) diff --git a/targets/minecraft/world/level/tile/BaseRailTile.cpp b/targets/minecraft/world/level/tile/BaseRailTile.cpp index 0260fa7f0..7bcb2689a 100644 --- a/targets/minecraft/world/level/tile/BaseRailTile.cpp +++ b/targets/minecraft/world/level/tile/BaseRailTile.cpp @@ -7,8 +7,8 @@ #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/TilePos.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" BaseRailTile::Rail::Rail(Level* level, int x, int y, int z) { this->level = level; diff --git a/targets/minecraft/world/level/tile/BeaconTile.cpp b/targets/minecraft/world/level/tile/BeaconTile.cpp index cc00dc57f..3d5585fad 100644 --- a/targets/minecraft/world/level/tile/BeaconTile.cpp +++ b/targets/minecraft/world/level/tile/BeaconTile.cpp @@ -7,8 +7,8 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/entity/BeaconTileEntity.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" BeaconTile::BeaconTile(int id) : BaseEntityTile(id, Material::glass, false) { setDestroyTime(3.0f); diff --git a/targets/minecraft/world/level/tile/BedTile.cpp b/targets/minecraft/world/level/tile/BedTile.cpp index b8845362a..718d23eb3 100644 --- a/targets/minecraft/world/level/tile/BedTile.cpp +++ b/targets/minecraft/world/level/tile/BedTile.cpp @@ -1,11 +1,23 @@ #include "BedTile.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include +#include + #include "minecraft/world/level/dimension/Dimension.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" +#include "Direction.h" +#include "Facing.h" +#include "Pos.h" +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/DirectionalTile.h" + +class Icon; int BedTile::HEAD_DIRECTION_OFFSETS[4][2] = {{0, 1}, {-1, 0}, {0, -1}, {1, 0}}; diff --git a/targets/minecraft/world/level/tile/BedTile.h b/targets/minecraft/world/level/tile/BedTile.h index 043256708..c507bf51d 100644 --- a/targets/minecraft/world/level/tile/BedTile.h +++ b/targets/minecraft/world/level/tile/BedTile.h @@ -1,10 +1,14 @@ #pragma once +#include + #include "DirectionalTile.h" +#include "minecraft/world/level/tile/Tile.h" class Pos; class Player; class Random; class Level; +class Icon; class BedTile : public DirectionalTile { private: diff --git a/targets/minecraft/world/level/tile/BrewingStandTile.cpp b/targets/minecraft/world/level/tile/BrewingStandTile.cpp index 048296eff..0298f75dc 100644 --- a/targets/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/targets/minecraft/world/level/tile/BrewingStandTile.cpp @@ -14,10 +14,10 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" class Icon; diff --git a/targets/minecraft/world/level/tile/ButtonTile.cpp b/targets/minecraft/world/level/tile/ButtonTile.cpp index c1b3204b0..4642439ca 100644 --- a/targets/minecraft/world/level/tile/ButtonTile.cpp +++ b/targets/minecraft/world/level/tile/ButtonTile.cpp @@ -11,8 +11,8 @@ #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" class Entity; diff --git a/targets/minecraft/world/level/tile/CactusTile.cpp b/targets/minecraft/world/level/tile/CactusTile.cpp index 324730887..999e12bca 100644 --- a/targets/minecraft/world/level/tile/CactusTile.cpp +++ b/targets/minecraft/world/level/tile/CactusTile.cpp @@ -10,8 +10,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" CactusTile::CactusTile(int id) : Tile(id, Material::cactus, false) { setTicking(true); diff --git a/targets/minecraft/world/level/tile/CakeTile.cpp b/targets/minecraft/world/level/tile/CakeTile.cpp index bc2849c90..6d91245e2 100644 --- a/targets/minecraft/world/level/tile/CakeTile.cpp +++ b/targets/minecraft/world/level/tile/CakeTile.cpp @@ -12,8 +12,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" CakeTile::CakeTile(int id) : Tile(id, Material::cake, false) { setTicking(true); diff --git a/targets/minecraft/world/level/tile/ChestTile.cpp b/targets/minecraft/world/level/tile/ChestTile.cpp index 0355388bf..513d3c031 100644 --- a/targets/minecraft/world/level/tile/ChestTile.cpp +++ b/targets/minecraft/world/level/tile/ChestTile.cpp @@ -1,16 +1,33 @@ #include "ChestTile.h" +#include +#include +#include + #include "minecraft/Facing.h" #include "minecraft/util/Mth.h" -#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "strings.h" +#include "minecraft/world/CompoundContainer.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/animal/Ocelot.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/world/phys/AABB.h" + +class Entity; ChestTile::ChestTile(int id, int type) : BaseEntityTile(id, Material::wood, false) { diff --git a/targets/minecraft/world/level/tile/ChestTile.h b/targets/minecraft/world/level/tile/ChestTile.h index 2902be325..832f65cd5 100644 --- a/targets/minecraft/world/level/tile/ChestTile.h +++ b/targets/minecraft/world/level/tile/ChestTile.h @@ -1,10 +1,13 @@ #pragma once +#include + #include "BaseEntityTile.h" #include "minecraft/world/level/material/Material.h" class Player; class Random; class Container; +class Level; class ChestTile : public BaseEntityTile { friend class Tile; diff --git a/targets/minecraft/world/level/tile/CocoaTile.cpp b/targets/minecraft/world/level/tile/CocoaTile.cpp index e776eb490..e42fbd2b2 100644 --- a/targets/minecraft/world/level/tile/CocoaTile.cpp +++ b/targets/minecraft/world/level/tile/CocoaTile.cpp @@ -14,9 +14,9 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/DirectionalTile.h" #include "minecraft/world/level/tile/TreeTile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/DirectionalTile.h" class Icon; diff --git a/targets/minecraft/world/level/tile/CocoaTile.h b/targets/minecraft/world/level/tile/CocoaTile.h index 856ff79f6..099fb4549 100644 --- a/targets/minecraft/world/level/tile/CocoaTile.h +++ b/targets/minecraft/world/level/tile/CocoaTile.h @@ -5,6 +5,7 @@ #include "DirectionalTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/targets/minecraft/world/level/tile/CommandBlock.cpp b/targets/minecraft/world/level/tile/CommandBlock.cpp index 3cd36a94a..84453b33c 100644 --- a/targets/minecraft/world/level/tile/CommandBlock.cpp +++ b/targets/minecraft/world/level/tile/CommandBlock.cpp @@ -8,10 +8,10 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/CommandBlockEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" CommandBlock::CommandBlock(int id) : BaseEntityTile(id, Material::metal, false) {} diff --git a/targets/minecraft/world/level/tile/ComparatorTile.cpp b/targets/minecraft/world/level/tile/ComparatorTile.cpp index 8a520eabe..46e244e1c 100644 --- a/targets/minecraft/world/level/tile/ComparatorTile.cpp +++ b/targets/minecraft/world/level/tile/ComparatorTile.cpp @@ -9,11 +9,11 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/DiodeTile.h" #include "minecraft/world/level/tile/HalfSlabTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/ComparatorTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/level/tile/DiodeTile.h" +#include "minecraft/world/level/tile/Tile.h" class Random; diff --git a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp index 52e2d2b33..ca5fcb0d8 100644 --- a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp +++ b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp @@ -1,7 +1,6 @@ #include "DaylightDetectorTile.h" #include - #include #include @@ -14,8 +13,8 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/entity/DaylightDetectorTileEntity.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" DaylightDetectorTile::DaylightDetectorTile(int id) : BaseEntityTile(id, Material::wood, false) { diff --git a/targets/minecraft/world/level/tile/DetectorRailTile.cpp b/targets/minecraft/world/level/tile/DetectorRailTile.cpp index 867a8efc5..66380fe80 100644 --- a/targets/minecraft/world/level/tile/DetectorRailTile.cpp +++ b/targets/minecraft/world/level/tile/DetectorRailTile.cpp @@ -15,9 +15,9 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/phys/AABB.h" #include "minecraft/world/level/tile/BaseRailTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/phys/AABB.h" class Icon; diff --git a/targets/minecraft/world/level/tile/DiodeTile.cpp b/targets/minecraft/world/level/tile/DiodeTile.cpp index a54173367..b09b9ed06 100644 --- a/targets/minecraft/world/level/tile/DiodeTile.cpp +++ b/targets/minecraft/world/level/tile/DiodeTile.cpp @@ -12,9 +12,9 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" #include "minecraft/world/level/tile/ComparatorTile.h" -#include "minecraft/world/level/tile/DirectionalTile.h" #include "minecraft/world/level/tile/HalfSlabTile.h" #include "minecraft/world/level/tile/RepeaterTile.h" +#include "minecraft/world/level/tile/DirectionalTile.h" #include "minecraft/world/level/tile/Tile.h" DiodeTile::DiodeTile(int id, bool on) diff --git a/targets/minecraft/world/level/tile/DispenserTile.cpp b/targets/minecraft/world/level/tile/DispenserTile.cpp index 5fdf064b3..d95b1b73b 100644 --- a/targets/minecraft/world/level/tile/DispenserTile.cpp +++ b/targets/minecraft/world/level/tile/DispenserTile.cpp @@ -19,12 +19,12 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/LevelEvent.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" #include "minecraft/world/level/tile/piston/PistonBaseTile.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" class Position; diff --git a/targets/minecraft/world/level/tile/DoorTile.cpp b/targets/minecraft/world/level/tile/DoorTile.cpp index a06bd5647..353c766e6 100644 --- a/targets/minecraft/world/level/tile/DoorTile.cpp +++ b/targets/minecraft/world/level/tile/DoorTile.cpp @@ -12,8 +12,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" const std::wstring DoorTile::TEXTURES[] = { L"doorWood_lower", L"doorWood_upper", L"doorIron_lower", L"doorIron_upper"}; diff --git a/targets/minecraft/world/level/tile/DropperTile.cpp b/targets/minecraft/world/level/tile/DropperTile.cpp index 2a11a1fb8..a6df6dc4d 100644 --- a/targets/minecraft/world/level/tile/DropperTile.cpp +++ b/targets/minecraft/world/level/tile/DropperTile.cpp @@ -10,11 +10,11 @@ #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/tile/DispenserTile.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" #include "minecraft/world/level/tile/entity/DropperTileEntity.h" #include "minecraft/world/level/tile/entity/HopperTileEntity.h" +#include "minecraft/world/level/tile/DispenserTile.h" class Container; diff --git a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp index 9586676a3..491a2e603 100644 --- a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -10,9 +10,9 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" #include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" const std::wstring EnchantmentTableTile::TEXTURE_SIDE = L"enchantment_side"; const std::wstring EnchantmentTableTile::TEXTURE_TOP = L"enchantment_top"; diff --git a/targets/minecraft/world/level/tile/EnderChestTile.cpp b/targets/minecraft/world/level/tile/EnderChestTile.cpp index 4796748a5..32e901141 100644 --- a/targets/minecraft/world/level/tile/EnderChestTile.cpp +++ b/targets/minecraft/world/level/tile/EnderChestTile.cpp @@ -13,9 +13,9 @@ #include "minecraft/world/inventory/PlayerEnderChestContainer.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/entity/EnderChestTileEntity.h" #include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/level/tile/entity/EnderChestTileEntity.h" EnderChestTile::EnderChestTile(int id) : BaseEntityTile(id, Material::stone, false) { diff --git a/targets/minecraft/world/level/tile/FarmTile.cpp b/targets/minecraft/world/level/tile/FarmTile.cpp index f7329cd0b..82cfcf607 100644 --- a/targets/minecraft/world/level/tile/FarmTile.cpp +++ b/targets/minecraft/world/level/tile/FarmTile.cpp @@ -13,8 +13,8 @@ #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" FarmTile::FarmTile(int id) : Tile(id, Material::dirt, false) { iconWet = nullptr; diff --git a/targets/minecraft/world/level/tile/FenceGateTile.cpp b/targets/minecraft/world/level/tile/FenceGateTile.cpp index 0d5fc072c..de1657c7f 100644 --- a/targets/minecraft/world/level/tile/FenceGateTile.cpp +++ b/targets/minecraft/world/level/tile/FenceGateTile.cpp @@ -10,9 +10,9 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/AABB.h" #include "minecraft/world/level/tile/DirectionalTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/phys/AABB.h" FenceGateTile::FenceGateTile(int id) : DirectionalTile(id, Material::wood, false) {} diff --git a/targets/minecraft/world/level/tile/FireTile.cpp b/targets/minecraft/world/level/tile/FireTile.cpp index ef7458db6..4d55080f9 100644 --- a/targets/minecraft/world/level/tile/FireTile.cpp +++ b/targets/minecraft/world/level/tile/FireTile.cpp @@ -1,7 +1,6 @@ #include "FireTile.h" #include - #include #include "Minecraft.Client/Common/App_enums.h" @@ -18,9 +17,9 @@ #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/PortalTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TntTile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/targets/minecraft/world/level/tile/FlowerPotTile.cpp b/targets/minecraft/world/level/tile/FlowerPotTile.cpp index f741f73d1..634c06429 100644 --- a/targets/minecraft/world/level/tile/FlowerPotTile.cpp +++ b/targets/minecraft/world/level/tile/FlowerPotTile.cpp @@ -10,6 +10,7 @@ #include "minecraft/world/level/tile/PlantTile.h" #include "minecraft/world/level/tile/SaplingPlantTile.h" #include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" FlowerPotTile::FlowerPotTile(int id) : Tile(id, Material::decoration, false) { diff --git a/targets/minecraft/world/level/tile/FurnaceTile.cpp b/targets/minecraft/world/level/tile/FurnaceTile.cpp index e27218efe..ab0fa6a99 100644 --- a/targets/minecraft/world/level/tile/FurnaceTile.cpp +++ b/targets/minecraft/world/level/tile/FurnaceTile.cpp @@ -1,11 +1,9 @@ #include "FurnaceTile.h" #include - #include #include -#include "FurnaceTile.h" #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/core/particles/ParticleTypes.h" @@ -19,11 +17,11 @@ #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" bool FurnaceTile::noDrop = false; diff --git a/targets/minecraft/world/level/tile/HopperTile.cpp b/targets/minecraft/world/level/tile/HopperTile.cpp index 136a22e23..45c97efe3 100644 --- a/targets/minecraft/world/level/tile/HopperTile.cpp +++ b/targets/minecraft/world/level/tile/HopperTile.cpp @@ -10,10 +10,10 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/HopperTileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/targets/minecraft/world/level/tile/JukeboxTile.cpp b/targets/minecraft/world/level/tile/JukeboxTile.cpp index a0f7b99a2..7431a8733 100644 --- a/targets/minecraft/world/level/tile/JukeboxTile.cpp +++ b/targets/minecraft/world/level/tile/JukeboxTile.cpp @@ -11,10 +11,11 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" JukeboxTile::Entity::Entity() : TileEntity() { record = nullptr; } diff --git a/targets/minecraft/world/level/tile/LadderTile.cpp b/targets/minecraft/world/level/tile/LadderTile.cpp index 0e06770ff..05bc0638f 100644 --- a/targets/minecraft/world/level/tile/LadderTile.cpp +++ b/targets/minecraft/world/level/tile/LadderTile.cpp @@ -5,8 +5,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" LadderTile::LadderTile(int id) : Tile(id, Material::decoration, false) {} diff --git a/targets/minecraft/world/level/tile/LeafTile.cpp b/targets/minecraft/world/level/tile/LeafTile.cpp index 65565df09..1bc39ab6c 100644 --- a/targets/minecraft/world/level/tile/LeafTile.cpp +++ b/targets/minecraft/world/level/tile/LeafTile.cpp @@ -1,13 +1,26 @@ #include "LeafTile.h" +#include + #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" #include "strings.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Random.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ShearsItem.h" +#include "minecraft/world/level/FoliageColor.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TransparentTile.h" const unsigned int LeafTile::LEAF_NAMES[LEAF_NAMES_LENGTH] = { IDS_TILE_LEAVES_OAK, diff --git a/targets/minecraft/world/level/tile/LeafTile.h b/targets/minecraft/world/level/tile/LeafTile.h index 8ce8accbd..d6f9908cd 100644 --- a/targets/minecraft/world/level/tile/LeafTile.h +++ b/targets/minecraft/world/level/tile/LeafTile.h @@ -1,8 +1,12 @@ #pragma once +#include + #include "TransparentTile.h" class Random; class ChunkRebuildData; +class Icon; +class Level; class LeafTile : public TransparentTile { friend class Tile; diff --git a/targets/minecraft/world/level/tile/LeverTile.cpp b/targets/minecraft/world/level/tile/LeverTile.cpp index bd79e322b..cfde5acd3 100644 --- a/targets/minecraft/world/level/tile/LeverTile.cpp +++ b/targets/minecraft/world/level/tile/LeverTile.cpp @@ -10,8 +10,8 @@ #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" LeverTile::LeverTile(int id) : Tile(id, Material::decoration, false) {} diff --git a/targets/minecraft/world/level/tile/LiquidTile.cpp b/targets/minecraft/world/level/tile/LiquidTile.cpp index 76c50a4f3..bd5e22b34 100644 --- a/targets/minecraft/world/level/tile/LiquidTile.cpp +++ b/targets/minecraft/world/level/tile/LiquidTile.cpp @@ -1,7 +1,6 @@ #include "LiquidTile.h" #include - #include #include #include @@ -17,8 +16,9 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/Vec3.h" class Icon; diff --git a/targets/minecraft/world/level/tile/MobSpawnerTile.cpp b/targets/minecraft/world/level/tile/MobSpawnerTile.cpp index 5db7e5482..841f3d492 100644 --- a/targets/minecraft/world/level/tile/MobSpawnerTile.cpp +++ b/targets/minecraft/world/level/tile/MobSpawnerTile.cpp @@ -5,9 +5,9 @@ #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" #include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h" MobSpawnerTile::MobSpawnerTile(int id) : BaseEntityTile(id, Material::stone, false) {} diff --git a/targets/minecraft/world/level/tile/NotGateTile.h b/targets/minecraft/world/level/tile/NotGateTile.h index 0d7da17e3..05bc54d0f 100644 --- a/targets/minecraft/world/level/tile/NotGateTile.h +++ b/targets/minecraft/world/level/tile/NotGateTile.h @@ -1,6 +1,5 @@ #pragma once #include - #include #include diff --git a/targets/minecraft/world/level/tile/NoteBlockTile.cpp b/targets/minecraft/world/level/tile/NoteBlockTile.cpp index 28080a059..24b520e60 100644 --- a/targets/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/targets/minecraft/world/level/tile/NoteBlockTile.cpp @@ -8,8 +8,8 @@ #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/entity/MusicTileEntity.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" NoteBlockTile::NoteBlockTile(int id) : BaseEntityTile(id, Material::wood) {} diff --git a/targets/minecraft/world/level/tile/PlantTile.cpp b/targets/minecraft/world/level/tile/PlantTile.cpp index dbe43684e..0c92b03b1 100644 --- a/targets/minecraft/world/level/tile/PlantTile.cpp +++ b/targets/minecraft/world/level/tile/PlantTile.cpp @@ -4,8 +4,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" void Bush::_init() { setTicking(true); diff --git a/targets/minecraft/world/level/tile/PortalTile.cpp b/targets/minecraft/world/level/tile/PortalTile.cpp index 444eeca43..8983dcd1f 100644 --- a/targets/minecraft/world/level/tile/PortalTile.cpp +++ b/targets/minecraft/world/level/tile/PortalTile.cpp @@ -13,9 +13,9 @@ #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/AABB.h" #include "minecraft/world/level/tile/HalfTransparentTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/phys/AABB.h" PortalTile::PortalTile(int id) : HalfTransparentTile(id, L"portal", Material::portal, false) { diff --git a/targets/minecraft/world/level/tile/PressurePlateTile.cpp b/targets/minecraft/world/level/tile/PressurePlateTile.cpp index aed019d14..6a2a6de2e 100644 --- a/targets/minecraft/world/level/tile/PressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/PressurePlateTile.cpp @@ -10,8 +10,8 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/BasePressurePlateTile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/BasePressurePlateTile.h" class Material; diff --git a/targets/minecraft/world/level/tile/QuartzBlockTile.cpp b/targets/minecraft/world/level/tile/QuartzBlockTile.cpp index 633cdcccf..9033657a5 100644 --- a/targets/minecraft/world/level/tile/QuartzBlockTile.cpp +++ b/targets/minecraft/world/level/tile/QuartzBlockTile.cpp @@ -1,12 +1,13 @@ #include "QuartzBlockTile.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/world/net.minecraft.world.h" +#include -// 4J Added -#include "minecraft/world/entity/player/Player.h" -#include "minecraft/world/level/Level.h" -#include "minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "Facing.h" +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" int QuartzBlockTile::BLOCK_NAMES[QUARTZ_BLOCK_NAMES] = { IDS_TILE_QUARTZ_BLOCK, IDS_TILE_QUARTZ_BLOCK_CHISELED, diff --git a/targets/minecraft/world/level/tile/QuartzBlockTile.h b/targets/minecraft/world/level/tile/QuartzBlockTile.h index 2d4dffaea..90f989aa0 100644 --- a/targets/minecraft/world/level/tile/QuartzBlockTile.h +++ b/targets/minecraft/world/level/tile/QuartzBlockTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "Tile.h" +class Icon; + class QuartzBlockTile : public Tile { friend class ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp index 4f70918e1..5d8ee801e 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -1,7 +1,6 @@ #include "RedStoneDustTile.h" #include - #include #include @@ -20,8 +19,9 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" #include "minecraft/world/level/tile/RepeaterTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/TilePos.h" +#include "minecraft/world/level/tile/Tile.h" class Icon; diff --git a/targets/minecraft/world/level/tile/ReedTile.cpp b/targets/minecraft/world/level/tile/ReedTile.cpp index 4cc317f3f..0ee607441 100644 --- a/targets/minecraft/world/level/tile/ReedTile.cpp +++ b/targets/minecraft/world/level/tile/ReedTile.cpp @@ -5,8 +5,8 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" ReedTile::ReedTile(int id) : Tile(id, Material::plant, false) { this->updateDefaultShape(); diff --git a/targets/minecraft/world/level/tile/SandStoneTile.cpp b/targets/minecraft/world/level/tile/SandStoneTile.cpp index eb84222ed..d6802460a 100644 --- a/targets/minecraft/world/level/tile/SandStoneTile.cpp +++ b/targets/minecraft/world/level/tile/SandStoneTile.cpp @@ -1,9 +1,12 @@ #include "SandStoneTile.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/world/level/material/net.minecraft.world.level.material.h" -#include "minecraft/world/net.minecraft.world.h" #include "strings.h" +#include "Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +class Icon; const std::wstring SandStoneTile::TEXTURE_TOP = L"sandstone_top"; const std::wstring SandStoneTile::TEXTURE_BOTTOM = L"sandstone_bottom"; diff --git a/targets/minecraft/world/level/tile/SandStoneTile.h b/targets/minecraft/world/level/tile/SandStoneTile.h index 6fff21264..87b260c0f 100644 --- a/targets/minecraft/world/level/tile/SandStoneTile.h +++ b/targets/minecraft/world/level/tile/SandStoneTile.h @@ -1,8 +1,11 @@ #pragma once +#include + #include "Tile.h" class ChunkRebuildData; +class Icon; class SandStoneTile : public Tile { friend class ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp index 028b229fc..859dc8c07 100644 --- a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp +++ b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp @@ -1,10 +1,21 @@ #include "SaplingPlantTile.h" -#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" -#include "net.minecraft.world.level.tile.h" #include "strings.h" +#include "java/Random.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/BirchFeature.h" +#include "minecraft/world/level/levelgen/feature/Feature.h" +#include "minecraft/world/level/levelgen/feature/MegaTreeFeature.h" +#include "minecraft/world/level/levelgen/feature/SpruceFeature.h" +#include "minecraft/world/level/levelgen/feature/TreeFeature.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/TreeTile.h" + +class Icon; int Sapling::SAPLING_NAMES[SAPLING_NAMES_SIZE] = { IDS_TILE_SAPLING_OAK, IDS_TILE_SAPLING_SPRUCE, IDS_TILE_SAPLING_BIRCH, diff --git a/targets/minecraft/world/level/tile/SaplingPlantTile.h b/targets/minecraft/world/level/tile/SaplingPlantTile.h index d71ec0d99..939e0f985 100644 --- a/targets/minecraft/world/level/tile/SaplingPlantTile.h +++ b/targets/minecraft/world/level/tile/SaplingPlantTile.h @@ -1,10 +1,14 @@ #pragma once +#include + #include "LeafTile.h" #include "PlantTile.h" class Random; class ChunkRebuildData; +class Icon; +class Level; class Sapling : public Bush { friend class Tile; diff --git a/targets/minecraft/world/level/tile/SignTile.cpp b/targets/minecraft/world/level/tile/SignTile.cpp index 90c81a4a4..115ab77fd 100644 --- a/targets/minecraft/world/level/tile/SignTile.cpp +++ b/targets/minecraft/world/level/tile/SignTile.cpp @@ -6,10 +6,10 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/BaseEntityTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" SignTile::SignTile(int id, eINSTANCEOF clas, bool onGround) : BaseEntityTile(id, Material::wood, false) { diff --git a/targets/minecraft/world/level/tile/SkullTile.cpp b/targets/minecraft/world/level/tile/SkullTile.cpp index 80f6da459..73e6b6bdf 100644 --- a/targets/minecraft/world/level/tile/SkullTile.cpp +++ b/targets/minecraft/world/level/tile/SkullTile.cpp @@ -1,14 +1,30 @@ #include "SkullTile.h" -#include "console_helpers/StringHelpers.h" -#include "minecraft/net.minecraft.h" +#include + #include "minecraft/util/Mth.h" #include "minecraft/world/entity/boss/wither/WitherBoss.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/net.minecraft.world.h" +#include "Facing.h" +#include "minecraft/core/particles/ParticleTypes.h" +#include "java/Class.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "minecraft/world/Difficulty.h" +#include "minecraft/world/entity/LivingEntity.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Abilities.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/SkullItem.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/BaseEntityTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/SkullTileEntity.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" SkullTile::SkullTile(int id) : BaseEntityTile(id, Material::decoration, false) { setShape(4.0f / 16.0f, 0, 4.0f / 16.0f, 12.0f / 16.0f, .5f, 12.0f / 16.0f); diff --git a/targets/minecraft/world/level/tile/SkullTile.h b/targets/minecraft/world/level/tile/SkullTile.h index f8fea1299..f7fdba1c0 100644 --- a/targets/minecraft/world/level/tile/SkullTile.h +++ b/targets/minecraft/world/level/tile/SkullTile.h @@ -1,8 +1,13 @@ #pragma once +#include +#include + #include "BaseEntityTile.h" class SkullTileEntity; +class Level; +class LivingEntity; class SkullTile : public BaseEntityTile { friend class Tile; diff --git a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp index 1410d61f2..ece316eb9 100644 --- a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp +++ b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp @@ -1,7 +1,11 @@ #include "SmoothStoneBrickTile.h" -#include "minecraft/world/net.minecraft.world.h" #include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +class Icon; const std::wstring SmoothStoneBrickTile::TEXTURE_NAMES[] = { L"", L"mossy", L"cracked", L"carved"}; diff --git a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h index 17b2453f8..f37f1996f 100644 --- a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h +++ b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "Tile.h" class ChunkRebuildData; +class Icon; + class SmoothStoneBrickTile : public Tile { friend class ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/SoulSandTile.cpp b/targets/minecraft/world/level/tile/SoulSandTile.cpp index 46bebd72c..f8e1abc7c 100644 --- a/targets/minecraft/world/level/tile/SoulSandTile.cpp +++ b/targets/minecraft/world/level/tile/SoulSandTile.cpp @@ -5,8 +5,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" SoulSandTile::SoulSandTile(int id) : Tile(id, Material::sand) {} diff --git a/targets/minecraft/world/level/tile/StairTile.cpp b/targets/minecraft/world/level/tile/StairTile.cpp index ab1426a0d..08bf5b381 100644 --- a/targets/minecraft/world/level/tile/StairTile.cpp +++ b/targets/minecraft/world/level/tile/StairTile.cpp @@ -5,10 +5,10 @@ #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/level/tile/Tile.h" int StairTile::DEAD_SPACES[8][2] = {{2, 6}, {3, 7}, {2, 3}, {6, 7}, {0, 4}, {1, 5}, {0, 1}, {4, 5}}; diff --git a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp index 1a2a5cfca..a9312ea92 100644 --- a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -1,9 +1,16 @@ #include "StoneMonsterTile.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "net.minecraft.world.level.tile.h" +#include + +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "strings.h" +#include "minecraft/world/entity/monster/Silverfish.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/FireTile.h" +#include "minecraft/world/level/tile/Tile.h" const unsigned int StoneMonsterTile::STONE_MONSTER_NAMES[STONE_MONSTER_NAMES_LENGTH] = { diff --git a/targets/minecraft/world/level/tile/StoneSlabTile.cpp b/targets/minecraft/world/level/tile/StoneSlabTile.cpp index aa9c6c879..00a4bf142 100644 --- a/targets/minecraft/world/level/tile/StoneSlabTile.cpp +++ b/targets/minecraft/world/level/tile/StoneSlabTile.cpp @@ -1,10 +1,16 @@ #include "StoneSlabTile.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" -#include "net.minecraft.world.level.tile.h" +#include +#include + #include "strings.h" +#include "Facing.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/SmoothStoneBrickTile.h" +#include "minecraft/world/level/tile/Tile.h" const unsigned int StoneSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = { IDS_TILE_STONESLAB_STONE, IDS_TILE_STONESLAB_SAND, diff --git a/targets/minecraft/world/level/tile/StoneSlabTile.h b/targets/minecraft/world/level/tile/StoneSlabTile.h index 80aec61a8..eac95c35c 100644 --- a/targets/minecraft/world/level/tile/StoneSlabTile.h +++ b/targets/minecraft/world/level/tile/StoneSlabTile.h @@ -3,6 +3,7 @@ #include "HalfSlabTile.h" class ChunkRebuildData; +class Icon; class StoneSlabTile : public HalfSlabTile { friend ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp index cebf347f9..202de42ae 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -1,12 +1,27 @@ #include "TallGrassPlantTile.h" +#include + #include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" +#include "Minecraft.Client/Common/App_enums.h" +#include "java/Random.h" +#include "minecraft/stats/GenericStats.h" +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/ShearsItem.h" +#include "minecraft/world/level/FoliageColor.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/biome/Biome.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/Tile.h" + +class Icon; const unsigned int TallGrass::TALL_GRASS_TILE_NAMES[TALL_GRASS_TILE_NAMES_LENGTH] = { diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.h b/targets/minecraft/world/level/tile/TallGrassPlantTile.h index 66988a862..f785d5869 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.h +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "PlantTile.h" + class ChunkRebuildData; +class Icon; class TallGrass : public Bush { friend class Tile; diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index 05d5b5c03..6399c9cad 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -1,25 +1,156 @@ #include "Tile.h" +#include #include #include "console_helpers/StringHelpers.h" -#include "minecraft/locale/net.minecraft.locale.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/food/net.minecraft.world.food.h" -#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/material/net.minecraft.world.level.material.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h" -#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" -#include "minecraft/world/net.minecraft.world.h" #include "minecraft/world/phys/Vec3.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.level.tile.h" +#include "Facing.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Class.h" +#include "java/Random.h" +#include "minecraft/sounds/SoundTypes.h" +#include "minecraft/stats/GenericStats.h" +#include "minecraft/stats/Stats.h" +#include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/entity/ExperienceOrb.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/food/FoodConstants.h" +#include "minecraft/world/item/AnvilTileItem.h" +#include "minecraft/world/item/ColoredTileItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/LeafTileItem.h" +#include "minecraft/world/item/MultiTextureTileItem.h" +#include "minecraft/world/item/PistonTileItem.h" +#include "minecraft/world/item/SnowItem.h" +#include "minecraft/world/item/StoneSlabTileItem.h" +#include "minecraft/world/item/TileItem.h" +#include "minecraft/world/item/WaterLilyTileItem.h" +#include "minecraft/world/item/WoolTileItem.h" +#include "minecraft/world/item/enchantment/EnchantmentHelper.h" +#include "minecraft/world/level/GameRules.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/redstone/Redstone.h" +#include "minecraft/world/level/tile/AnvilTile.h" +#include "minecraft/world/level/tile/BeaconTile.h" +#include "minecraft/world/level/tile/BedTile.h" +#include "minecraft/world/level/tile/BookshelfTile.h" +#include "minecraft/world/level/tile/BrewingStandTile.h" +#include "minecraft/world/level/tile/CactusTile.h" +#include "minecraft/world/level/tile/CakeTile.h" +#include "minecraft/world/level/tile/CarrotTile.h" +#include "minecraft/world/level/tile/CauldronTile.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/ClayTile.h" +#include "minecraft/world/level/tile/CocoaTile.h" +#include "minecraft/world/level/tile/ColoredTile.h" +#include "minecraft/world/level/tile/CommandBlock.h" +#include "minecraft/world/level/tile/ComparatorTile.h" +#include "minecraft/world/level/tile/CropTile.h" +#include "minecraft/world/level/tile/DaylightDetectorTile.h" +#include "minecraft/world/level/tile/DeadBushTile.h" +#include "minecraft/world/level/tile/DetectorRailTile.h" +#include "minecraft/world/level/tile/DirtTile.h" +#include "minecraft/world/level/tile/DispenserTile.h" +#include "minecraft/world/level/tile/DoorTile.h" +#include "minecraft/world/level/tile/DropperTile.h" +#include "minecraft/world/level/tile/EggTile.h" +#include "minecraft/world/level/tile/EnchantmentTableTile.h" +#include "minecraft/world/level/tile/EnderChestTile.h" +#include "minecraft/world/level/tile/FarmTile.h" +#include "minecraft/world/level/tile/FenceGateTile.h" +#include "minecraft/world/level/tile/FenceTile.h" +#include "minecraft/world/level/tile/FireTile.h" +#include "minecraft/world/level/tile/FlowerPotTile.h" +#include "minecraft/world/level/tile/FurnaceTile.h" +#include "minecraft/world/level/tile/GlassTile.h" +#include "minecraft/world/level/tile/GlowstoneTile.h" +#include "minecraft/world/level/tile/GrassTile.h" +#include "minecraft/world/level/tile/GravelTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/HayBlockTile.h" +#include "minecraft/world/level/tile/HeavyTile.h" +#include "minecraft/world/level/tile/HopperTile.h" +#include "minecraft/world/level/tile/HugeMushroomTile.h" +#include "minecraft/world/level/tile/IceTile.h" +#include "minecraft/world/level/tile/JukeboxTile.h" +#include "minecraft/world/level/tile/LadderTile.h" +#include "minecraft/world/level/tile/LeafTile.h" +#include "minecraft/world/level/tile/LeverTile.h" +#include "minecraft/world/level/tile/LiquidTile.h" +#include "minecraft/world/level/tile/LiquidTileDynamic.h" +#include "minecraft/world/level/tile/LiquidTileStatic.h" +#include "minecraft/world/level/tile/MelonTile.h" +#include "minecraft/world/level/tile/MetalTile.h" +#include "minecraft/world/level/tile/MobSpawnerTile.h" +#include "minecraft/world/level/tile/MushroomPlantTile.h" +#include "minecraft/world/level/tile/MycelTile.h" +#include "minecraft/world/level/tile/NetherWartTile.h" +#include "minecraft/world/level/tile/NetherrackTile.h" +#include "minecraft/world/level/tile/NotGateTile.h" +#include "minecraft/world/level/tile/NoteBlockTile.h" +#include "minecraft/world/level/tile/ObsidianTile.h" +#include "minecraft/world/level/tile/OreTile.h" +#include "minecraft/world/level/tile/PlantTile.h" +#include "minecraft/world/level/tile/PortalTile.h" +#include "minecraft/world/level/tile/PotatoTile.h" +#include "minecraft/world/level/tile/PoweredMetalTile.h" +#include "minecraft/world/level/tile/PoweredRailTile.h" +#include "minecraft/world/level/tile/PressurePlateTile.h" +#include "minecraft/world/level/tile/PumpkinTile.h" +#include "minecraft/world/level/tile/QuartzBlockTile.h" +#include "minecraft/world/level/tile/RailTile.h" +#include "minecraft/world/level/tile/RedStoneDustTile.h" +#include "minecraft/world/level/tile/RedStoneOreTile.h" +#include "minecraft/world/level/tile/RedlightTile.h" +#include "minecraft/world/level/tile/ReedTile.h" +#include "minecraft/world/level/tile/RepeaterTile.h" +#include "minecraft/world/level/tile/SandStoneTile.h" +#include "minecraft/world/level/tile/SaplingPlantTile.h" +#include "minecraft/world/level/tile/SignTile.h" +#include "minecraft/world/level/tile/SkullTile.h" +#include "minecraft/world/level/tile/SmoothStoneBrickTile.h" +#include "minecraft/world/level/tile/SnowTile.h" +#include "minecraft/world/level/tile/SoulSandTile.h" +#include "minecraft/world/level/tile/SpongeTile.h" +#include "minecraft/world/level/tile/StainedGlassBlock.h" +#include "minecraft/world/level/tile/StainedGlassPaneBlock.h" +#include "minecraft/world/level/tile/StairTile.h" +#include "minecraft/world/level/tile/StemTile.h" +#include "minecraft/world/level/tile/StoneButtonTile.h" +#include "minecraft/world/level/tile/StoneMonsterTile.h" +#include "minecraft/world/level/tile/StoneSlabTile.h" +#include "minecraft/world/level/tile/StoneTile.h" +#include "minecraft/world/level/tile/TallGrassPlantTile.h" +#include "minecraft/world/level/tile/TheEndPortalFrameTile.h" +#include "minecraft/world/level/tile/ThinFenceTile.h" +#include "minecraft/world/level/tile/TntTile.h" +#include "minecraft/world/level/tile/TopSnowTile.h" +#include "minecraft/world/level/tile/TorchTile.h" +#include "minecraft/world/level/tile/TrapDoorTile.h" +#include "minecraft/world/level/tile/TreeTile.h" +#include "minecraft/world/level/tile/TripWireSourceTile.h" +#include "minecraft/world/level/tile/TripWireTile.h" +#include "minecraft/world/level/tile/VineTile.h" +#include "minecraft/world/level/tile/WallTile.h" +#include "minecraft/world/level/tile/WaterLilyTile.h" +#include "minecraft/world/level/tile/WebTile.h" +#include "minecraft/world/level/tile/WeightedPressurePlateTile.h" +#include "minecraft/world/level/tile/WoodButtonTile.h" +#include "minecraft/world/level/tile/WoodSlabTile.h" +#include "minecraft/world/level/tile/WoodTile.h" +#include "minecraft/world/level/tile/WoolCarpetTile.h" +#include "minecraft/world/level/tile/WorkbenchTile.h" +#include "minecraft/world/level/tile/entity/PistonMovingTileEntity.h" +#include "minecraft/world/level/tile/entity/TheEndPortalTile.h" +#include "minecraft/world/level/tile/piston/PistonBaseTile.h" +#include "minecraft/world/level/tile/piston/PistonExtensionTile.h" +#include "minecraft/world/phys/HitResult.h" std::wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile."; diff --git a/targets/minecraft/world/level/tile/Tile.h b/targets/minecraft/world/level/tile/Tile.h index 6337f7794..a4fd6bc90 100644 --- a/targets/minecraft/world/level/tile/Tile.h +++ b/targets/minecraft/world/level/tile/Tile.h @@ -3,11 +3,13 @@ #include #include #include +#include #include "console_helpers/Definitions.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/phys/Vec3.h" +#include "minecraft/world/phys/AABB.h" class GrassTile; class LeafTile; @@ -48,6 +50,8 @@ class ChunkRebuildData; class Entity; class ItemInstance; class LivingEntity; +class Material; +class Vec3; class Tile { // 4J Stu - Stair tile accesses the protected members of a Tile object diff --git a/targets/minecraft/world/level/tile/TopSnowTile.cpp b/targets/minecraft/world/level/tile/TopSnowTile.cpp index 2a78dbb92..d23b4e6f1 100644 --- a/targets/minecraft/world/level/tile/TopSnowTile.cpp +++ b/targets/minecraft/world/level/tile/TopSnowTile.cpp @@ -11,8 +11,8 @@ #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/LightLayer.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" const int TopSnowTile::MAX_HEIGHT = 6; const int TopSnowTile::HEIGHT_MASK = 7; // max 8 steps diff --git a/targets/minecraft/world/level/tile/TorchTile.cpp b/targets/minecraft/world/level/tile/TorchTile.cpp index c42dee107..c996246e1 100644 --- a/targets/minecraft/world/level/tile/TorchTile.cpp +++ b/targets/minecraft/world/level/tile/TorchTile.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" TorchTile::TorchTile(int id) : Tile(id, Material::decoration, false) { this->setTicking(true); diff --git a/targets/minecraft/world/level/tile/TrapDoorTile.cpp b/targets/minecraft/world/level/tile/TrapDoorTile.cpp index 214137e61..230a9e043 100644 --- a/targets/minecraft/world/level/tile/TrapDoorTile.cpp +++ b/targets/minecraft/world/level/tile/TrapDoorTile.cpp @@ -9,8 +9,8 @@ #include "minecraft/world/level/tile/HalfSlabTile.h" #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/StairTile.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" TrapDoorTile::TrapDoorTile(int id, Material* material) : Tile(id, material, false) { diff --git a/targets/minecraft/world/level/tile/TreeTile.cpp b/targets/minecraft/world/level/tile/TreeTile.cpp index 8da5dff05..aab14bc72 100644 --- a/targets/minecraft/world/level/tile/TreeTile.cpp +++ b/targets/minecraft/world/level/tile/TreeTile.cpp @@ -1,11 +1,15 @@ #include "TreeTile.h" +#include + #include "LeafTile.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h" -#include "minecraft/world/net.minecraft.world.h" #include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/RotatedPillarTile.h" +#include "minecraft/world/level/tile/Tile.h" const unsigned int TreeTile::TREE_NAMES[TreeTile::TREE_NAMES_LENGTH] = { IDS_TILE_LOG_OAK, IDS_TILE_LOG_SPRUCE, IDS_TILE_LOG_BIRCH, diff --git a/targets/minecraft/world/level/tile/TreeTile.h b/targets/minecraft/world/level/tile/TreeTile.h index 455a3adc3..d09a160a0 100644 --- a/targets/minecraft/world/level/tile/TreeTile.h +++ b/targets/minecraft/world/level/tile/TreeTile.h @@ -1,9 +1,12 @@ #pragma once +#include + #include "RotatedPillarTile.h" class ChunkRebuildData; class Player; +class Icon; class TreeTile : public RotatedPillarTile { friend class Tile; diff --git a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp index fc910c128..b4a3cfa94 100644 --- a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp +++ b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp @@ -8,10 +8,10 @@ #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TripWireTile.h" #include "minecraft/world/phys/AABB.h" #include "optional" +#include "minecraft/world/level/tile/Tile.h" TripWireSourceTile::TripWireSourceTile(int id) : Tile(id, Material::decoration, false) { diff --git a/targets/minecraft/world/level/tile/TripWireTile.cpp b/targets/minecraft/world/level/tile/TripWireTile.cpp index 3183c9607..a51398829 100644 --- a/targets/minecraft/world/level/tile/TripWireTile.cpp +++ b/targets/minecraft/world/level/tile/TripWireTile.cpp @@ -12,9 +12,9 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/TripWireSourceTile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" TripWireTile::TripWireTile(int id) : Tile(id, Material::decoration, false) { setShape(0, 0, 0, 1, 2.5f / 16.0f, 1); diff --git a/targets/minecraft/world/level/tile/VineTile.cpp b/targets/minecraft/world/level/tile/VineTile.cpp index ea6c49df7..657347c52 100644 --- a/targets/minecraft/world/level/tile/VineTile.cpp +++ b/targets/minecraft/world/level/tile/VineTile.cpp @@ -16,8 +16,8 @@ #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" VineTile::VineTile(int id) : Tile(id, Material::replaceable_plant, false) { setTicking(true); diff --git a/targets/minecraft/world/level/tile/WallTile.cpp b/targets/minecraft/world/level/tile/WallTile.cpp index d38468613..cfb0c0549 100644 --- a/targets/minecraft/world/level/tile/WallTile.cpp +++ b/targets/minecraft/world/level/tile/WallTile.cpp @@ -1,11 +1,14 @@ #include "WallTile.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.level.tile.h" +#include + #include "strings.h" +#include "Facing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/LevelSource.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" const float WallTile::WALL_WIDTH = 3.0f / 16.0f; const float WallTile::WALL_HEIGHT = 13.0f / 16.0f; diff --git a/targets/minecraft/world/level/tile/WallTile.h b/targets/minecraft/world/level/tile/WallTile.h index 7f5a963c6..93a3449bd 100644 --- a/targets/minecraft/world/level/tile/WallTile.h +++ b/targets/minecraft/world/level/tile/WallTile.h @@ -1,7 +1,11 @@ #pragma once +#include + #include "Tile.h" +class LevelSource; + class WallTile : public Tile { public: static const float WALL_WIDTH; diff --git a/targets/minecraft/world/level/tile/WaterLilyTile.cpp b/targets/minecraft/world/level/tile/WaterLilyTile.cpp index c39d8a64a..3750fcdb1 100644 --- a/targets/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/targets/minecraft/world/level/tile/WaterLilyTile.cpp @@ -10,9 +10,9 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/world/phys/AABB.h" #include "minecraft/world/level/tile/PlantTile.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/phys/AABB.h" class Random; diff --git a/targets/minecraft/world/level/tile/WebTile.cpp b/targets/minecraft/world/level/tile/WebTile.cpp index 98692d4d0..df129e0a5 100644 --- a/targets/minecraft/world/level/tile/WebTile.cpp +++ b/targets/minecraft/world/level/tile/WebTile.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" WebTile::WebTile(int id) : Tile(id, Material::web) {} diff --git a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp index 76f90bb1b..537c2b0d8 100644 --- a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp @@ -8,8 +8,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/redstone/Redstone.h" -#include "minecraft/world/level/tile/BasePressurePlateTile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/BasePressurePlateTile.h" class Material; diff --git a/targets/minecraft/world/level/tile/WoodSlabTile.cpp b/targets/minecraft/world/level/tile/WoodSlabTile.cpp index feef37290..e061198fe 100644 --- a/targets/minecraft/world/level/tile/WoodSlabTile.cpp +++ b/targets/minecraft/world/level/tile/WoodSlabTile.cpp @@ -1,12 +1,12 @@ #include "WoodSlabTile.h" -#include "TreeTile.h" -#include "WoodTile.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "minecraft/world/level/net.minecraft.world.level.h" +#include + #include "strings.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" const unsigned int WoodSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = { IDS_TILE_STONESLAB_OAK, diff --git a/targets/minecraft/world/level/tile/WoodTile.cpp b/targets/minecraft/world/level/tile/WoodTile.cpp index 2ff1ef565..2ce3765d2 100644 --- a/targets/minecraft/world/level/tile/WoodTile.cpp +++ b/targets/minecraft/world/level/tile/WoodTile.cpp @@ -1,12 +1,11 @@ #include "WoodTile.h" -#include "TreeTile.h" -#include "minecraft/stats/net.minecraft.stats.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/net.minecraft.world.h" #include "strings.h" +#include "minecraft/world/IconRegister.h" +#include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/tile/Tile.h" + +class Icon; const unsigned int WoodTile::WOOD_NAMES[WOOD_NAMES_LENGTH] = { IDS_TILE_OAKWOOD_PLANKS, diff --git a/targets/minecraft/world/level/tile/WoodTile.h b/targets/minecraft/world/level/tile/WoodTile.h index 5f133b4c8..844ba12f9 100644 --- a/targets/minecraft/world/level/tile/WoodTile.h +++ b/targets/minecraft/world/level/tile/WoodTile.h @@ -1,7 +1,10 @@ #pragma once +#include + #include "Tile.h" class ChunkRebuildData; +class Icon; class WoodTile : public Tile { friend class ChunkRebuildData; diff --git a/targets/minecraft/world/level/tile/WoolCarpetTile.cpp b/targets/minecraft/world/level/tile/WoolCarpetTile.cpp index 5cda7be4e..c28bef50d 100644 --- a/targets/minecraft/world/level/tile/WoolCarpetTile.cpp +++ b/targets/minecraft/world/level/tile/WoolCarpetTile.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" +#include "minecraft/world/level/tile/Tile.h" WoolCarpetTile::WoolCarpetTile(int id) : Tile(id, Material::clothDecoration, false) { diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 5307b5b42..a60b688f8 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -1,13 +1,24 @@ #include "BeaconTileEntity.h" -#include "minecraft/network/packet/net.minecraft.network.packet.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/effect/net.minecraft.world.effect.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" +#include +#include + +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SharedConstants.h" +#include "nbt/CompoundTag.h" +#include "minecraft/network/packet/TileEntityDataPacket.h" +#include "strings.h" +#include "minecraft/world/effect/MobEffect.h" +#include "minecraft/world/effect/MobEffectInstance.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" + +class Entity; std::shared_ptr BeaconTileEntity::clone() { std::shared_ptr result = diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h index 076361f5b..c90579505 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h @@ -1,10 +1,16 @@ #pragma once +#include +#include +#include + #include "TileEntity.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/Container.h" +#include "java/Class.h" class MobEffect; +class ItemInstance; class BeaconTileEntity : public TileEntity, public Container { public: diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index 1d23c32a9..2ca806145 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -1,13 +1,26 @@ #include "BrewingStandTileEntity.h" +#include +#include +#include + #include "minecraft/SharedConstants.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/stdafx.h" #include "minecraft/world/item/alchemy/PotionMacros.h" -#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "nbt/com.mojang.nbt.h" +#include "Facing.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/PotionItem.h" +#include "minecraft/world/item/alchemy/PotionBrewing.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" + +class MobEffectInstance; int slotsForUp[] = {BrewingStandTileEntity::INGREDIENT_SLOT}; int slotsForOtherFaces[] = {0, 1, 2}; diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h index 2cf7ad62d..3b7e0cfc2 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h @@ -1,6 +1,13 @@ #pragma once +#include +#include +#include + #include "TileEntity.h" #include "minecraft/world/WorldlyContainer.h" +#include "java/Class.h" + +class ItemInstance; class BrewingStandTileEntity : public TileEntity, public WorldlyContainer { public: diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp index 0b8a232b2..0c075d451 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -1,18 +1,30 @@ #include "ChestTileEntity.h" +#include +#include + #include "TileEntity.h" #include "minecraft/network/packet/ContainerOpenPacket.h" #include "minecraft/sounds/SoundTypes.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/inventory/net.minecraft.world.inventory.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "nbt/com.mojang.nbt.h" +#include "Direction.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "SharedConstants.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/CompoundContainer.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/inventory/AbstractContainerMenu.h" +#include "minecraft/world/inventory/ContainerMenu.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/phys/AABB.h" + +class Entity; int ChestTileEntity::getContainerType() { if (isBonusChest) diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h index 4c5118afe..0c900ad65 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h @@ -1,11 +1,17 @@ #pragma once +#include +#include +#include + #include "TileEntity.h" #include "minecraft/world/Container.h" #include "nbt/ListTag.h" +#include "java/Class.h" class Player; class CompoundTag; +class ItemInstance; class ChestTileEntity : public TileEntity, public Container { public: diff --git a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp index bc0123023..4ea87191a 100644 --- a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp @@ -1,13 +1,14 @@ #include "CommandBlockEntity.h" #include - #include #include "minecraft/Pos.h" #include "minecraft/network/packet/TileEntityDataPacket.h" -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/commands/CommandsEnum.h" +#include "minecraft/network/packet/ChatPacket.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" class Level; diff --git a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp index c04f3fe70..da0467ca9 100644 --- a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp @@ -3,8 +3,8 @@ #include #include -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" void ComparatorTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); diff --git a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp index 93a71b932..15a9fc9e5 100644 --- a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp @@ -6,6 +6,7 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/DaylightDetectorTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" DaylightDetectorTileEntity::DaylightDetectorTileEntity() {} diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index 082bee046..ed087fd02 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -1,12 +1,17 @@ #include "DispenserTileEntity.h" +#include + #include "TileEntity.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/net.minecraft.world.item.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "nbt/com.mojang.nbt.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/level/Level.h" DispenserTileEntity::DispenserTileEntity() : TileEntity() { items = std::vector>(9); diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h index f9eb66dd7..988cd64ff 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h @@ -1,13 +1,19 @@ #pragma once +#include +#include +#include + #include "TileEntity.h" #include "minecraft/world/Container.h" #include "nbt/com.mojang.nbt.h" +#include "java/Class.h" class Player; class Random; class Level; class CompoundTag; +class ItemInstance; class DispenserTileEntity : public TileEntity, public Container { public: diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp index 861fd8919..6303a799e 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -3,7 +3,9 @@ #include #include -#include "minecraft/stdafx.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "strings.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" std::wstring DropperTileEntity::getName() { return hasCustomName() ? name : app.GetString(IDS_CONTAINER_DROPPER); diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.h b/targets/minecraft/world/level/tile/entity/DropperTileEntity.h index a06c8af12..4f111b275 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.h @@ -1,6 +1,11 @@ #pragma once +#include + #include "DispenserTileEntity.h" +#include "java/Class.h" + +class TileEntity; class DropperTileEntity : public DispenserTileEntity { public: diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index ef277fff3..60d297cb2 100644 --- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -1,10 +1,16 @@ #include "EnchantmentTableTileEntity.h" #include +#include +#include -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/net.minecraft.world.level.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "strings.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" EnchantmentTableEntity::EnchantmentTableEntity() { random = new Random(); diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h index 6ff6d5a56..8f657eaea 100644 --- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h @@ -1,5 +1,9 @@ #pragma once +#include + #include "TileEntity.h" +#include "java/Class.h" + class Random; class EnchantmentTableEntity : public TileEntity { diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index 81b422c40..714bca784 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -1,14 +1,27 @@ #include "FurnaceTileEntity.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/stdafx.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" -#include "minecraft/world/item/net.minecraft.world.item.h" +#include + #include "minecraft/world/level/material/Material.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "nbt/com.mojang.nbt.h" +#include "Facing.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/item/CoalItem.h" +#include "minecraft/world/item/DiggerItem.h" +#include "minecraft/world/item/HoeItem.h" +#include "minecraft/world/item/Item.h" +#include "minecraft/world/item/ItemInstance.h" +#include "minecraft/world/item/WeaponItem.h" +#include "minecraft/world/item/crafting/FurnaceRecipes.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/FurnaceTile.h" +#include "minecraft/world/level/tile/HalfSlabTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" int furnaceSlotsForUp[] = {FurnaceTileEntity::SLOT_INPUT}; int furnaceSlotsForDown[] = {FurnaceTileEntity::SLOT_RESULT, diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h index 5174a5fd6..20bcc865f 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h @@ -1,11 +1,17 @@ #pragma once +#include +#include +#include + #include "TileEntity.h" #include "minecraft/world/WorldlyContainer.h" #include "minecraft/world/level/tile/FurnaceTile.h" +#include "java/Class.h" class Player; class Level; +class ItemInstance; class FurnaceTileEntity : public TileEntity, public WorldlyContainer { public: diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 9b6cdebe8..74b08b421 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -1,16 +1,30 @@ #include "HopperTileEntity.h" -#include "minecraft/net.minecraft.h" -#include "minecraft/stdafx.h" +#include +#include +#include + #include "minecraft/util/Mth.h" -#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h" -#include "minecraft/world/entity/net.minecraft.world.entity.h" -#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h" -#include "minecraft/world/level/net.minecraft.world.level.h" -#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h" -#include "minecraft/world/net.minecraft.world.h" -#include "minecraft/world/phys/net.minecraft.world.phys.h" -#include "net.minecraft.world.level.tile.entity.h" +#include "Facing.h" +#include "Minecraft.Client/Linux/Linux_App.h" +#include "java/Random.h" +#include "nbt/CompoundTag.h" +#include "nbt/ListTag.h" +#include "strings.h" +#include "minecraft/world/WorldlyContainer.h" +#include "minecraft/world/entity/EntitySelector.h" +#include "minecraft/world/entity/item/ItemEntity.h" +#include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/Level.h" +#include "minecraft/world/level/tile/ChestTile.h" +#include "minecraft/world/level/tile/HopperTile.h" +#include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/ChestTileEntity.h" +#include "minecraft/world/level/tile/entity/Hopper.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" + +class Entity; HopperTileEntity::HopperTileEntity() { items = std::vector>(5); diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h index a0a53e6be..5be360922 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h @@ -1,9 +1,17 @@ #pragma once +#include +#include +#include + #include "Hopper.h" #include "TileEntity.h" +#include "java/Class.h" +#include "minecraft/world/Container.h" +#include "minecraft/world/item/ItemInstance.h" class ItemEntity; +class Level; class HopperTileEntity : public TileEntity, public Hopper { public: diff --git a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp index 543d67472..3d9820a41 100644 --- a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/level/BaseMobSpawner.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" MobSpawnerTileEntity::TileEntityMobSpawner::TileEntityMobSpawner( MobSpawnerTileEntity* parent) { diff --git a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp index 7c8ca9f41..d57dd5b0f 100644 --- a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" MusicTileEntity::MusicTileEntity() : TileEntity() { note = 0; diff --git a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp index ea9ba1195..fd5c819ce 100644 --- a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp @@ -11,6 +11,8 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/BaseEntityTile.h" #include "minecraft/world/level/tile/Tile.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" +#include "minecraft/world/phys/AABB.h" PistonMovingPiece::PistonMovingPiece(int id) : BaseEntityTile(id, Material::piston, false) { diff --git a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp index 5b59a2ac4..87c767743 100644 --- a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp @@ -1,6 +1,5 @@ #include "PistonPieceTileEntity.h" -#include #include #include #include @@ -11,8 +10,8 @@ #include "minecraft/world/entity/Entity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" PistonPieceEntity::PistonPieceEntity() { // for the tile entity loader diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp index 6b26ef662..aadcbb0df 100644 --- a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -7,8 +7,11 @@ #include "minecraft/network/packet/SignUpdatePacket.h" #include "minecraft/server/level/ServerLevel.h" #include "minecraft/world/level/Level.h" -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "PlatformTypes.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" + +class Player; const int SignTileEntity::MAX_LINE_LENGTH = 15; diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.h b/targets/minecraft/world/level/tile/entity/SignTileEntity.h index 7983ba814..2346b6bd0 100644 --- a/targets/minecraft/world/level/tile/entity/SignTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.h @@ -8,6 +8,8 @@ #include "minecraft/world/entity/player/Player.h" #include "platform/IPlatformInput.h" +struct STRING_VERIFY_RESPONSE; + #define MAX_SIGN_LINES 4 class SignTileEntity : public TileEntity { diff --git a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp index 7aff9dd72..7a64569a7 100644 --- a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp @@ -4,8 +4,8 @@ #include #include "minecraft/network/packet/TileEntityDataPacket.h" -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" +#include "minecraft/world/level/tile/entity/TileEntity.h" SkullTileEntity::SkullTileEntity() { skullType = 0; diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.cpp b/targets/minecraft/world/level/tile/entity/TileEntity.cpp index aca4b6e9f..cd765ad73 100644 --- a/targets/minecraft/world/level/tile/entity/TileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/TileEntity.cpp @@ -24,7 +24,6 @@ #include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "minecraft/world/level/tile/entity/SkullTileEntity.h" #include "minecraft/world/level/tile/entity/TheEndPortalTileEntity.h" -#include "minecraft/world/level/tile/entity/TileEntity.h" #include "nbt/CompoundTag.h" TileEntity::idToCreateMapType TileEntity::idCreateMap = diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 84ffa5f18..2143d4bb3 100644 --- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -2,9 +2,6 @@ #include -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" #include "PistonExtensionTile.h" #include "java/Random.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/phys/AABB.cpp b/targets/minecraft/world/phys/AABB.cpp index fadd96722..a465d2d1b 100644 --- a/targets/minecraft/world/phys/AABB.cpp +++ b/targets/minecraft/world/phys/AABB.cpp @@ -13,7 +13,6 @@ #include #include "HitResult.h" -#include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" AABB::AABB(double x0, double y0, double z0, double x1, double y1, double z1) { diff --git a/targets/minecraft/world/phys/AABB.h b/targets/minecraft/world/phys/AABB.h index d170feae0..a89942bc1 100644 --- a/targets/minecraft/world/phys/AABB.h +++ b/targets/minecraft/world/phys/AABB.h @@ -1,9 +1,13 @@ #pragma once +#include +#include + #include "Vec3.h" #include "console_helpers/Definitions.h" class HitResult; +class Vec3; class AABB { public: diff --git a/targets/minecraft/world/phys/HitResult.cpp b/targets/minecraft/world/phys/HitResult.cpp index c01b34433..ea51c301e 100644 --- a/targets/minecraft/world/phys/HitResult.cpp +++ b/targets/minecraft/world/phys/HitResult.cpp @@ -1,6 +1,7 @@ #include "HitResult.h" #include "minecraft/world/entity/Entity.h" +#include "minecraft/world/phys/Vec3.h" HitResult::HitResult(int x, int y, int z, int f, const Vec3& pos) { type = TILE; diff --git a/targets/minecraft/world/phys/Vec3.cpp b/targets/minecraft/world/phys/Vec3.cpp index b06079cec..5c611f556 100644 --- a/targets/minecraft/world/phys/Vec3.cpp +++ b/targets/minecraft/world/phys/Vec3.cpp @@ -6,7 +6,6 @@ #include #include "minecraft/world/phys/AABB.h" -#include "minecraft/world/phys/Vec3.h" Vec3 Vec3::vectorTo(const Vec3& p) const { return {p.x - x, p.y - y, p.z - z}; } diff --git a/targets/nbt/include/nbt/NbtIo.h b/targets/nbt/include/nbt/NbtIo.h index bc9d40a83..6abe29190 100644 --- a/targets/nbt/include/nbt/NbtIo.h +++ b/targets/nbt/include/nbt/NbtIo.h @@ -1,8 +1,15 @@ #pragma once +#include +#include + #include "CompoundTag.h" #include "Tag.h" class InputStream; +class CompoundTag; +class DataInput; +class DataOutput; +class OutputStream; class NbtIo { public: diff --git a/targets/nbt/include/nbt/Tag.h b/targets/nbt/include/nbt/Tag.h index 00c931864..6158b50b6 100644 --- a/targets/nbt/include/nbt/Tag.h +++ b/targets/nbt/include/nbt/Tag.h @@ -1,8 +1,13 @@ #pragma once +#include #include +#include #include "java/InputOutputStream/InputOutputStream.h" +class DataInput; +class DataOutput; + class Tag { public: static const uint8_t TAG_End = static_cast(0); diff --git a/targets/nbt/src/NbtIo.cpp b/targets/nbt/src/NbtIo.cpp index 3f0a47f8a..7611e616c 100644 --- a/targets/nbt/src/NbtIo.cpp +++ b/targets/nbt/src/NbtIo.cpp @@ -1,6 +1,17 @@ #include "nbt/NbtIo.h" -#include "java/InputOutputStream/InputOutputStream.h" +#include "java/InputOutputStream/BufferedOutputStream.h" +#include "java/InputOutputStream/ByteArrayInputStream.h" +#include "java/InputOutputStream/ByteArrayOutputStream.h" +#include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/DataOutputStream.h" +#include "java/System.h" +#include "nbt/CompoundTag.h" +#include "nbt/Tag.h" + +class DataInput; +class DataOutput; +class OutputStream; CompoundTag* NbtIo::readCompressed(InputStream* in) { // 4J - this was using a try/finally block diff --git a/targets/nbt/src/Tag.cpp b/targets/nbt/src/Tag.cpp index 7b7c6c435..fae48907e 100644 --- a/targets/nbt/src/Tag.cpp +++ b/targets/nbt/src/Tag.cpp @@ -13,6 +13,9 @@ #include "nbt/LongTag.h" #include "nbt/ShortTag.h" #include "nbt/StringTag.h" +#include "java/InputOutputStream/DataInput.h" +#include "java/InputOutputStream/DataOutput.h" +#include "nbt/IntArrayTag.h" Tag::Tag(const std::wstring& name) { if (name.empty()) { diff --git a/targets/platform/PlatformServices.cpp b/targets/platform/PlatformServices.cpp index d7e53c40b..ee8b32b11 100644 --- a/targets/platform/PlatformServices.cpp +++ b/targets/platform/PlatformServices.cpp @@ -5,6 +5,11 @@ #include "../4J.Render/4J_Render.h" #include "../4J.Storage/4J_Storage.h" +class IPlatformInput; +class IPlatformProfile; +class IPlatformRender; +class IPlatformStorage; + IPlatformInput& PlatformInput = InputManager; IPlatformProfile& PlatformProfile = ProfileManager; IPlatformRender& PlatformRender = RenderManager; diff --git a/targets/platform/PlatformServices.h b/targets/platform/PlatformServices.h index 0cab17cc0..6c6be54bc 100644 --- a/targets/platform/PlatformServices.h +++ b/targets/platform/PlatformServices.h @@ -5,6 +5,11 @@ #include "IPlatformRender.h" #include "IPlatformStorage.h" +class IPlatformInput; +class IPlatformProfile; +class IPlatformRender; +class IPlatformStorage; + // Interface references to platform services. World code uses these // instead of the concrete 4J globals directly. The bindings are // established by the app layer at startup.