Commit graph

106 commits

Author SHA1 Message Date
Tropical a856a7e54e fix: rebase issue with CreativeInventoryScreen 2026-03-29 16:12:30 -05:00
Tropical 3653b7b465 fix: readjust VideoSettingsScreen ITEM_COUNT 2026-03-29 15:53:10 -05:00
Tropical ad67f4be71 refactor: configure classic panorama at compile-time 2026-03-29 15:53:10 -05:00
Sally Knight ca276943f2 fix(jui): make creative screen correctly override menu clicked()
(also made rendertooltip names in AbstractContainerScreen match so my editor stops complaining)
2026-03-29 15:52:38 -05:00
Sally Knight cd6959b989 chore: fmt 2026-03-29 15:52:38 -05:00
StevenSYS 7889fbb4d2 [Java Creative Inventory] Added tooltip when hovering over the tab icons. 2026-03-29 15:52:38 -05:00
Sally Knight 1ab985805a feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
Sally Knight 03fac5b8e1 refactor(jui): backport tooltip overloads from JE 1.6.4 2026-03-29 15:52:34 -05:00
Sally Knight cfb54e65bd fix(jui): accidental ! in deprecated recipe check 2026-03-29 15:52:19 -05:00
Sally Knight 97c6704d82 feat(jui): add merchant screen 2026-03-29 15:52:19 -05:00
Sally Knight 32149b7ec3 refactor(jui): backport hovering over helper from 1.6.x 2026-03-29 15:52:18 -05:00
Sally Knight 80966a501c refactor(jui): extract tooltip rendering into standalone method
so we can use tooltips elsewhere (the upcoming merchantscreen more specifically)
2026-03-29 15:52:18 -05:00
Sally Knight affe60603c make AbstractContainerScreen's itemRenderer protected 2026-03-29 15:52:18 -05:00
Sally Knight 3dcc985cd4 feat(jui): add brewing stand screen (+ fix enchantment screen not being used) 2026-03-29 15:52:18 -05:00
Sally Knight ed83397c55 chore(jui): remove inaccurate "unused" comments 2026-03-29 15:52:18 -05:00
Sally Knight 141678ed96 fix(jui): add Slot.h include
Fixes clang builds
2026-03-29 15:52:18 -05:00
Sally Knight 678a186c46 fix(jui): put button render method behind ifdef
Fixes build error if using iggy instead of jui
2026-03-29 15:52:18 -05:00
Sally Knight 02845d9a5f chore: fmt 2026-03-29 15:52:18 -05:00
Sally Knight 1a478c8a5b refactor(jui): specify overrides, resourcelocations, and localization 2026-03-29 15:51:23 -05:00
Sally Knight c512bcb19c feat(jui): add enchanting table screen 2026-03-29 15:50:37 -05:00
Sally Knight 5ac7f23577 feat(jui): add hopper screen 2026-03-29 15:50:36 -05:00
StevenSYS b854af49c6 Added option to use the TU panorama or the Java one. 2026-03-29 15:50:36 -05:00
Sally Knight 975f716f9c feat(jui): re-enable and update TrapScreen
(Dispenser and Dropper GUI)
2026-03-29 15:50:36 -05:00
Sally Knight fbbf086f71 feat(jui): add anvil screen 2026-03-29 15:50:35 -05:00
Sally Knight 9a2062c70a fix(jui): always use white if background is disabled in EditBox 2026-03-29 15:50:35 -05:00
StevenSYS d18733b14c Ported over the Java Edition's title screen panorama. 2026-03-29 15:50:35 -05:00
Sally Knight a9a3cbb0f5 fix(jui): disable isConstantBlended for hotbar slot rendering
Fixes the issue where in the java UI hotbar, enchant glints make the item appear as a black texture
2026-03-29 15:50:34 -05:00
Sally Knight 2131c12de7 feat(jui): make edit box background be able to get disabled 2026-03-29 15:50:34 -05:00
Sally Knight 5f5e7e7f99 feat(jui): add item switch tooltips 2026-03-29 15:50:34 -05:00
Sally Knight 11e944f78b fix(jui): remove debug autoconfirm from ConfirmScreen 2026-03-29 15:50:34 -05:00
Sally Knight 7a0ebe7e36 fix(jui): remove debug world autocreate from CreateWorldScreen 2026-03-29 15:50:34 -05:00
Sally Knight 08a87c432a fix: put jui-specific texture usage behind ifdefs 2026-03-29 15:50:34 -05:00
Sally Knight 65ff6a97f0 feat(jui): add horse inventory screen 2026-03-29 15:50:34 -05:00
Sally Knight 3f2c6e0012 feat(jui): add panorama and splashes to title screen
Also moved the version string to the same height as the copyright message, matching Beta 1.8+
2026-03-29 15:50:34 -05:00
StevenSYS 396e819b9b
Made the Java creative inventory more complete. 2026-03-27 14:32:47 +00:00
Tropical d4af59cf77 Merge branch 'dev' into tu19-take-2 2026-03-24 19:12:19 -05:00
Sally Knight a604a5e803 fix: lock Gui.cpp HUD back behind java gui 2026-03-24 17:52:14 +03:00
Sally Knight 5806fea864 TU19: merge UI/Gui 2026-03-24 17:33:13 +03:00
Sally Knight ba406c7e97 fix(jui): add null check for items to renderSlot()
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
2026-03-24 07:08:37 +03:00
Sally Knight e972d8095d fix(jui): use ResourceLocation for TN_GUI_GUI and TN_GUI_ICONS 2026-03-24 06:48:07 +03:00
Tropical 4d1e34dab0 Merge branch 'dev' into tu19-take-2 2026-03-23 03:45:22 -05:00
ViniciusCruzMoura 94cabbe01b fix(SelectWorldScreen): open Select World instead of Create New World
i restored the Select World scene so it no longer immediately opens
"Create New World"

i wrapped the not used code in if (0) so its ignored at runtime
but still compiled to catch build breaks. fixing the Select World scene
also fixed the Cancel button so you can go back to the previous scene
(before it was stuck on Create New World)

i didnt remove the weird code because i dont know why its there
left it disabled for now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
2026-03-23 02:03:38 -04:00
Tropical 59243889ad fix a bunch of undefined refs 2026-03-22 15:27:46 -05:00
Tropical 3b77d6d806 update NetworkPlayerXbox, SimpleContainer fixes 2026-03-22 12:50:01 -05:00
Tropical b9d18bf641 TU19: merge Minecraft.Client/Platform/Common/UI 2026-03-22 11:44:26 -05:00
Tropical 1c5311f058 fixes to java UI and Minecraft.cpp 2026-03-22 04:14:58 -05:00
Tropical 03355211ca more fixes 2026-03-22 03:13:45 -05:00
Tropical ad5e8dd012 getting further 2026-03-22 02:52:30 -05:00
Tropical 6e09aa7600 add BossMobGuiInfo to UI 2026-03-21 22:58:00 -05:00
Vinícius Moura 7775c59e3c
Merge branch '4jcraft:dev' into java_exit_btn_behaviour 2026-03-21 16:25:07 -04:00