diff --git a/targets/minecraft/sounds/ConsoleSoundEngine.cpp b/targets/app/common/Audio/ConsoleSoundEngine.cpp similarity index 97% rename from targets/minecraft/sounds/ConsoleSoundEngine.cpp rename to targets/app/common/Audio/ConsoleSoundEngine.cpp index f8ffdd212..289f46810 100644 --- a/targets/minecraft/sounds/ConsoleSoundEngine.cpp +++ b/targets/app/common/Audio/ConsoleSoundEngine.cpp @@ -1,4 +1,4 @@ -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() { return m_bIsPlayingStreamingCDMusic; diff --git a/targets/minecraft/sounds/ConsoleSoundEngine.h b/targets/app/common/Audio/ConsoleSoundEngine.h similarity index 98% rename from targets/minecraft/sounds/ConsoleSoundEngine.h rename to targets/app/common/Audio/ConsoleSoundEngine.h index d78639fa1..10ef82eca 100644 --- a/targets/minecraft/sounds/ConsoleSoundEngine.h +++ b/targets/app/common/Audio/ConsoleSoundEngine.h @@ -4,7 +4,7 @@ #include #include -#include "minecraft/sounds/SoundTypes.h" +#include "SoundTypes.h" class File; diff --git a/targets/app/common/Audio/SoundEngine.cpp b/targets/app/common/Audio/SoundEngine.cpp index 5883cb5ac..c2f46cea5 100644 --- a/targets/app/common/Audio/SoundEngine.cpp +++ b/targets/app/common/Audio/SoundEngine.cpp @@ -10,7 +10,7 @@ #include #include -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/LinuxGame.h" #include "java/Random.h" diff --git a/targets/app/common/Audio/SoundEngine.h b/targets/app/common/Audio/SoundEngine.h index 99b5a707d..66403ea07 100644 --- a/targets/app/common/Audio/SoundEngine.h +++ b/targets/app/common/Audio/SoundEngine.h @@ -7,9 +7,9 @@ class Random; #include #include -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "app/linux/Iggy/include/rrCore.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" // Forward-declare the miniaudio backing state. The full struct lives in diff --git a/targets/app/common/Audio/SoundNames.cpp b/targets/app/common/Audio/SoundNames.cpp index 8d390cb72..09fb95607 100644 --- a/targets/app/common/Audio/SoundNames.cpp +++ b/targets/app/common/Audio/SoundNames.cpp @@ -1,5 +1,5 @@ -#include "minecraft/sounds/ConsoleSoundEngine.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/ConsoleSoundEngine.h" +#include "app/common/Audio/SoundTypes.h" const char* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { "mob/chicken/chicken", // eSoundType_MOB_CHICKEN_AMBIENT diff --git a/targets/minecraft/sounds/SoundTypes.h b/targets/app/common/Audio/SoundTypes.h similarity index 100% rename from targets/minecraft/sounds/SoundTypes.h rename to targets/app/common/Audio/SoundTypes.h diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h index 928f9d496..1e84b9fbc 100644 --- a/targets/app/common/Game.h +++ b/targets/app/common/Game.h @@ -11,7 +11,7 @@ #include "app/common/App_structs.h" #include "app/common/ArchiveManager.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "app/common/BannedListManager.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLCController.h" diff --git a/targets/app/common/UI/All Platforms/IUIController.h b/targets/app/common/UI/All Platforms/IUIController.h index 20a7c9fc6..d41c2c753 100644 --- a/targets/app/common/UI/All Platforms/IUIController.h +++ b/targets/app/common/UI/All Platforms/IUIController.h @@ -2,7 +2,7 @@ #include "UIEnums.h" #include "UIStructs.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/storage/storage.h" // 4J Stu - An interface class that defines all the public functions that we use diff --git a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index d745984a9..532c29414 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -17,7 +17,7 @@ #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index 5a7a25296..9e83cb9cc 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -16,7 +16,7 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp index 02e81b9b6..0a31ac168 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -13,7 +13,7 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/SimpleContainer.h" #include "minecraft/world/entity/Painting.h" #include "minecraft/world/entity/animal/EntityHorse.h" diff --git a/targets/app/common/UI/Controls/UIControl_Slider.cpp b/targets/app/common/UI/Controls/UIControl_Slider.cpp index 863dbc049..799a0fde6 100644 --- a/targets/app/common/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/UI/Controls/UIControl_Slider.cpp @@ -10,7 +10,7 @@ #endif #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_UIController.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "util/StringHelpers.h" UIControl_Slider::UIControl_Slider() { diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 0dfc0d3a1..bf0111fd4 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -28,7 +28,7 @@ #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/level/LevelSettings.h" #include "minecraft/world/level/chunk/ChunkSource.h" #include "platform/NetTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index a2580ec13..fc81ac180 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -11,7 +11,7 @@ #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" #include "platform/input/input.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 929f44e16..0152096ce 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -16,7 +16,7 @@ #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" #include "minecraft/network/platform/SessionInfo.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/level/LevelSettings.h" #include "platform/PlatformTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index bdc50c4da..4e0fed476 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -16,7 +16,7 @@ #include "minecraft/GameEnums.h" #include "minecraft/GameHostOptions.h" #include "minecraft/GameTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "platform/renderer/renderer.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index d12888702..ee23ecbff 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -16,7 +16,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/Console_Debug_enum.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/level/tile/Tile.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index bd6c17f84..ddfcc5174 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -26,7 +26,7 @@ #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/level/GameRules/LevelGenerationOptions.h" #include "minecraft/world/level/LevelSettings.h" #include "platform/NetTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 9edcad607..4e89e4cda 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -23,7 +23,7 @@ #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/network/platform/SessionInfo.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/level/GameRules/LevelGenerationOptions.h" #include "minecraft/world/level/LevelSettings.h" #include "platform/NetTypes.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 7597058eb..547bdb0a4 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -29,7 +29,7 @@ #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/ScreenSizeCalculator.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/NetTypes.h" #include "platform/PlatformTypes.h" #include "platform/profile/profile.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 7c24a8329..c54819aa4 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -11,7 +11,7 @@ #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/GameTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "strings.h" UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData, diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 89efb30e6..0d3487727 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -8,7 +8,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" #include "platform/input/input.h" #include "platform/profile/ProfileConstants.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index df684fab8..faad5c611 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -5,7 +5,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 4101422c5..51ba1cbae 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -14,7 +14,7 @@ #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/player/Abilities.h" #include "platform/input/input.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 6d6db0610..c2759fdde 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -7,7 +7,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index d5f59efc8..7d5532895 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -11,7 +11,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "strings.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 2d4552d2f..2bdca1cf2 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -9,7 +9,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "strings.h" // strings for buttons in the list diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 20a7c58f2..25310afc1 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -6,7 +6,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "strings.h" // strings for buttons in the list diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 370ac6e81..e610b9dbc 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -7,7 +7,7 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index d310b4356..8168a478f 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -14,7 +14,7 @@ #include "app/linux/Linux_UIController.h" #include "minecraft/GameEnums.h" #include "minecraft/client/Minecraft.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.h" #include "platform/renderer/renderer.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index c95234fd8..7df0b5562 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -18,7 +18,7 @@ #include "minecraft/Minecraft_Macros.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/model/SkinBox.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/profile/ProfileConstants.h" #include "platform/profile/profile.h" #include "platform/renderer/renderer.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 528da0646..10653db19 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -21,7 +21,7 @@ #include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/SimpleContainer.h" #include "platform/XboxStubs.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 0da94aab4..2fd951e2a 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -18,7 +18,7 @@ #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/network/packet/KickPlayerPacket.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" #include "platform/profile/profile.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 59f633013..3d2b50e5c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -23,7 +23,7 @@ #include "minecraft/client/skins/TexturePackRepository.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/ServerAction.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/profile/profile.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 1da16ab73..6817c4665 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -14,7 +14,7 @@ #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/network/packet/SignUpdatePacket.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/level/tile/entity/SignTileEntity.h" #include "platform/input/input.h" #include "strings.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index cd03823cd..deacafb36 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -17,7 +17,7 @@ #include "minecraft/network/packet/GameCommandPacket.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" #include "minecraft/server/commands/TeleportCommand.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "strings.h" UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, diff --git a/targets/app/common/UI/UIController.h b/targets/app/common/UI/UIController.h index d8906c7da..7a76de829 100644 --- a/targets/app/common/UI/UIController.h +++ b/targets/app/common/UI/UIController.h @@ -27,7 +27,7 @@ #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl.h" #include "app/linux/Iggy/include/rrCore.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/PlatformTypes.h" #include "platform/input/input.h" #include "platform/renderer/renderer.h" diff --git a/targets/app/common/UI/UIScene.cpp b/targets/app/common/UI/UIScene.cpp index 11d23735d..763dcf4bf 100644 --- a/targets/app/common/UI/UIScene.cpp +++ b/targets/app/common/UI/UIScene.cpp @@ -24,7 +24,7 @@ #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/entity/ItemRenderer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/item/ItemInstance.h" #include "util/StringHelpers.h" diff --git a/targets/app/common_sources.txt b/targets/app/common_sources.txt index 89d1ecc3b..03640563a 100644 --- a/targets/app/common_sources.txt +++ b/targets/app/common_sources.txt @@ -2,6 +2,7 @@ common/AppGameServices.cpp common/ArchiveManager.cpp common/Audio/SoundEngine.cpp common/Audio/SoundNames.cpp +common/Audio/ConsoleSoundEngine.cpp common/BannedListManager.cpp common/ConsoleGameMode.cpp common/DLC/DLCAudioFile.cpp diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index d46f463aa..803f983e1 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -54,7 +54,7 @@ #include "minecraft/network/packet/DisconnectPacket.h" #include "minecraft/network/packet/Packet.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/Stats.h" #include "minecraft/stats/StatsCounter.h" #include "minecraft/util/Log.h" diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp index e585fb3f2..2efeb1b09 100644 --- a/targets/minecraft/client/Options.cpp +++ b/targets/minecraft/client/Options.cpp @@ -1,7 +1,7 @@ #include "Options.h" #include "KeyMapping.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 1fb75ec16..4ef01b073 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -1,7 +1,7 @@ #include "Screen.h" #include "Button.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "minecraft/GameEnums.h" #include "minecraft/IGameServices.h" #include "minecraft/client/Minecraft.h" @@ -12,7 +12,7 @@ #include "minecraft/network/INetworkService.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/ServerAction.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "platform/stubs.h" diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp index 2426fb71e..7ab9ca3f6 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp @@ -1,5 +1,5 @@ #include "StatsScreen.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" #include "minecraft/client/gui/Font.h" @@ -8,7 +8,7 @@ #include "minecraft/client/renderer/entity/ItemRenderer.h" #include "minecraft/locale/I18n.h" #include "minecraft/locale/Language.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/ItemStat.h" #include "minecraft/stats/Stat.h" #include "minecraft/stats/Stats.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 3e90154c2..956924086 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -114,7 +114,7 @@ #include "minecraft/network/packet/XZPacket.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" #include "minecraft/server/MinecraftServer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Log.h" #include "minecraft/world/SimpleContainer.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index 777df3e5c..1c87bad35 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -4,7 +4,7 @@ #include "ClientConnection.h" #include "MultiPlayerLevel.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "java/Class.h" #include "minecraft/IGameServices.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 3285549e6..14ea4f553 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -12,7 +12,7 @@ #include "ClientConnection.h" #include "MultiPlayerChunkCache.h" #include "MultiPlayerLocalPlayer.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/Console_Debug_enum.h" diff --git a/targets/minecraft/client/particle/FireworksParticles.cpp b/targets/minecraft/client/particle/FireworksParticles.cpp index e0194f81a..ab8d756d0 100644 --- a/targets/minecraft/client/particle/FireworksParticles.cpp +++ b/targets/minecraft/client/particle/FireworksParticles.cpp @@ -12,7 +12,7 @@ #include "minecraft/client/particle/Particle.h" #include "minecraft/client/particle/ParticleEngine.h" #include "minecraft/client/renderer/Tesselator.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/item/FireworksItem.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index 2dbb3bc9a..0ce1edcfa 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -30,7 +30,7 @@ // 4J Stu - Added for tutorial callbacks #include "PlatformTypes.h" #include "Pos.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "platform/profile/ProfileConstants.h" #include "minecraft/world/tutorial/ITutorial.h" #include "app/linux/Linux_UIController.h" @@ -54,7 +54,7 @@ #include "minecraft/commands/CommandsEnum.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/network/INetworkService.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/Achievement.h" #include "minecraft/stats/CommonStats.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index a8d97bc13..faea5c8b6 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -47,7 +47,7 @@ #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/util/SmoothFloat.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index c9b638797..7f84ec8d0 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -15,7 +15,7 @@ #include "Chunk.h" #include "GameRenderer.h" #include "Tesselator.h" -#include "minecraft/sounds/ConsoleSoundEngine.h" +#include "app/common/Audio/ConsoleSoundEngine.h" #include "java/Class.h" #include "java/JavaMath.h" #include "java/Random.h" @@ -73,7 +73,7 @@ #include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" #include "minecraft/world/IconRegister.h" diff --git a/targets/minecraft/sources.txt b/targets/minecraft/sources.txt index e5ee3dfa4..e55538beb 100644 --- a/targets/minecraft/sources.txt +++ b/targets/minecraft/sources.txt @@ -396,7 +396,6 @@ server/level/TrackedEntity.cpp server/network/PendingConnection.cpp server/network/PlayerConnection.cpp server/network/ServerConnection.cpp -sounds/ConsoleSoundEngine.cpp stats/Achievement.cpp stats/Achievements.cpp stats/CommonStats.cpp diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp index f17dc2ec4..670e7459d 100644 --- a/targets/minecraft/world/entity/Entity.cpp +++ b/targets/minecraft/world/entity/Entity.cpp @@ -27,7 +27,7 @@ #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" #include "minecraft/server/level/ServerLevel.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/ExperienceOrb.cpp b/targets/minecraft/world/entity/ExperienceOrb.cpp index 73de05d64..02b6ca100 100644 --- a/targets/minecraft/world/entity/ExperienceOrb.cpp +++ b/targets/minecraft/world/entity/ExperienceOrb.cpp @@ -8,7 +8,7 @@ #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/entity/LivingEntity.cpp b/targets/minecraft/world/entity/LivingEntity.cpp index 6e924f52c..7547d7883 100644 --- a/targets/minecraft/world/entity/LivingEntity.cpp +++ b/targets/minecraft/world/entity/LivingEntity.cpp @@ -23,7 +23,7 @@ #include "minecraft/network/packet/TakeItemEntityPacket.h" #include "minecraft/server/level/EntityTracker.h" #include "minecraft/server/level/ServerLevel.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/entity/ambient/Bat.cpp b/targets/minecraft/world/entity/ambient/Bat.cpp index 55b66af55..9c88f578f 100644 --- a/targets/minecraft/world/entity/ambient/Bat.cpp +++ b/targets/minecraft/world/entity/ambient/Bat.cpp @@ -8,7 +8,7 @@ #include "java/Random.h" #include "minecraft/Pos.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/SyncedEntityData.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" diff --git a/targets/minecraft/world/entity/animal/Chicken.cpp b/targets/minecraft/world/entity/animal/Chicken.cpp index fe69ff10e..8e40b8fdb 100644 --- a/targets/minecraft/world/entity/animal/Chicken.cpp +++ b/targets/minecraft/world/entity/animal/Chicken.cpp @@ -3,7 +3,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/goal/BreedGoal.h" #include "minecraft/world/entity/ai/goal/FloatGoal.h" diff --git a/targets/minecraft/world/entity/animal/Cow.cpp b/targets/minecraft/world/entity/animal/Cow.cpp index a12908a9a..681f75c6a 100644 --- a/targets/minecraft/world/entity/animal/Cow.cpp +++ b/targets/minecraft/world/entity/animal/Cow.cpp @@ -3,7 +3,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/goal/BreedGoal.h" diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp index 25a164de7..2c7545b65 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.cpp +++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp @@ -9,7 +9,7 @@ #include "java/Random.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index 61fdd4298..c7e42f54b 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -10,7 +10,7 @@ #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/animal/Pig.cpp b/targets/minecraft/world/entity/animal/Pig.cpp index 475152b3a..609b6750b 100644 --- a/targets/minecraft/world/entity/animal/Pig.cpp +++ b/targets/minecraft/world/entity/animal/Pig.cpp @@ -6,7 +6,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/SyncedEntityData.h" diff --git a/targets/minecraft/world/entity/animal/Sheep.cpp b/targets/minecraft/world/entity/animal/Sheep.cpp index f33e8e167..e55db0f65 100644 --- a/targets/minecraft/world/entity/animal/Sheep.cpp +++ b/targets/minecraft/world/entity/animal/Sheep.cpp @@ -7,7 +7,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/AgeableMob.h" #include "minecraft/world/entity/EntityEvent.h" diff --git a/targets/minecraft/world/entity/animal/SnowMan.cpp b/targets/minecraft/world/entity/animal/SnowMan.cpp index 6753eebb6..08ffbdb68 100644 --- a/targets/minecraft/world/entity/animal/SnowMan.cpp +++ b/targets/minecraft/world/entity/animal/SnowMan.cpp @@ -4,7 +4,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/world/entity/animal/VillagerGolem.cpp b/targets/minecraft/world/entity/animal/VillagerGolem.cpp index 51f18ca7c..622264846 100644 --- a/targets/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/targets/minecraft/world/entity/animal/VillagerGolem.cpp @@ -5,7 +5,7 @@ #include "java/Random.h" #include "minecraft/Pos.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/entity/animal/Wolf.cpp b/targets/minecraft/world/entity/animal/Wolf.cpp index 293adc7ad..4f032a715 100644 --- a/targets/minecraft/world/entity/animal/Wolf.cpp +++ b/targets/minecraft/world/entity/animal/Wolf.cpp @@ -9,7 +9,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 9c29013d4..89c060c67 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -8,7 +8,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp index 864d58001..142249f77 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -10,7 +10,7 @@ #include "SharedConstants.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/global/LightningBolt.cpp b/targets/minecraft/world/entity/global/LightningBolt.cpp index c8df38246..46f2d7285 100644 --- a/targets/minecraft/world/entity/global/LightningBolt.cpp +++ b/targets/minecraft/world/entity/global/LightningBolt.cpp @@ -8,7 +8,7 @@ #include "java/Random.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/global/GlobalEntity.h" diff --git a/targets/minecraft/world/entity/item/ItemEntity.cpp b/targets/minecraft/world/entity/item/ItemEntity.cpp index 6efb5e5a2..3101b474a 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.cpp +++ b/targets/minecraft/world/entity/item/ItemEntity.cpp @@ -9,7 +9,7 @@ #include "SharedConstants.h" #include "java/JavaMath.h" #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/entity/item/MinecartTNT.cpp b/targets/minecraft/world/entity/item/MinecartTNT.cpp index 1620f18b4..a2fb4839e 100644 --- a/targets/minecraft/world/entity/item/MinecartTNT.cpp +++ b/targets/minecraft/world/entity/item/MinecartTNT.cpp @@ -7,7 +7,7 @@ #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/item/Minecart.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/entity/monster/Blaze.cpp b/targets/minecraft/world/entity/monster/Blaze.cpp index 29a11762d..acfcf9adc 100644 --- a/targets/minecraft/world/entity/monster/Blaze.cpp +++ b/targets/minecraft/world/entity/monster/Blaze.cpp @@ -9,7 +9,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/Mob.h" diff --git a/targets/minecraft/world/entity/monster/Creeper.cpp b/targets/minecraft/world/entity/monster/Creeper.cpp index 0e379afd2..51658fbbc 100644 --- a/targets/minecraft/world/entity/monster/Creeper.cpp +++ b/targets/minecraft/world/entity/monster/Creeper.cpp @@ -6,7 +6,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/entity/monster/EnderMan.cpp b/targets/minecraft/world/entity/monster/EnderMan.cpp index e7f56423f..63ca47f99 100644 --- a/targets/minecraft/world/entity/monster/EnderMan.cpp +++ b/targets/minecraft/world/entity/monster/EnderMan.cpp @@ -10,7 +10,7 @@ #include "java/Random.h" #include "minecraft/IGameServices.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/damageSource/EntityDamageSource.h" diff --git a/targets/minecraft/world/entity/monster/Ghast.cpp b/targets/minecraft/world/entity/monster/Ghast.cpp index 08480e32e..bf2ed2292 100644 --- a/targets/minecraft/world/entity/monster/Ghast.cpp +++ b/targets/minecraft/world/entity/monster/Ghast.cpp @@ -9,7 +9,7 @@ #include "java/Random.h" #include "minecraft/network/packet/ChatPacket.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/monster/LavaSlime.cpp b/targets/minecraft/world/entity/monster/LavaSlime.cpp index 5ec06fe10..ccd58d6a2 100644 --- a/targets/minecraft/world/entity/monster/LavaSlime.cpp +++ b/targets/minecraft/world/entity/monster/LavaSlime.cpp @@ -5,7 +5,7 @@ #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/monster/SharedMonsterAttributes.h" diff --git a/targets/minecraft/world/entity/monster/PigZombie.cpp b/targets/minecraft/world/entity/monster/PigZombie.cpp index 69ab1e76a..0423eb059 100644 --- a/targets/minecraft/world/entity/monster/PigZombie.cpp +++ b/targets/minecraft/world/entity/monster/PigZombie.cpp @@ -5,7 +5,7 @@ #include "java/Random.h" #include "minecraft/IGameServices.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/entity/monster/Silverfish.cpp b/targets/minecraft/world/entity/monster/Silverfish.cpp index b0d4fe7d8..4d4f99306 100644 --- a/targets/minecraft/world/entity/monster/Silverfish.cpp +++ b/targets/minecraft/world/entity/monster/Silverfish.cpp @@ -5,7 +5,7 @@ #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/IGameServices.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/damageSource/EntityDamageSource.h" diff --git a/targets/minecraft/world/entity/monster/Skeleton.cpp b/targets/minecraft/world/entity/monster/Skeleton.cpp index 2d7d21662..c9bec989d 100644 --- a/targets/minecraft/world/entity/monster/Skeleton.cpp +++ b/targets/minecraft/world/entity/monster/Skeleton.cpp @@ -9,7 +9,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/monster/Slime.cpp b/targets/minecraft/world/entity/monster/Slime.cpp index 00d42fd09..79ddcc2e4 100644 --- a/targets/minecraft/world/entity/monster/Slime.cpp +++ b/targets/minecraft/world/entity/monster/Slime.cpp @@ -8,7 +8,7 @@ #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/entity/monster/Spider.cpp b/targets/minecraft/world/entity/monster/Spider.cpp index c2652b171..64a8167c0 100644 --- a/targets/minecraft/world/entity/monster/Spider.cpp +++ b/targets/minecraft/world/entity/monster/Spider.cpp @@ -8,7 +8,7 @@ #include "java/Random.h" #include "minecraft/IGameServices.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/effect/MobEffectInstance.h" diff --git a/targets/minecraft/world/entity/monster/Witch.cpp b/targets/minecraft/world/entity/monster/Witch.cpp index fa3366d77..1f0cc9798 100644 --- a/targets/minecraft/world/entity/monster/Witch.cpp +++ b/targets/minecraft/world/entity/monster/Witch.cpp @@ -6,7 +6,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/minecraft/world/entity/monster/Zombie.cpp b/targets/minecraft/world/entity/monster/Zombie.cpp index a12b3ee7b..1176a2c14 100644 --- a/targets/minecraft/world/entity/monster/Zombie.cpp +++ b/targets/minecraft/world/entity/monster/Zombie.cpp @@ -9,7 +9,7 @@ #include "SharedConstants.h" #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Mth.h" #include "minecraft/world/Difficulty.h" diff --git a/targets/minecraft/world/entity/npc/Villager.cpp b/targets/minecraft/world/entity/npc/Villager.cpp index 783e82118..515828054 100644 --- a/targets/minecraft/world/entity/npc/Villager.cpp +++ b/targets/minecraft/world/entity/npc/Villager.cpp @@ -9,7 +9,7 @@ #include "java/Random.h" #include "minecraft/IGameServices.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp index 161401d15..18e353701 100644 --- a/targets/minecraft/world/entity/player/Player.cpp +++ b/targets/minecraft/world/entity/player/Player.cpp @@ -32,7 +32,7 @@ #include "minecraft/client/model/HumanoidModel.h" #include "minecraft/client/renderer/Textures.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Mth.h" #include "minecraft/world/Difficulty.h" diff --git a/targets/minecraft/world/entity/projectile/Arrow.cpp b/targets/minecraft/world/entity/projectile/Arrow.cpp index cc40c8949..681d1c345 100644 --- a/targets/minecraft/world/entity/projectile/Arrow.cpp +++ b/targets/minecraft/world/entity/projectile/Arrow.cpp @@ -13,7 +13,7 @@ #include "minecraft/network/packet/GameEventPacket.h" #include "minecraft/server/level/ServerPlayer.h" #include "minecraft/server/network/PlayerConnection.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp index 052f698ed..e3425b1ad 100644 --- a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp +++ b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp @@ -8,7 +8,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/EntityEvent.h" diff --git a/targets/minecraft/world/entity/projectile/FishingHook.cpp b/targets/minecraft/world/entity/projectile/FishingHook.cpp index 4e01c1570..15557631f 100644 --- a/targets/minecraft/world/entity/projectile/FishingHook.cpp +++ b/targets/minecraft/world/entity/projectile/FishingHook.cpp @@ -9,7 +9,7 @@ #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/item/BowItem.cpp b/targets/minecraft/world/item/BowItem.cpp index 77dc67bba..ed816e6f0 100644 --- a/targets/minecraft/world/item/BowItem.cpp +++ b/targets/minecraft/world/item/BowItem.cpp @@ -3,7 +3,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/minecraft/world/item/BucketItem.cpp b/targets/minecraft/world/item/BucketItem.cpp index 90806fb8c..6b0a50735 100644 --- a/targets/minecraft/world/item/BucketItem.cpp +++ b/targets/minecraft/world/item/BucketItem.cpp @@ -10,7 +10,7 @@ #include "minecraft/network/packet/ChatPacket.h" #include "minecraft/server/level/ServerPlayer.h" #include "minecraft/server/network/PlayerConnection.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Log.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/item/EggItem.cpp b/targets/minecraft/world/item/EggItem.cpp index 01e664d77..a2f4709b2 100644 --- a/targets/minecraft/world/item/EggItem.cpp +++ b/targets/minecraft/world/item/EggItem.cpp @@ -4,7 +4,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/ThrownEgg.h" diff --git a/targets/minecraft/world/item/EnderEyeItem.cpp b/targets/minecraft/world/item/EnderEyeItem.cpp index b0335f1c1..2152a8d8a 100644 --- a/targets/minecraft/world/item/EnderEyeItem.cpp +++ b/targets/minecraft/world/item/EnderEyeItem.cpp @@ -5,7 +5,7 @@ #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/item/EnderpearlItem.cpp b/targets/minecraft/world/item/EnderpearlItem.cpp index 851b958c7..36a71a464 100644 --- a/targets/minecraft/world/item/EnderpearlItem.cpp +++ b/targets/minecraft/world/item/EnderpearlItem.cpp @@ -3,7 +3,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/ThrownEnderpearl.h" diff --git a/targets/minecraft/world/item/ExperienceItem.cpp b/targets/minecraft/world/item/ExperienceItem.cpp index 207faa5fb..012abb104 100644 --- a/targets/minecraft/world/item/ExperienceItem.cpp +++ b/targets/minecraft/world/item/ExperienceItem.cpp @@ -3,7 +3,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/ThrownExpBottle.h" diff --git a/targets/minecraft/world/item/FireChargeItem.cpp b/targets/minecraft/world/item/FireChargeItem.cpp index 5d97f8e12..6c7f92463 100644 --- a/targets/minecraft/world/item/FireChargeItem.cpp +++ b/targets/minecraft/world/item/FireChargeItem.cpp @@ -4,7 +4,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/item/FishingRodItem.cpp b/targets/minecraft/world/item/FishingRodItem.cpp index 247377291..17198e4ee 100644 --- a/targets/minecraft/world/item/FishingRodItem.cpp +++ b/targets/minecraft/world/item/FishingRodItem.cpp @@ -4,7 +4,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/FishingHook.h" diff --git a/targets/minecraft/world/item/FlintAndSteelItem.cpp b/targets/minecraft/world/item/FlintAndSteelItem.cpp index 16d49a8ec..765ab961e 100644 --- a/targets/minecraft/world/item/FlintAndSteelItem.cpp +++ b/targets/minecraft/world/item/FlintAndSteelItem.cpp @@ -3,7 +3,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/item/FoodItem.cpp b/targets/minecraft/world/item/FoodItem.cpp index b1a0f0e77..68c9fca60 100644 --- a/targets/minecraft/world/item/FoodItem.cpp +++ b/targets/minecraft/world/item/FoodItem.cpp @@ -2,7 +2,7 @@ #include "java/Random.h" #include "minecraft/SharedConstants.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/effect/MobEffectInstance.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/food/FoodConstants.h" diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp index 276efda45..887160520 100644 --- a/targets/minecraft/world/item/PotionItem.cpp +++ b/targets/minecraft/world/item/PotionItem.cpp @@ -6,7 +6,7 @@ #include "minecraft/GameEnums.h" #include "minecraft/IGameServices.h" #include "minecraft/SharedConstants.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/minecraft/world/item/SnowballItem.cpp b/targets/minecraft/world/item/SnowballItem.cpp index 91498a9b2..d0a35e990 100644 --- a/targets/minecraft/world/item/SnowballItem.cpp +++ b/targets/minecraft/world/item/SnowballItem.cpp @@ -3,7 +3,7 @@ #include #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/entity/projectile/Snowball.h" diff --git a/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp b/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp index 5122ec57b..3a1d78b91 100644 --- a/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp +++ b/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp @@ -1,7 +1,7 @@ #include "ThornsEnchantment.h" #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/damageSource/DamageSource.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/world/level/Explosion.cpp b/targets/minecraft/world/level/Explosion.cpp index 15f911881..e6aeaa8af 100644 --- a/targets/minecraft/world/level/Explosion.cpp +++ b/targets/minecraft/world/level/Explosion.cpp @@ -9,7 +9,7 @@ #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index 9dd7dab78..c1a109294 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -27,7 +27,7 @@ #include "minecraft/client/resources/Colours/ColourTable.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/network/INetworkService.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/Log.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp index b0770e9db..05dcb4829 100644 --- a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp @@ -4,7 +4,7 @@ #include "minecraft/Facing.h" #include "minecraft/SharedConstants.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" diff --git a/targets/minecraft/world/level/tile/ButtonTile.cpp b/targets/minecraft/world/level/tile/ButtonTile.cpp index c1b3204b0..03ac07cd1 100644 --- a/targets/minecraft/world/level/tile/ButtonTile.cpp +++ b/targets/minecraft/world/level/tile/ButtonTile.cpp @@ -5,7 +5,7 @@ #include #include "minecraft/Facing.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/projectile/Arrow.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" diff --git a/targets/minecraft/world/level/tile/ComparatorTile.cpp b/targets/minecraft/world/level/tile/ComparatorTile.cpp index 8a520eabe..db1ca0d29 100644 --- a/targets/minecraft/world/level/tile/ComparatorTile.cpp +++ b/targets/minecraft/world/level/tile/ComparatorTile.cpp @@ -4,7 +4,7 @@ #include "minecraft/Direction.h" #include "minecraft/Facing.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" diff --git a/targets/minecraft/world/level/tile/FireTile.cpp b/targets/minecraft/world/level/tile/FireTile.cpp index c12bf63b0..2f8baddd6 100644 --- a/targets/minecraft/world/level/tile/FireTile.cpp +++ b/targets/minecraft/world/level/tile/FireTile.cpp @@ -10,7 +10,7 @@ #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/PlayerList.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/LeverTile.cpp b/targets/minecraft/world/level/tile/LeverTile.cpp index bd79e322b..22c4d5b07 100644 --- a/targets/minecraft/world/level/tile/LeverTile.cpp +++ b/targets/minecraft/world/level/tile/LeverTile.cpp @@ -3,7 +3,7 @@ #include #include "minecraft/Facing.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/LiquidTile.cpp b/targets/minecraft/world/level/tile/LiquidTile.cpp index 9aa0fdb55..1c5907f6c 100644 --- a/targets/minecraft/world/level/tile/LiquidTile.cpp +++ b/targets/minecraft/world/level/tile/LiquidTile.cpp @@ -10,7 +10,7 @@ #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" diff --git a/targets/minecraft/world/level/tile/NotGateTile.cpp b/targets/minecraft/world/level/tile/NotGateTile.cpp index 45481e685..db819d4d5 100644 --- a/targets/minecraft/world/level/tile/NotGateTile.cpp +++ b/targets/minecraft/world/level/tile/NotGateTile.cpp @@ -2,7 +2,7 @@ #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" diff --git a/targets/minecraft/world/level/tile/NoteBlockTile.cpp b/targets/minecraft/world/level/tile/NoteBlockTile.cpp index a77f8fd60..fffbd8816 100644 --- a/targets/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/targets/minecraft/world/level/tile/NoteBlockTile.cpp @@ -4,7 +4,7 @@ #include #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Log.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/tile/PortalTile.cpp b/targets/minecraft/world/level/tile/PortalTile.cpp index b02b12139..9e0812784 100644 --- a/targets/minecraft/world/level/tile/PortalTile.cpp +++ b/targets/minecraft/world/level/tile/PortalTile.cpp @@ -6,7 +6,7 @@ #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/item/SpawnEggItem.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index 6e80029c5..25e0dfded 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -7,7 +7,7 @@ #include "Facing.h" #include "java/Class.h" #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/stats/Stats.h" #include "minecraft/util/Log.h" diff --git a/targets/minecraft/world/level/tile/Tile.h b/targets/minecraft/world/level/tile/Tile.h index ebd3b42d7..188181309 100644 --- a/targets/minecraft/world/level/tile/Tile.h +++ b/targets/minecraft/world/level/tile/Tile.h @@ -5,7 +5,7 @@ #include #include -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/level/material/Material.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/minecraft/world/level/tile/TntTile.cpp b/targets/minecraft/world/level/tile/TntTile.cpp index 5e0992e57..148656845 100644 --- a/targets/minecraft/world/level/tile/TntTile.cpp +++ b/targets/minecraft/world/level/tile/TntTile.cpp @@ -7,7 +7,7 @@ #include "minecraft/Facing.h" #include "minecraft/GameEnums.h" #include "minecraft/IGameServices.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp index fc910c128..b7fb1f9f5 100644 --- a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp +++ b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp @@ -3,7 +3,7 @@ #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelSource.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp index a54db394b..9993aecdd 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -10,7 +10,7 @@ #include "java/Random.h" #include "minecraft/IGameServices.h" #include "minecraft/network/packet/ContainerOpenPacket.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/CompoundContainer.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp index 819f34f0c..b8b6a9703 100644 --- a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp @@ -1,7 +1,7 @@ #include "EnderChestTileEntity.h" #include "java/Random.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/ChestTile.h" diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 336585def..1280d81bd 100644 --- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -7,7 +7,7 @@ #include "minecraft/Facing.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "minecraft/sounds/SoundTypes.h" +#include "app/common/Audio/SoundTypes.h" #include "minecraft/util/Mth.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/entity/LivingEntity.h"