backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into DLCs

Browse source
This commit is contained in:
GabsPuNs 2026-03-17 20:54:03 -04:00
parent 6264f53af9 a94ee1ca22
commit 828dcd3112
3 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/nightly-server.yml vendored
View file

@ -50,7 +50,7 @@ jobs:
buildPresetAdditionalArgs: "['--target', 'Minecraft.Server']" buildPresetAdditionalArgs: "['--target', 'Minecraft.Server']"
- name: Zip Build - name: Zip Build
run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/* -x!*.ipdb -x!*.iobj run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts - name: Stage artifacts
run: | run: |
@ -93,7 +93,7 @@ jobs:
files: | files: |
artifacts/* artifacts/*
docker-publish: docker:
name: Build and Push Docker Image name: Build and Push Docker Image
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: build needs: build
@ -157,7 +157,7 @@ jobs:
MC_RUNTIME_DIR=runtime MC_RUNTIME_DIR=runtime
cleanup: cleanup:
needs: [build, release] needs: [build, release, docker]
if: always() if: always()
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

2
.github/workflows/nightly.yml vendored
View file

@ -49,7 +49,7 @@ jobs:
buildPresetAdditionalArgs: "['--target', 'Minecraft.Client']" buildPresetAdditionalArgs: "['--target', 'Minecraft.Client']"
- name: Zip Build - name: Zip Build
run: 7z a -r LCE${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Client/Release/* -x!*.ipdb -x!*.iobj run: 7z a -r LCE${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Client/Release/* "-x!*.ipdb" "-x!*.iobj"
- name: Stage artifacts - name: Stage artifacts
run: | run: |

32
Minecraft.Client/Common/UI/UIControl_Slider.cpp
View file

@ -66,12 +66,44 @@ void UIControl_Slider::init(UIString label, int id, int min, int max, int curren
#endif #endif
} }
bool IsUsingKeyboardMouse()
{
#ifdef _WINDOWS64
if (g_KBMInput.IsKBMActive()) return true;
return g_KBMInput.HasAnyInput();
#else
return false;
#endif
}
void UIControl_Slider::handleSliderMove(int newValue) void UIControl_Slider::handleSliderMove(int newValue)
{ {
if (m_current!=newValue) if (m_current!=newValue)
{ {
int valueCount = 1;
if (!m_allPossibleLabels.empty()) {
valueCount = static_cast<int>(m_allPossibleLabels.size());
}
else {
long long range = static_cast<long long>(m_max) - static_cast<long long>(m_min) + 1;
if (range <= 0) range = 1;
valueCount = static_cast<int>(range);
}
if (IsUsingKeyboardMouse() == true) {
if (newValue % 10 == 0) {
ui.PlayUISFX(eSFX_Scroll); ui.PlayUISFX(eSFX_Scroll);
m_current = newValue; m_current = newValue;
} else if (valueCount <= 20) {
ui.PlayUISFX(eSFX_Scroll);
m_current = newValue;
}
} else {
ui.PlayUISFX(eSFX_Scroll);
m_current = newValue;
}
if(newValue < m_allPossibleLabels.size()) if(newValue < m_allPossibleLabels.size())
{ {