From de46641cdaba54b49e8ac76a0d3430eed0913139 Mon Sep 17 00:00:00 2001 From: GuglioIsStupid Date: Fri, 6 Mar 2026 02:45:25 -0500 Subject: [PATCH] Reimplement miles sound artifacts, Stone Brick Stairs recipe, and craft sound (#684) * Reimplement miles sound artifacts * Fix stone brick stairs recipe * Fix craft and scroll sound --- Minecraft.Client/Common/Audio/SoundEngine.cpp | 5 +---- Minecraft.Client/Common/UI/UIController.cpp | 8 +++++++- Minecraft.Client/Common/UI/UIController.h | 4 ++++ .../Sound/Minecraft/UI/craft.ogg | Bin 4969 -> 4185 bytes .../Sound/Minecraft/UI/scrollfocus.ogg | Bin 4185 -> 4969 bytes Minecraft.World/Recipes.cpp | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 534fc54d..b2ca2be3 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -266,10 +266,7 @@ void SoundEngine::updateMiniAudio() ma_sound_set_volume(&s->sound, finalVolume); - if (!s->info.bUseSoundsPitchVal) - { - ma_sound_set_pitch(&s->sound, s->info.pitch); - } + ma_sound_set_pitch(&s->sound, s->info.pitch); if (s->info.bIs3D) { diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index 5375b784..95423642 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -2342,7 +2342,13 @@ void UIController::PlayUISFX(ESoundEffect eSound) if (time - m_lastUiSfx < 10) { return; } m_lastUiSfx = time; - Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,1.0f); + float pitch = 1.0f; + if (eSound == eSFX_Focus) + { + pitch += (m_randomDistribution(m_randomGenerator) - 0.5f) / 10; + } + + Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,pitch); } void UIController::DisplayGamertag(unsigned int iPad, bool show) diff --git a/Minecraft.Client/Common/UI/UIController.h b/Minecraft.Client/Common/UI/UIController.h index 373d67b2..f4b365b5 100644 --- a/Minecraft.Client/Common/UI/UIController.h +++ b/Minecraft.Client/Common/UI/UIController.h @@ -3,6 +3,7 @@ using namespace std; #include "IUIController.h" #include "UIEnums.h" #include "UIGroup.h" +#include class UIAbstractBitmapFont; class UIBitmapFont; @@ -63,6 +64,9 @@ private: UITTFFont *m_mcTTFFont; UIBitmapFont *m_moj7, *m_moj11; + std::mt19937 m_randomGenerator; + std::uniform_real_distribution m_randomDistribution; + public: void setCleanupOnReload(); void updateCurrentFont(); diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craft.ogg b/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craft.ogg index 9359d3489d28293ff764d47a3999b5bf2b115374..eb676afeb6a985fb6161f58f2d3a43440e86c0c4 100644 GIT binary patch delta 2927 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 aI`O+0@)#H#8o>FGf#JZm(@YF}e0%^7-Q%|a delta 3698 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 aI`O+0@)#H#8o>FGf#JZm(@YF}e0%^7-Q%|a diff --git a/Minecraft.World/Recipes.cpp b/Minecraft.World/Recipes.cpp index 8dcbafdf..ef2cd7fd 100644 --- a/Minecraft.World/Recipes.cpp +++ b/Minecraft.World/Recipes.cpp @@ -236,7 +236,7 @@ Recipes::Recipes() L"## ", // L"###", // - L'#', Tile::cobblestone, + L'#', Tile::stoneBrick, L'S'); addShapedRecipy(new ItemInstance(Tile::stairs_netherBricks, 4), //