Commit Graph

237 Commits

Author SHA1 Message Date
github-actions
15164dc4c8 Merge remote-tracking branch 'origin/main' into exp/achievements 2026-05-01 12:08:53 +00:00
SevenToaster509
269f8d0335 feat: classic crafting
credits: comicgab
2026-05-01 10:27:56 +01:00
SevenToaster509
feb465ccbb refactor: remove redundant commented code 2026-04-28 16:20:02 +01:00
SevenToaster509
41275f0e36 fix: make hoe/sword achievement 2026-04-28 16:19:35 +01:00
George V.
2293dcbb9f Merge remote-tracking branch 'Revelations/main' into upstream-merge
# Conflicts:
#	.github/workflows/nightly.yml
#	CMakeLists.txt
#	Minecraft.Client/CMakeLists.txt
#	Minecraft.Client/StringTable.cpp
#	Minecraft.Server/FourKitNatives.cpp
#	Minecraft.Server/Windows64/ServerMain.cpp
#	Minecraft.World/BiomeDecorator.cpp
#	Minecraft.World/BiomeSource.cpp
#	Minecraft.World/cmake/sources/Common.cmake
#	README.md
#	cmake/ServerTarget.cmake
2026-04-28 03:01:30 +03:00
SevenToaster509
e776c55a2b feat: change achievement description bind
went from TAB to RIGHT CLICK
2026-04-27 18:35:18 +01:00
piebot
de1b069835 mfeat(TU30): achievements 2026-04-27 05:33:47 +03:00
ModMaker101
cbdb92d045 Replace MSVC __debugbreak with cross-compiler DEBUG_BREAK macro. (#1540) 2026-04-26 15:38:13 -05:00
SevenToaster509
57de83add1 fix: achievements (2)
Make menu more accurate
Add Achievements option to Main Menu
Force achievements to save when saving the level
Fix a random crash i was getting
2026-04-26 20:12:34 +01:00
Fireblade
e85ca7d644 fix: move level 4 potions slightly forward
the 4j creative menu code is a mess holy
2026-04-26 14:16:16 -04:00
SevenToaster509
ae5a86d082 fix: achievements
Added "unimplemented" achievements
Fix image renaming breaking icons
Fix "Diamonds to you" strings
Readd broken assertion - I'm not entirely sure if its fixed, and you may need to delete profile0.dat to make it not assert on older saves.
2026-04-26 17:27:31 +01:00
SevenToaster509
34504b7b93 feat: achievements
fully functional but some achievements dont work yet

EXPERIMENTAL!!!!
2026-04-26 15:27:19 +01:00
Fireblade
a54552950a fix: tu31 potions in creative menu + level 2 abilities 2026-04-26 00:22:49 -04:00
Tranqlmao
4b6e9f8eb2 Elytra
mfeat: added early access elytra in creative for bug testing/accuracy comparison
TODO: replace temporary atlas, Properly implement 3d skulls
2026-04-24 20:00:35 -04:00
piebot
5d0c126898 feat: leaderboards! (technically a fix but whatever)
feat. leaderboard
2026-04-22 14:05:24 +03:00
rockefort
918d8bb72f Merge branch 'pieeebot:main' into main 2026-04-22 02:31:25 -03:00
Frcoxd
04f22ee4f0 Fix: Fixed the ghost tab created by join 2026-04-22 02:30:39 -03:00
albertbogusz
05c492d6d4 fix: correct casing for include header for Linux build 2026-04-21 20:58:25 +01:00
Fireblade
1d78fdb33a feat. leaderboard + fix for building on linux 2026-04-21 13:26:09 -04:00
Frcoxd
637bcf7702 Fix: Fixed the double press sound on more options againg on the loadmenu and create world menu
and fix the bug where the save thumbnail wasn't displaying correctly in loadmenu
2026-04-21 00:38:41 -03:00
Frcoxd
4b8ce04efb feat: LoadCreateJoinMenu1080 (alfin wn) 2026-04-20 23:32:59 -03:00
Frcoxd
6d170fa3da Feat: LoadCreateJoin (alfin kliado) 2026-04-20 23:28:09 -03:00
Lord_Cambion
4c8e38c721 feat: stoneslab2
fully implemented stoneslab2 with craftings and revisited existing slabs according to wii u decomp

todo:Material.cs
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
SevenToaster509
a3ac98884e fix: load/create at lower resolutions, chore: remove console spam 2026-04-19 11:56:34 +01: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
itsRevela
ce2efc1a4d fix: crash when opening UI scenes at sub-720p window size
SWF movie loading crashed with __debugbreak when the window height was
below 720px (e.g. after leaving exclusive fullscreen). The fallback
chain only tried 720.swf which doesn't exist. Now falls back through
720 -> 1080 so scenes always find a valid SWF.
2026-04-17 07:07:02 -05:00
itsRevela
59f9dbc8c6 fix: hardcore mode UI not locking difficulty/gamemode on world load
Three issues fixed:

- Save file path used hardcoded saveData.ms but new 4JLibs names files
  as <title>.ms. ReadLevelNameFromSaveFile now constructs the correct
  path with fallback to saveData.ms for old saves.
- The level.dat code path for reading the hardcore flag (sidecar rename)
  returned early without ever parsing level.dat. Now stores the sidecar
  name and continues to read the hardcore flag from NBT.
- The thumbnail host options path could overwrite m_bHardcore to false.
  Now only upgrades to true, never downgrades.
- Load menu constructor and tick handler both lock difficulty slider to
  Hardcore and gamemode to Survival when hardcore is detected.
- Hide title logo on load menu to match create world menu.
2026-04-17 07:06:26 -05:00
DrPerkyLegit
9ddb95e7ad Fix broken Chat Formatting behavior (#1520)
- Remove shadowcolor from font tags (Iggy doesn't support multiple)
- Enforce HTML text mode on chat labels and jukebox
- Move IDS translatable pattern matching into FormatChatMessage
- Add §r (reset) color code support
- Fix message truncation to count visible characters, skipping HTML tags
- Fix CJK truncation using raw index instead of visible char count
2026-04-17 05:52:26 -05:00
dtentiion
8464bfd448 fix: Skin pack names showing only first letter after 4JLibs update (#1518) 2026-04-17 05:49:22 -05:00
SevenToaster509
2b5a46a4fa fix: enchanting
fixes:
fishing rod crashing in enchantment table
updated more swfs that were not updated in a recent merge
sort costs in ascending order
randomise enchantment seeds for new players
2026-04-17 08:26:13 +01:00
SevenToaster509
add784b259 fix: clients crashing on enchantment attempt, disabled quick equip until further notice, updated enchantingmenu swfs because lapis slot was missing? 2026-04-16 20:47:14 +01: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
SevenToaster509
f307d7b0eb Fix: Enchanting Table taking wrong levels
Was using cost instead of the index of the slot
2026-04-13 17:25:19 +01:00
SevenToaster509
5656aa979f Fix: Controller support broken on LoadMenu
SWF updates:
LoadMenu1080
CreateWorldMenu1080
2026-04-13 16:35:46 +01: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
SevenToaster509
0606ce717d Refactor: Allow slider to be set
WARNING: REQUIRES ARC TO BE EDITED TO FUNCTION, PUSHED THIS TASK TO georgev22
2026-04-13 15:30:40 +01: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
DrPerkyLegit
71707fbb8c Add Chat Formatting Support For Servers (#1483) 2026-04-13 00:49:49 -05:00
DrPerkyLegit
6c572d4940 feat: Scrollable chat (#1493) 2026-04-13 00:42:04 -05:00
SevenToaster509
e0cc846be5 Fix: Lapis Slot for Enchanting takes and consumes any item 2026-04-12 18:42:59 +01:00
SevenToaster509
48ce29a28e Fix: Clicking book while signing removes signing text, Clicking book when book is signed allows text editing, Added default resolution to not crash on smaller screens (720p and less) 2026-04-12 18:25:27 +01: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.
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
SevenToaster509
a58b14a2ea Feat: Changed game mode selection to a slider 2026-04-11 20:03:09 +01:00