backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-25 14:13:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1606 commits 11 branches 1 tag 1.7 GiB
Commit graph

46 commits

Author SHA1 Message Date
Tropical c9b90cae2c chore: format everything 2026-03-30 02:17:54 -05:00
MatthewBeshay a0fdc643d1 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 
# Conflicts:
#	Minecraft.Client/Network/PlayerChunkMap.cpp
#	Minecraft.Client/Network/PlayerList.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
#	Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
#	Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
#	Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.h
#	Minecraft.Client/Platform/Extrax64Stubs.cpp
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
#	Minecraft.Client/Player/EntityTracker.cpp
#	Minecraft.Client/Player/ServerPlayer.cpp
#	Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
#	Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
#	Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
#	Minecraft.Client/Textures/Stitching/TextureMap.cpp
#	Minecraft.Client/Textures/Textures.cpp
#	Minecraft.World/Blocks/NotGateTile.cpp
#	Minecraft.World/Blocks/PressurePlateTile.cpp
#	Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
#	Minecraft.World/Enchantments/EnchantmentHelper.cpp
#	Minecraft.World/Entities/HangingEntity.cpp
#	Minecraft.World/Entities/LeashFenceKnotEntity.cpp
#	Minecraft.World/Entities/LivingEntity.cpp
#	Minecraft.World/Entities/Mobs/Boat.cpp
#	Minecraft.World/Entities/Mobs/Minecart.cpp
#	Minecraft.World/Entities/Mobs/Witch.cpp
#	Minecraft.World/Entities/SyncedEntityData.cpp
#	Minecraft.World/Items/LeashItem.cpp
#	Minecraft.World/Items/PotionItem.cpp
#	Minecraft.World/Level/BaseMobSpawner.cpp
#	Minecraft.World/Level/CustomLevelSource.cpp
#	Minecraft.World/Level/Level.cpp
#	Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
#	Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
#	Minecraft.World/Level/Storage/RegionFileCache.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
#	Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
#	Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
 2026-03-30 16:28:40 +11:00
MatthewBeshay dfb0e3b03e refactor: replace NULL with nullptr across C++ codebase 
Excludes vendored C libs (zlib, Miles, DirectXMath, boost, Iggy).
 2026-03-30 16:25:52 +11:00
Tropical e45151ae64 refactor: expand AUTO_VAR macro 2026-03-29 23:59:05 -05:00
MatthewBeshay 6000900285 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 
# Conflicts:
#	Minecraft.Client/Level/ServerLevel.cpp
#	Minecraft.Client/Minecraft.cpp
#	Minecraft.Client/MinecraftServer.cpp
#	Minecraft.Client/Network/ClientConnection.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
#	Minecraft.Client/Platform/Durango/Durango_Minecraft.cpp
#	Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
#	Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
#	Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
#	Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
#	Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/stdafx.h
#	Minecraft.Client/Player/LocalPlayer.cpp
#	Minecraft.Client/Rendering/Chunk.cpp
#	Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp
#	Minecraft.Client/Rendering/GameRenderer.cpp
#	Minecraft.Client/Rendering/LevelRenderer.cpp
#	Minecraft.Client/Textures/BufferedImage.cpp
#	Minecraft.Client/UI/Screens/AchievementScreen.cpp
#	Minecraft.Client/UI/Screens/ContainerScreen.cpp
#	Minecraft.Client/UI/Screens/TrapScreen.cpp
#	Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
#	Minecraft.World/IO/Files/File.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/Util/C4JThread.cpp
 2026-03-30 15:21:08 +11:00
MatthewBeshay 31acc46308 fix(linux): localise chunk transforms and guard optional iggy paths 2026-03-29 20:55:57 -05:00
Tropical fb745767f2 undo changes to Camera.cpp 2026-03-29 20:55:57 -05:00
MatthewBeshay 8dfd9e5044 fix(gui): always rebind textures for java font rendering 2026-03-29 20:55:57 -05:00
JuiceyDev 08ed9861b9 batch 2.3 enabling back optimizations 2026-03-29 20:55:56 -05:00
JuiceyDev 97b068260a batch 2.2, clamp be gone 2026-03-29 20:55:56 -05:00
Sally Knight 1ab985805a feat(jui): add beacon screen 2026-03-29 15:52:35 -05:00
Sally Knight 97c6704d82 feat(jui): add merchant screen 2026-03-29 15:52:19 -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 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 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
MatthewBeshay 12ff12a263 cleanup: flatten dead branches in client render texture and runtime code 2026-03-26 20:29:59 +11:00
MatthewBeshay 1fecbf297a cleanup: remove console branches from render texture and world helpers 2026-03-26 19:24:04 +11:00
MatthewBeshay fed9cf2d95 fix: resolve all build warnings and notes 2026-03-23 18:53:18 +11: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 362a43ddee TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
Sally Knight 6d0d4b2ed1 fix(textures): remove ENABLE_JAVA_GUIS conditionals 
Fixes entities not using the correct textures when java GUI is enabled
 2026-03-16 17:24:11 +03:00
Sally Knight 97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -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
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 37aa3463be Use standard buffer types for in-memory textures 2026-03-11 15:38:42 +11:00
Nikita Edel 56955ad935 shift of negative values, added casts 2026-03-11 03:59:41 +01:00
Tropical db7a5f9519 feat: restore unused java GUI 
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
 2026-03-09 22:29:32 -05:00
Tropical 5a36950239 fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Tropical 43a28fc490
Merge pull request #71 from 4jcraft/refactor/no-std-wildcard 
refactor: remove `using namespace std`
 2026-03-08 10:09:33 -05:00
zukrmn ca11afdfca fix: resolve all remaining compilation warnings 2026-03-07 04:43:50 +00:00
Tropical cdc08700e4 refactor: unglob std::wstring 2026-03-06 11:50:22 -06:00
Tropical ecf7fc7f61 refactor: unglob std::unordered_map 2026-03-06 11:29:36 -06:00
Tropical 15af35eef2 fix: remove byte type alias 2026-03-06 05:03:37 -06:00
JuiceyDev 65a9c99215 YES PLEASE 2026-03-06 00:01:26 +01:00
JuiceyDev fa9d517227 fdkgsekgdqsgf 2026-03-05 23:37:27 +01:00
ella love 2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Renamed from Minecraft.Client/Textures.cpp (Browse further)