backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-08 13:33:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1534 commits 11 branches 1 tag 1.7 GiB
Commit graph

921 commits

Author SHA1 Message Date
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 bdebc23e91 fix(jui): open hopper screen for minecart hopper as well 2026-03-29 15:50:36 -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 11f71c12b2 chore: fmt 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
Sally Knight 0728ac8731 fix(jui): tick screen even if not ingame 
required for title screen panorama
 2026-03-29 15:50:34 -05:00
aedanmills 740f1b5c64 Update 2026-03-28 22:53:15 -04:00
aedanmills 75d83a4556 Fixed broken quit game button again. 2026-03-28 21:01:28 -04:00
orng 659b9c32cb fix: OOB when iterating over all cube faces 2026-03-28 13:50:35 -05:00
orng f614e661d2 refactor: remove PolygonArray 2026-03-28 13:34:20 -05:00
orng 5ba20b155c refactor: remove VertexArray 2026-03-28 12:53:07 -05:00
Tropical eb7bb6e518
Merge pull request #330 from 4jcraft/meson-options-cleanup
Some checks are pending
Publish Documentation / build (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details 
refactor: rework meson options, fix ENABLE_VSYNC
 2026-03-28 11:12:24 -05:00
orng a0be2e2fb5 refactor: remove aabb tls 2026-03-28 03:05:06 -05:00
orng 7101d03c6a refactor: remove heap-allocated AABBs 2026-03-28 02:58:56 -05:00
Tropical 939310be64 refactor: rework meson options, fix ENABLE_VSYNC 2026-03-28 02:13:27 -05:00
orng ddfe9b3d48 refactor: make Tile::getTileAABB return AABB 2026-03-28 00:30:07 -05:00
orng 78b5255224 refactor: make AABBList own its values 2026-03-27 22:37:22 -05:00
orng d7d99db4c5 refactor: remove AABB::newTemp when not returned 2026-03-27 21:56:57 -05:00
orng 534879e2e7 refactor: replace AABB::newPermanent with new AABB 2026-03-27 21:17:55 -05:00
orng 79217ca8e3 refactor: modernize AABB class 2026-03-27 21:11:11 -05:00
ffqq 016a3ebfb4
Merge branch '4jcraft:dev' into dev 2026-03-28 03:48:04 +03:00
Sally Knight 40a3f90d89 fix: add null check to renderItemInHand 2026-03-28 03:47:49 +03:00
Tropical 9bed5431eb
Merge pull request #310 from 4jcraft/refactor/replace-winapi-stubs 
refactor: finish up removing `Tls*` functions from linux code
 2026-03-27 18:53:22 -05:00
Tropical 06c73c821c
Merge pull request #312 from 4jcraft/refactor/replace-sleep 
refactor: replace win32 thread sleeping and yielding with `std::thread` primitives
 2026-03-27 18:47:47 -05:00
Tropical 8b11eb7a3a
Merge branch 'dev' into refactor/replace-winapi-stubs
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details
2026-03-27 18:35:12 -05:00
Tropical e38f162c10
Merge pull request #314 from Merc6/refactor/remove-vec3-tls 
refactor: remove vec3 tls
 2026-03-27 18:19:21 -05:00
JuiceyDev 6be5f627ef make consoles_app use pathhelper :)
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details
2026-03-27 20:57:46 +01:00
JuiceyDev 21fc2166ff cleaned up, less hacky, more silly 2026-03-27 20:54:21 +01:00
JuiceyDev ca84ac0512 okay managed to do it, anyways hacky code land :3 
mainly rewrote a bit of the soundengine, made files now load without being mean and uh yeah it works
 2026-03-27 18:07:38 +01:00
StevenSYS 396e819b9b
Made the Java creative inventory more complete. 2026-03-27 14:32:47 +00:00
JuiceyDev 256a809750 feat/bttr-cwd 2026-03-27 11:52:05 +01:00
orng 20982f11c1 chore: format files touched by refactor/remove-vec3-tls 2026-03-26 14:13:45 -05:00
orng 87e8078a65 refactor: remove new Vec3 2026-03-26 14:01:14 -05:00
orng 9fe3315112 refactor: remove vec3 tls 2026-03-26 13:37:01 -05:00
orng e887c8cf45 refactor: remove calls to Vec3::newTemp and Vec3::newPermanent 2026-03-26 13:29:05 -05:00
orng bee10e55a8 refactor: remove calls to Vec3::newTemp when not returned 2026-03-26 04:19:04 -05:00
orng 7b021bc99d wip: removing vec3 tls 2026-03-26 01:10:27 -05:00
Tropical cbca0280b4 rust brainrot 2026-03-25 19:21:36 -05:00
Tropical b598aa9232 fix: only use InterlockedCompareExchangeRelease64 on LP64 systems 2026-03-25 19:20:18 -05:00
Tropical caf7128d58 refactor: remove Sleep from winapi_stubs 2026-03-25 19:14:53 -05:00
Tropical d9f03fdddf refactor: replace 0ms sleep with a proper yield 2026-03-25 19:13:12 -05:00
Tropical 8e94b763a7 refactor: remove usage of win32 Sleep function for this_thread::sleep_for 2026-03-25 19:12:11 -05:00
orng 9ea379eb44 chore: fix formatting in files touched by 
refactor/remove-BasicTypeContainers
 2026-03-25 18:01:56 -05:00
orng f1ae42c659 refactor: remove basic type containers 2026-03-25 17:51:27 -05:00
Tropical 9fec342554 remove TlsAlloc, TlsFree, TlsGetValue, TlsSetValue 2026-03-25 16:32:06 -05:00
Tropical 7b18641f70 chore: clean up unused code from Linux_Minecraft.cpp 2026-03-25 16:24:45 -05:00
Tropical aff677a995 chore: fmt 2026-03-25 16:08:00 -05:00
Tropical 30170b8f9c adjust naming scheme of private TLS members 2026-03-25 14:46:16 -05:00
Tropical 9ff2fb4fef refactor: switch to thread_local in Chunk, PistonBaseTile, TheEndPortalTile, Compression 2026-03-25 14:41:08 -05:00
Tropical 625ce97385 refactor: use thread_local in OldChunkStorage, FireworksRecipe, Level, Entity 2026-03-25 14:13:00 -05:00
Tropical 03f62dcb9e refactor: FireworksRecipe thread-local storage 2026-03-25 12:59:15 -05:00
Tropical a82d76ca46 refactor: Tesselator thread-local storage 2026-03-25 12:43:41 -05:00
orng 1538074b4d refactor: remove integer caching 2026-03-25 02:47:51 -05:00
Tropical ed726d291a fix: properly bind minecart texture
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details 
happened because of a bad merge
 2026-03-24 23:17:47 -05:00
Tropical 237eae2573 add back SoundEngine impls from merge 2026-03-24 19:17:00 -05:00
Tropical d4af59cf77 Merge branch 'dev' into tu19-take-2 2026-03-24 19:12:19 -05:00
Sally Knight 5972c01ed4 fix: use original gui tile rendering (again) for proper lighting
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-25 00:07:11 +03:00
Tropical e473825c76 fix: off-by-one in enchantment buttons 2026-03-24 15:45:59 -05:00
Tropical 69530dcccf Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-24 15:27:58 -05:00
Tropical 74252cc8d2 fix: slotId parsing in enchantment menu 2026-03-24 15:26:05 -05:00
Sally Knight d6070001d0 fix(jui): re-enable screen reinitialization on resize 2026-03-24 22:38:54 +03:00
Tropical ca533de1c3 Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-24 14:27:14 -05:00
Tropical a29b6ad45d refactor: cleanup UTF-16 digit parsing functionality 2026-03-24 14:27:07 -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
Tropical 1fcd456c30 fix iggy skin selector (again)
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-24 00:55:24 -05: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
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-24 07:08:37 +03:00
Sally Knight 98b9cf6147 fix(jui): cast the tileEntity in openTextEdit() as a sign 2026-03-24 07:01:17 +03:00
Sally Knight 135b403af1 set default gui scale to large 2026-03-24 07:00:42 +03:00
Sally Knight f6e151265c fix(jui): mouse unlocking while in a screen 2026-03-24 07:00:21 +03:00
Sally Knight 3310481ca3 fix(jui): use the same iggy scalings for java UI 2026-03-24 06:59:49 +03:00