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

639 commits

Author SHA1 Message Date
niansa 2b88d096d6 Fixed more inconsistencies around win64 macro and iggy 2026-03-13 12:34:28 -05:00
Tropical 00a5fba311 fix: comment IggyGDrawMallocAnnotated 
prevents a symbol redefinition linker error
 2026-03-13 12:34:28 -05:00
Tropical 6a88c43d94 fix: comment out duplicated symbols for the time-being 2026-03-13 12:34:28 -05:00
JuiceyDev 6fd48242ae GDraw_glfw trans ition to GDraw_sdl :) (#188) 
Co-authored-by: Tropical <42101043+tropicaaal@users.noreply.github.com>
 2026-03-13 12:34:28 -05:00
Tropical b63f4171d7 chore: set RENDER_HUD to 0 for now 2026-03-13 12:34:27 -05:00
niansa/tuxifan 5c5f533cdd Add Linux version of Iggy [Please Squash into feat branch] (#182) 
* Added Linux version of Iggy

* Expose audio functionality

* Reimplemented IggyAudioOutParamExtendedInformation more carefully

* Link to .o files directly

* Allow required SWF files to be loaded on Linux

* Some other misc ifdef WINDOWS64 fixes

* Another ifdef windows64 fix
 2026-03-13 12:34:27 -05:00
Tropical 177ed6d176
Merge pull request #215 from 4jcraft/dev 
just merging all of the dev branch stuff into the java gui branch
 2026-03-13 12:11:37 -05:00
Tropical 44ade1f2b2
Merge pull request #149 from MatthewBeshay/issue/51-phase-1-portable-win32-cleanup 
Draft: remove Win32 types from portable code
 2026-03-13 11:58:09 -05:00
Sally Knight 7fe14f92bb fix: unconditionally enable GL_ALPHA_TEST in renderLevel 
Fixes a similar issue to #200 but for the Nether
 2026-03-13 19:09:21 +03:00
Leah Anderson 2fd1a136df
Merge pull request #210 from lotaviods/creative_java_gui
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 
(java gui) Implement Creative Inventory screen and container
 2026-03-13 09:23:28 -06:00
Sally Knight e4428a983a feat: backport more advanced world creation screen from 1.3.2 
Main reference used was MCP 7.1
This allows players to toggle:
Gamemodes
Structure generation
Flat/normal world generation
Cheats (needs chat fully implemented to work however)
 2026-03-13 16:52:34 +03:00
notmatthewbeshay 00d65b8487 Address remaining review feedback on buffer reads 2026-03-13 20:11:00 +11:00
notmatthewbeshay 883e98bde0 Address review feedback on protocol types 2026-03-13 19:47:32 +11:00
lotaviods 66fb0f1a96 feat: Implement creative inventory 2026-03-13 03:22:42 -03:00
Tropical 8f10806f70 Merge branch 'dev' into feat/restore-java-gui
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
2026-03-13 01:02:17 -05:00
notmatthewbeshay bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup 
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
 2026-03-13 15:16:43 +11:00
notmatthewbeshay e3d910c6a1 Merge remote-tracking branch 'origin/issue/51-phase-1-portable-win32-cleanup' into issue/51-phase-1-portable-win32-cleanup 2026-03-13 15:12:53 +11:00
notmatthewbeshay 85208b12b7 Keep network player limit as an int constant 2026-03-13 15:12:25 +11:00
Acemany 3cbd496186
Fix File class' delimeter and homepath detection 
meow :3
deleted Minecraft::OS enum because we have #ifdef
mrrrp
changed save directory name to not mess with minecraft java
 2026-03-13 06:10:44 +03:00
Tropical 807af92321
Merge pull request #169 from nikita-edel/fix-with-ubsan
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 
enhancement: make LCE runnable with UBSan and fix: alot of UB
 2026-03-12 21:14:17 -05:00
Sally Knight e41abdb9da fix: make sure to enable alpha test for short/tiny view distances 2026-03-13 00:36:39 +03:00
Sally Knight 8e26b471ea fix: remove unused GLFW include 
was causing CI failure
 2026-03-12 22:13:08 +03:00
Nikita Edel 99c763e68a typo 2026-03-12 17:34:17 +01:00
Nikita Edel ee33f0663f Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 17:17:38 +01:00
Nikita Edel 6d952e24f5 revising everything 2026-03-12 16:42:36 +01:00
Leah Anderson a386bcfbfd
Merge pull request #191 from 4jcraft/chore/remove-pragma-warning
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 
chore: remove `#pragma warning` directives
 2026-03-12 08:17:48 -06:00
Nikita Edel 6cfc1efec2
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 14:40:02 +01:00
Sally Knight 5525aac9d5 fix: reorder and correct lighting for blocks in container screens 2026-03-12 16:07:16 +03:00
Sally Knight e66f279a5b Merge branch 'dev' into feat/restore-java-gui 2026-03-12 16:01:31 +03:00
Sally Knight 4b8d65d5e6 fix: use original disabled transforms to fix hotbar block lighting 2026-03-12 03:50:34 +03:00
MatthewBeshay dbdf4fdd22
Merge branch 'dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-12 10:21:19 +11:00
Sally Knight 10a1095ab2 fix: add proper head movement to player inventory preview 2026-03-12 02:07:36 +03:00
Sally Knight 3031f64401 fix: restore rainfall visibility by removing top edge transparency 2026-03-12 00:53:50 +03:00
Tropical ae84186d3a chore: remove #pragma warning directives 
These are only recognized by MSVC and will throw *additional* warnings on other compilers.
 2026-03-11 16:49:12 -05:00
Tropical 0577d994f3 Merge branch 'dev' into feat/restore-java-gui
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
2026-03-11 15:21:48 -05:00
ffqq d83f10c648
fix: correct cloud day/night coloring using disabled tesselator method (#189) 2026-03-11 15:16:19 -05:00
Nikita Edel b47ee34a61
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-11 19:25:14 +01:00
Nikita Edel ec82ee1ea1 final commit 2026-03-11 19:22:28 +01:00
Nikita Edel faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Nikita Edel cc65f7ee29 FINALLY LOADS IN, crashes when clicking :( 2026-03-11 18:01:00 +01:00
Nikita Edel 69a8ce84b9 giant batch BOOOOM 2026-03-11 17:28:13 +01:00
Nikita Edel ed13020cf3 s integer overflow, unsafe cast 2026-03-11 16:10:48 +01:00
Sally Knight 798781c10a fix: use proper pixel format for the minimap 
fixes pink maps
 2026-03-11 17:37:27 +03:00
Nikita Edel a24f9f5a5e better rounding and s int overflow 2026-03-11 14:21:04 +01:00
Nikita Edel 5aef20e37e fixed rounding, mb 2026-03-11 14:13:32 +01:00
Nikita Edel 8395277c0c shift of signed int, s int overflow 2026-03-11 13:36:44 +01:00
Nikita Edel 63e4b9b18a next little patch of ub, unallocated variable, s int overflow 2026-03-11 13:36:44 +01:00
Nikita Edel 11aa08aece
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-11 11:57:46 +01:00
MatthewBeshay a9d1322a6e
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-11 19:53:03 +11:00
Echo J. e9fe7fee4d LevelRenderer: Add missing namespace for player variable 
This caused compile errors on my GitHub Actions instance
 2026-03-11 08:18:29 +00:00
MatthewBeshay 42508c8399
Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup 2026-03-11 18:27:03 +11:00
notmatthewbeshay 50693bfc20 Use unique thumbnail callback thunks in UI scenes 2026-03-11 18:20:13 +11:00
JuiceyDev 8085703dbc
Merge pull request #176 from 4jcraft/feat/sprint-key 
feat(input): add sprint keys
 2026-03-11 08:11:21 +01:00
Tropical 9acefd2cc6 fix: hotbar selection indicator being chopped off at the bottom
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
2026-03-11 01:27:02 -05:00
notmatthewbeshay 5f8c9c8a25 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 17:09:16 +11:00
Tropical 0c1ae27810 Merge branch 'dev' into feat/restore-java-gui 2026-03-11 00:44:30 -05:00
notmatthewbeshay f187f89dc3 Use standard thumbnail callbacks in storage 2026-03-11 16:29:02 +11:00
notmatthewbeshay d2156d417c Use standard types in profile content helpers 2026-03-11 16:23:57 +11:00
notmatthewbeshay 1490d0b067 Use standard callback cookies in profile manager 2026-03-11 16:21:14 +11:00
notmatthewbeshay 2b638adf93 Use standard types in storage callbacks 2026-03-11 16:12:53 +11:00
notmatthewbeshay a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
Tropical 2c3a816e4b
Merge pull request #175 from realffqq/dev 
fix: restore and fix entity, block and hand lighting
 2026-03-10 23:59:42 -05:00
notmatthewbeshay 082dc2033d Use standard DLC mount callback types 2026-03-11 15:46:23 +11:00
notmatthewbeshay 2256d0fadd Remove legacy Win32 thread entry state 2026-03-11 15:38:53 +11:00
notmatthewbeshay e18941ced7 Use fixed-width pixel data in stitched textures 2026-03-11 15:38:53 +11:00
notmatthewbeshay e5d5fb07be Use standard sizes in texture pack locators 2026-03-11 15:38:52 +11:00
notmatthewbeshay 1bf50e2549 Use fixed-width language IDs in sign rendering 2026-03-11 15:38:52 +11:00
notmatthewbeshay 52eb80c3eb Use fixed-width tick counts in tutorial timing 2026-03-11 15:38:52 +11:00
notmatthewbeshay 1265358aec Use standard dialog ID arrays in common UI 2026-03-11 15:38:52 +11:00
notmatthewbeshay fa90fa45e7 Remove unused Win32 timestamp from tutorial messages 2026-03-11 15:38:52 +11:00
notmatthewbeshay 36b0e1efbf Use bool for system music state 2026-03-11 15:38:52 +11:00
notmatthewbeshay 2975a43ad2 Use standard RTT types in server player 2026-03-11 15:38:52 +11:00
notmatthewbeshay e055d8d121 Use standard types in stats state 2026-03-11 15:38:52 +11:00
notmatthewbeshay 2b5574af95 Use standard types in client connection state 2026-03-11 15:38:51 +11:00
notmatthewbeshay 4460bca43f Use standard types in minecraft state 2026-03-11 15:38:51 +11:00
notmatthewbeshay a3ea98d3ad Use standard types in server implementation 2026-03-11 15:38:51 +11:00
notmatthewbeshay c0f890b323 Use fixed-width casts in skin bitmask macros 2026-03-11 15:38:51 +11:00
notmatthewbeshay 4b5ca6d496 Use standard colour table lengths in texture packs 2026-03-11 15:38:51 +11:00
notmatthewbeshay 9c9fff7366 Use standard message option arrays in network flows 2026-03-11 15:38:51 +11:00
notmatthewbeshay e5504399ca Use fixed-width texture channel casts 2026-03-11 15:38:51 +11:00
notmatthewbeshay a1fdebbc3b Use standard skin locals in player code 2026-03-11 15:38:51 +11:00
notmatthewbeshay 1ab9750fd6 Use standard byte buffers in schematic saves 2026-03-11 15:38:51 +11:00
notmatthewbeshay 025d8184d8 Use standard byte types in game rule manager 2026-03-11 15:38:51 +11:00
notmatthewbeshay bfa2fd6715 Remove UINT from game rule manager sizes 2026-03-11 15:38:51 +11:00
notmatthewbeshay 29edda1cc7 Remove UINT from game rule attribute writers 2026-03-11 15:38:50 +11:00
notmatthewbeshay 7a0d3f709e Remove DWORD from DLC audio parsing 2026-03-11 15:38:50 +11:00
notmatthewbeshay 491783c301 Use fixed-width skin IDs in DLC files 2026-03-11 15:38:50 +11:00
notmatthewbeshay a798d0f174 Use standard mount and licence types in DLC packs 2026-03-11 15:38:50 +11:00
notmatthewbeshay 86002c2f18 Use standard counts in DLC packs 2026-03-11 15:38:50 +11:00
notmatthewbeshay 3c2669b2a7 Use fixed-width pack IDs in DLC packs 2026-03-11 15:38:50 +11:00
notmatthewbeshay 80d035d137 Use portable file reads in DLC manager 2026-03-11 15:38:50 +11:00
notmatthewbeshay 6556b316dc Use standard counters in DLC manager 2026-03-11 15:38:50 +11:00
notmatthewbeshay 68661e1d44 Use standard pre-login indices in client connection 2026-03-11 15:38:50 +11:00
notmatthewbeshay ab89d415a2 Use standard message option arrays in app flows 2026-03-11 15:38:50 +11:00
notmatthewbeshay fba6dd8275 Use standard temporary counters in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay b7886c46d7 Use standard locale IDs in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 1b6447a3ca Use standard DLC content types in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 1ba21c1250 Use standard DLC image buffers in app structs 2026-03-11 15:38:49 +11:00
notmatthewbeshay 09b12e287c Use standard notification data in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay c1594579a2 Use standard banned list buffers in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 7ae8c7c373 Use standard TMSPP buffers in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 05f47282da Use standard DLC file buffers in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay 64322c07a3 Use standard tip IDs in common app 2026-03-11 15:38:49 +11:00
notmatthewbeshay c8150b1338 Use standard small IDs in player colour tracking 2026-03-11 15:38:49 +11:00
notmatthewbeshay bdb3341a99 Use standard launch data buffers in common app 2026-03-11 15:38:48 +11:00
notmatthewbeshay c0e59f652e Use standard banned list buffers in app structs 2026-03-11 15:38:48 +11:00
notmatthewbeshay 3f8374bc45 Use standard skin IDs in common app helpers 2026-03-11 15:38:48 +11:00
notmatthewbeshay 09d56dc853 Use standard skin and cape IDs in common app 2026-03-11 15:38:48 +11:00
notmatthewbeshay 1bd031eacb Use standard invite types in common app 2026-03-11 15:38:48 +11:00
notmatthewbeshay 268ae0388f Use standard booleans in client connection checks 2026-03-11 15:38:48 +11:00
notmatthewbeshay 015fce0b3a Use standard wide strings in credit text 2026-03-11 15:38:48 +11:00
notmatthewbeshay 828ab5e277 Use standard types in invite join flow 2026-03-11 15:38:48 +11:00
notmatthewbeshay c9f96cae17 Use standard callback params in network session updates 2026-03-11 15:38:48 +11:00
notmatthewbeshay 8302870fec Use standard wide string returns for tutorial messages 2026-03-11 15:38:48 +11:00
notmatthewbeshay 09896918cd Use standard wide string returns in game rules 2026-03-11 15:38:47 +11:00
notmatthewbeshay dd726f8ba1 Use standard callback params in common app 2026-03-11 15:38:47 +11:00
notmatthewbeshay d0a741544c Use standard action helper types in common app 2026-03-11 15:38:47 +11:00
notmatthewbeshay f7e6b02835 Use standard callback types in 4J input headers 2026-03-11 15:38:47 +11:00
notmatthewbeshay d285f41969 Use standard types in keyboard request APIs 2026-03-11 15:38:47 +11:00
notmatthewbeshay b82e0af700 Use portable file reads for debug save transfer 2026-03-11 15:38:47 +11:00
notmatthewbeshay fdf2a6fa78 Remove DWORD from UI thumbnail callback headers 2026-03-11 15:38:47 +11:00
notmatthewbeshay 02d3bba5f0 Use standard buffer types in load or join save transfer 2026-03-11 15:38:46 +11:00
notmatthewbeshay bd5b092357 Remove Win32 local state from common UI helpers 2026-03-11 15:38:46 +11:00
notmatthewbeshay dc342c092d Remove Win32 wide char aliases from DLC UI flows 2026-03-11 15:38:46 +11:00
notmatthewbeshay c17c613692 Remove Win32 wide char aliases from debug UI scenes 2026-03-11 15:38:46 +11:00
notmatthewbeshay 6b149fdc38 Remove Win32 wide char aliases from world load menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay 124b3becb6 Remove Win32 wide char aliases from settings menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay cf1670579f Remove Win32 exit code types from fullscreen progress 2026-03-11 15:38:46 +11:00
notmatthewbeshay 4e102e1391 Remove Win32 local state types from create world menu 2026-03-11 15:38:46 +11:00
notmatthewbeshay e2bbccf7eb Remove Win32 local state types from join and load menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay 7f29aa5d99 Remove Win32 local types from UI controller 2026-03-11 15:38:46 +11:00
notmatthewbeshay 015cdd3824 Remove Win32 string aliases from UI menus 2026-03-11 15:38:46 +11:00
notmatthewbeshay 986dbd60ef Remove Win32 callback types from pause menu helpers 2026-03-11 15:38:45 +11:00
notmatthewbeshay 35035cfe4d Remove Win32 wide char types from leaderboard UI 2026-03-11 15:38:45 +11:00
notmatthewbeshay 56f6bb8da6 Remove Win32 wide char aliases from skin select menu 2026-03-11 15:38:45 +11:00
notmatthewbeshay 4506a204f9 Remove Win32 preview state types from skin select menu 2026-03-11 15:38:45 +11:00
notmatthewbeshay 86c900239b Remove Win32 index types from skin select menu 2026-03-11 15:38:45 +11:00
notmatthewbeshay e20cd0acd0 Remove Win32 callback types from load or join transfers 2026-03-11 15:38:45 +11:00
notmatthewbeshay 470fc532f8 Remove Win32 count types from leaderboard UI 2026-03-11 15:38:45 +11:00
notmatthewbeshay 147ce20bc5 Remove Win32 wide string aliases from common UI 2026-03-11 15:38:45 +11:00
notmatthewbeshay 3b199b9ba2 Remove Win32 input types from abstract container menus 2026-03-11 15:38:45 +11:00
notmatthewbeshay 12bc5aa597 Remove Win32 state types from player skin preview 2026-03-11 15:38:45 +11:00
notmatthewbeshay 305d5f0812 Use standard player IDs in kick confirmation callbacks 2026-03-11 15:38:44 +11:00
notmatthewbeshay b40e716b2c Remove Win32 player ID types from in-game info menu 2026-03-11 15:38:44 +11:00
notmatthewbeshay 4306e80068 Remove Win32 player ID types from teleport menu 2026-03-11 15:38:44 +11:00
notmatthewbeshay 7f917af01c Use standard save image buffers in load or join menu 2026-03-11 15:38:44 +11:00
notmatthewbeshay a55fddf270 Use standard image buffers in UI scenes 2026-03-11 15:38:44 +11:00
notmatthewbeshay b9b2e51bc8 Remove Win32 callback types from UI helper scenes 2026-03-11 15:38:44 +11:00
notmatthewbeshay c50aa9c152 Use portable file IO for UI TTF fonts 2026-03-11 15:38:44 +11:00
notmatthewbeshay 594e799089 Remove Win32 callback types from progress scenes 2026-03-11 15:38:44 +11:00