move SoundEngine back to app

2026-05-26 20:12:58 +00:00 · 2026-04-09 11:27:33 -05:00 · 2026-04-09 11:27:33 -05:00 · 8552634614
parent d87dd6ae72
commit 8552634614
117 changed files with 121 additions and 121 deletions
--- a/targets/app/common/Audio/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;
--- a/targets/app/common/Audio/ConsoleSoundEngine.h
+++ b/targets/app/common/Audio/ConsoleSoundEngine.h
@ -4,7 +4,7 @@
 #include <string>
 #include <vector>

-#include "minecraft/sounds/SoundTypes.h"
+#include "SoundTypes.h"

 class File;

--- a/targets/app/common/Audio/SoundEngine.cpp
+++ b/targets/app/common/Audio/SoundEngine.cpp
@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>

-#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"
--- a/targets/app/common/Audio/SoundEngine.h
+++ b/targets/app/common/Audio/SoundEngine.h
@ -7,9 +7,9 @@ class Random;
 #include <memory>
 #include <string>

-#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
--- 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
--- a/targets/app/common/Audio/SoundTypes.h
+++ b/targets/app/common/Audio/SoundTypes.h
--- 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"
--- a/Platforms/IUIController.h
+++ b/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
--- a/Platforms/IUIScene_AbstractContainerMenu.cpp
+++ b/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"
--- a/Platforms/IUIScene_CraftingMenu.cpp
+++ b/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"
--- a/Platforms/IUIScene_CreativeMenu.cpp
+++ b/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"
--- 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() {
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/screens/UIScene_LaunchMoreOptionsMenu.cpp
+++ b/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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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,
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -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"

--- a/targets/app/common/UI/Scenes/Help
+++ b/targets/app/common/UI/Scenes/Help
@ -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"
--- a/Options/UIScene_HelpAndOptionsMenu.cpp
+++ b/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"

--- a/targets/app/common/UI/Scenes/Help
+++ b/targets/app/common/UI/Scenes/Help
@ -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"

--- a/Options/UIScene_HowToPlayMenu.cpp
+++ b/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
--- a/Options/UIScene_LanguageSelector.cpp
+++ b/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
--- a/targets/app/common/UI/Scenes/Help
+++ b/targets/app/common/UI/Scenes/Help
@ -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"

--- a/Options/UIScene_SettingsOptionsMenu.cpp
+++ b/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"
--- a/Options/UIScene_SkinSelectMenu.cpp
+++ b/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"
--- a/Screens/Containers/UIScene_CreativeMenu.cpp
+++ b/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"

--- a/targets/app/common/UI/Scenes/In-Game
+++ b/targets/app/common/UI/Scenes/In-Game
@ -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"
--- a/targets/app/common/UI/Scenes/In-Game
+++ b/targets/app/common/UI/Scenes/In-Game
@ -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"

--- a/targets/app/common/UI/Scenes/In-Game
+++ b/targets/app/common/UI/Scenes/In-Game
@ -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"
--- a/targets/app/common/UI/Scenes/In-Game
+++ b/targets/app/common/UI/Scenes/In-Game
@ -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,
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- a/targets/minecraft/world/entity/animal/Chicken.cpp
+++ b/targets/minecraft/world/entity/animal/Chicken.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- a/targets/minecraft/world/entity/animal/Cow.cpp
+++ b/targets/minecraft/world/entity/animal/Cow.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- 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"
--- 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"
--- a/targets/minecraft/world/entity/animal/Pig.cpp
+++ b/targets/minecraft/world/entity/animal/Pig.cpp
@ -6,7 +6,7 @@
 #include <string>

 #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"
--- a/targets/minecraft/world/entity/animal/Sheep.cpp
+++ b/targets/minecraft/world/entity/animal/Sheep.cpp
@ -7,7 +7,7 @@
 #include <string>

 #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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/targets/minecraft/world/entity/monster/Creeper.cpp
+++ b/targets/minecraft/world/entity/monster/Creeper.cpp
@ -6,7 +6,7 @@
 #include <string>

 #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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/targets/minecraft/world/item/BowItem.cpp
+++ b/targets/minecraft/world/item/BowItem.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- 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"
--- a/targets/minecraft/world/item/EggItem.cpp
+++ b/targets/minecraft/world/item/EggItem.cpp
@ -4,7 +4,7 @@
 #include <memory>

 #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"
--- 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"
--- a/targets/minecraft/world/item/EnderpearlItem.cpp
+++ b/targets/minecraft/world/item/EnderpearlItem.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- a/targets/minecraft/world/item/ExperienceItem.cpp
+++ b/targets/minecraft/world/item/ExperienceItem.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- a/targets/minecraft/world/item/FireChargeItem.cpp
+++ b/targets/minecraft/world/item/FireChargeItem.cpp
@ -4,7 +4,7 @@
 #include <string>

 #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"
--- a/targets/minecraft/world/item/FishingRodItem.cpp
+++ b/targets/minecraft/world/item/FishingRodItem.cpp
@ -4,7 +4,7 @@
 #include <string>

 #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"
--- a/targets/minecraft/world/item/FlintAndSteelItem.cpp
+++ b/targets/minecraft/world/item/FlintAndSteelItem.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- 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"
--- 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"
--- a/targets/minecraft/world/item/SnowballItem.cpp
+++ b/targets/minecraft/world/item/SnowballItem.cpp
@ -3,7 +3,7 @@
 #include <memory>

 #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"
--- 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"
--- 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"
--- a/Show more
+++ b/Show more