diff options
| author | GuglioIsStupid <guglioisbusiness@gmail.com> | 2026-03-06 02:45:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-06 01:45:25 -0600 |
| commit | de46641cdaba54b49e8ac76a0d3430eed0913139 (patch) | |
| tree | 95b8b401007768fe345405d947cf0bf25274916b | |
| parent | 0469e982ce16da9f381384ec48d0715b09ee72b3 (diff) | |
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
| -rw-r--r-- | Minecraft.Client/Common/Audio/SoundEngine.cpp | 5 | ||||
| -rw-r--r-- | Minecraft.Client/Common/UI/UIController.cpp | 8 | ||||
| -rw-r--r-- | Minecraft.Client/Common/UI/UIController.h | 4 | ||||
| -rw-r--r-- | Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craft.ogg | bin | 4969 -> 4185 bytes | |||
| -rw-r--r-- | Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scrollfocus.ogg | bin | 4185 -> 4969 bytes | |||
| -rw-r--r-- | 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 <random> 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<float> 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 Binary files differindex 9359d348..eb676afe 100644 --- a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craft.ogg +++ b/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craft.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scrollfocus.ogg b/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scrollfocus.ogg Binary files differindex eb676afe..9359d348 100644 --- a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scrollfocus.ogg +++ b/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scrollfocus.ogg 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), // |