Commit Graph
48 Commits
Author SHA1 Message Date
George V. 04f96bd254 refactor: standardize Material enum naming conventions to alling with Bukkit 1.8 2026-04-21 01:32:02 +03:00
George V. dbee55e56b feat(fourkit): add stone slab2 IDs 2026-04-21 01:32:02 +03:00
George V. eed98a6603 chore: replace backslashes with forward slashes for linux cross compilation 2026-04-20 18:15:27 +03:00
George V. d6017e4766 feat(fourkit): add the missing Lure and Luck of the Sea fishing enchantments 2026-04-19 05:32:55 +03:00
George V. eabde3527c fix: Prevent mobs from targeting players in creative mode
Mobs were incorrectly targeting and attacking players who are in
creative mode (invulnerable).
2026-04-18 20:29:47 +03:00
George V. 8098805ae6 fix: add missing material IDs to prevent server crash
Adds missing material constants (e.g. LEAVES2, LOG2, PRISMARINE,
BOOK_AND_QUILL, PRISMARINE_SHARD, doors, fences, fence gates)
so the server enum matches the client and avoids crashes.
2026-04-18 05:04:48 +03:00
George V. 00399fc2da fix: Update hardcore mode UI to correctly set gamemode slider 2026-04-17 21:37:15 +03:00
George V. 82c6c5db8f Merge remote-tracking branch 'itsRevela/main' into upstream-merge
# Conflicts:
#	.github/ISSUE_TEMPLATE/config.yml
#	.github/workflows/nightly.yml
#	Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib
#	README.md
2026-04-17 21:22:20 +03:00
George V. bd6586e45b fix: prevent crash when copying version when no ingame 2026-04-16 20:33:50 +03:00
George V. 295c4cf358 chore: remove MediaWindows64.arc asset copy for server targets 2026-04-16 20:33:50 +03:00
George V. 56705f0576 feat: add version display and copy-to-clipboard functionality
Add version string (branch/version) to the debug overlay when F3 is active.
Also add a new keyboard shortcut (B key while F3 is held) to copy the
version string to the clipboard and show a confirmation message. This
improves debugging and support by making version information easily
accessible.
2026-04-16 20:33:50 +03:00
George V. 9803addf5c chore: clean up the Minecraft.Client/Common/Media folder 2026-04-14 21:20:44 +03:00
George V. 8bfebcabf4 Merge branch 'pieeebot:main' into upstream-merge 2026-04-14 19:32:01 +03:00
George V. 1ec6244c8b Merge branch 'main' into upstream-merge 2026-04-14 18:17:50 +03:00
George V. 00af47178d refactor: Remove worldSizeChunks param from BiomeSource::findSeed 2026-04-13 23:02:05 +03:00
George V. 2ddf72a4eb fix(audio): restore missing comma lost in upstream merge
A comma between "item.armor.equip_generic6" and "damage.critical" was
accidentally dropped during an upstream merge, causing the two entries
to be concatenated into a single string literal at compile time.

This produced an invalid sound key and led to crashes when:
- equipping armor
- triggering critical hits
2026-04-13 22:45:10 +03:00
George V. c2c4eb6ea8 fix: Change string ID for Elder Guardian entity
The string identifier for the Elder Guardian entity was set
to `IDS_GUARDIAN_ELDER`. This has been changed to the
consistent identifier `IDS_ELDER_GUARDIAN`.

Additionally, the localization file has been updated to include the
missing string definitions for both `IDS_GUARDIAN` and
`IDS_ELDER_GUARDIAN`
2026-04-13 22:43:19 +03:00
George V. ac7a207597 Merge branch 'main' into upstream-merge
# Conflicts:
#	Minecraft.Client/Windows64Media/strings.h
#	Minecraft.World/BiomeSource.cpp
#	Minecraft.World/BiomeSource.h
2026-04-13 22:26:43 +03:00
George V. ed201b95c5 fix: correct asset path for MediaWindows64 in CMake configuration 2026-04-13 18:31:51 +03:00
George V. 4191b654b2 fix: add null check for TLS compression pointer 2026-04-13 18:31:01 +03:00
George V. fd21c3bc0e chore: comment out SWF asset 2026-04-13 18:12:50 +03:00
George V. 80179ae3be Merge branch 'main' into upstream-merge 2026-04-13 17:56:40 +03:00
George V. 734f186cd3 Merge remote-tracking branch 'itsRevela/main' into upstream-merge
# Conflicts:
#	Minecraft.Client/Common/Audio/SoundNames.cpp
#	Minecraft.Client/SheepRenderer.cpp
#	Minecraft.World/SoundTypes.h
#	README.md
#	cmake/CopyAssets.cmake
2026-04-13 17:54:36 +03:00
George V. edeb0d2230 Merge branch 'main' into upstream-merge
# Conflicts:
#	.github/workflows/nightly.yml
#	Minecraft.Server/cmake/sources/Common.cmake
2026-04-13 17:39:46 +03:00
George V. 5efd489229 fix: Prevent crash when displaying hardcore difficulty label
The hardcore difficulty label was using the raw string ID `IDS_HARDCORE` (oops)
instead of a localized string, which caused a crash in the UI.

Replaced `IDS_HARDCORE` with `app.GetString(IDS_HARDCORE)`
2026-04-13 17:18:15 +03:00
George V. 6d98c4ebf6 fix: Prevent gamemode slider movement when hardcore mode is enabled
Add virtual `canMoveSlider` method to UIScene base class and override it
in both LoadMenu and CreateWorldMenu scenes. The method returns false
when attempting to move the gamemode slider while hardcore mode is active,
effectively locking the slider in that state.

The UIController now checks `canMoveSlider` before initiating a slider
drag and during ongoing drag updates.
2026-04-13 17:18:15 +03:00
George V. 7d05b6a9d6 fix: Replace hardcoded "Hardcore" string with localization resource ID
Replace the hardcoded string literal "Hardcore" in the difficulty slider
label with the localization resource identifier `IDS_HARDCORE` in both
the load menu and create world menu scenes.
2026-04-12 00:41:17 +03:00
George V. bbc5d95695 Merge pull request #1 from Firebladedoge229/upstream-merge
fix building
2026-04-12 00:27:15 +03:00
George V. 401ccbcdc9 fix: lock survival when hardcore and swf changes 2026-04-12 00:22:38 +03:00
George V. 1a78363ee5 Merge branch 'main' into upstream-merge
# Conflicts:
#	Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_LoadMenu.h
2026-04-11 23:36:43 +03:00
George V. 18f7d9a219 feat: merge hardcore hearts 2026-04-11 23:10:43 +03:00
George V. 84f1382a40 chore: merge Windows 64-bit media SWF files from revelations 2026-04-11 22:31:37 +03:00
George V. 45d9d74dc8 chore: remove Graphics folder from asset copy exclusions (not final) 2026-04-11 21:26:31 +03:00
George V. 192c2a3c5c feat: implement recursive folder traversal for file indexing
The previous implementation only indexed files in the root directory,
ignoring files in subdirectories. This change adds recursive traversal
to index all files within the folder hierarchy while maintaining
relative paths for compatibility.
2026-04-11 20:49:57 +03:00
George V. 566f7ba683 chore: ignore JetBrains .idea directory 2026-04-11 19:12:28 +03:00
George V. 224dd491b9 chore: add MediaWindows64 directory to server target assets 2026-04-11 19:12:13 +03:00
George V. bb04d465db feat: replace ArchiveFile with FolderFile for media asset loading
Replace the ArchiveFile-based media asset loading system with a new
FolderFile implementation that reads files directly from a folder
structure instead of from compressed .arc archives. This change
simplifies asset management and eliminates the need for pre-packaged
media archives.

Key changes:
- Added FolderFile class that indexes and reads files from a folder
- Updated Consoles_App to use FolderFile instead of ArchiveFile
- Modified CMake asset copy configuration to exclude platform-specific
  media folders instead of .arc files
- Updated platform-specific media path references to point to folders
  instead of .arc files

This enables easier development and debugging by allowing direct access
to media files without requiring archive extraction or repackaging.
2026-04-11 18:57:54 +03:00
George V. a175854dab fix: Resolve missing Guardian files in server build causing CI failure
Add missing GuardianModel.cpp and GuardianRenderer.cpp to the
Minecraft.Server build configuration to fix compilation errors in
the debug GitHub PR workflow.

Also fix inconsistent indentation in Minecraft.Client's Common.cmake
for the GuardianModel.cpp and GuardianRenderer.cpp entries (styling only).
2026-04-11 03:05:03 +03:00
George V. a0f4063807 Merge branch 'main' into upstream-merge 2026-04-11 02:52:52 +03:00
George V. 0ad7e383fa Merge branch 'main-re' into upstream-merge 2026-04-10 22:00:17 +03:00
George V. 28cfb83682 fix: Remove duplicate STB_IMAGE_WRITE_IMPLEMENTATION include for Windows64
The Windows64 platform had duplicate include statements for
stb_image_write.h
2026-04-09 21:04:18 +03:00
George V. a0d5c649b9 refactor: remove duplicate custom name handling in boss renderers
The custom name assignment for boss mobs is already handled inside
the `BossMobGuiInfo::setBossHealth` method. The removed code in both
`WitherBossRenderer` and `EnderDragonRenderer` was redundant and not working.
2026-04-09 21:03:30 +03:00
George V. 506ebd2176 Merge remote-tracking branch 'itsRevela/main'
# Conflicts:
#	.github/workflows/nightly.yml
#	.gitignore
#	Minecraft.Client/ChatScreen.cpp
#	Minecraft.Client/ClientConnection.cpp
#	Minecraft.Client/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Common/Audio/SoundEngine.h
#	Minecraft.Client/Common/Media/MediaWindows64.arc
#	Minecraft.Client/Common/UI/IUIScene_HUD.cpp
#	Minecraft.Client/Common/UI/UIControl_Base.cpp
#	Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
#	Minecraft.Client/Common/XUI/XUI_Chat.cpp
#	Minecraft.Client/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Font.cpp
#	Minecraft.Client/Gui.cpp
#	Minecraft.Client/PendingConnection.cpp
#	Minecraft.Client/PlayerConnection.cpp
#	Minecraft.Client/PlayerConnection.h
#	Minecraft.Client/PlayerList.cpp
#	Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
#	Minecraft.Client/Windows64/Network/WinsockNetLayer.h
#	Minecraft.Client/Windows64Media/strings.h
#	Minecraft.Client/cmake/sources/Common.cmake
#	Minecraft.Server/Console/ServerCliEngine.cpp
#	Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp
#	Minecraft.Server/Windows64/ServerMain.cpp
#	Minecraft.World/WitherBoss.h
#	Minecraft.World/cmake/sources/Common.cmake
#	README.md
2026-04-09 15:21:43 +03:00
George V. c8354c8b64 chore: add GitHub workflows and issue templates
Add CI/CD workflows for nightly releases and pull request builds, along with
structured issue templates for bug reports and suggestions.

- Nightly workflow builds and releases both client and server binaries for
  Windows, creating signed tags and GitHub releases with detailed instructions.
- Pull request workflow triggers builds on PR events to validate changes.
- Issue templates guide users in reporting bugs and suggesting enhancements,
  linking to community Discord for support.
2026-04-09 14:05:12 +03:00
George V. 308c07a7fd fix: correct mode-based music selection using unified music types
Aligned with LCERenewed changes up to commit
5ec8a0e41ba8146aba450258d8620cd3cb0299e0 by 3UR after previously
porting an incorrect revision.
2026-04-08 03:34:54 +03:00
George V. ff96cd3687 feat: support separate boss health bars per dimension
Add dimension-aware tracking for boss mobs and update the boss health
GUI system to maintain independent state for each dimension (Overworld,
Nether, End). This prevents conflicts when multiple bosses exist across
different dimensions simultaneously.

- Add `getDimension()` to `BossMob` base class and implement in
  `EnderDragon` and `WitherBoss`
- Replace static boss GUI state with dimension-indexed storage
- Introduce `getIndexFromDimension()` helper for dimension mapping
- Update rendering logic to use per-dimension state
- Isolate darkening effects and health display per dimension

Ported from LCERenewed commit 5ec8a0e41ba8146aba450258d8620cd3cb0299e0 by 3UR
2026-04-08 03:34:54 +03:00
George V. 76ac11bde0 fix: handled all audio and parameter types correctly to prevent crashes
Original commit: https://github.com/Patoke/LCERenewed/commit/8658049e71723ee8d46912a050636884d3963e71
2026-04-07 09:30:16 +02:00
George V. 8445534dc1 fix(fishing): fix catch type return and correct aux value calculations
- Add missing return of CatchType in getRandCatchType
- Remove unused variable in getRandCatch
- Fix duplicate semicolon in TREASURE case
- Fix missing parentheses in fishing rod and bow calculations in handleCatch
2026-04-06 16:35:42 +03:00