From c5d50c40661ee53cbe17094036dd5ac7bae748f0 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Sun, 29 Mar 2026 23:13:15 -0500 Subject: [PATCH 1/3] fix: PathHelper include path --- Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp | 2 +- Minecraft.Client/Textures/BufferedImage.cpp | 2 +- Minecraft.World/IO/Files/File.cpp | 2 +- Minecraft.World/{Platform => Util}/PathHelper.h | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename Minecraft.World/{Platform => Util}/PathHelper.h (100%) diff --git a/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp index 557bd4478..46efe02da 100644 --- a/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp @@ -1,6 +1,6 @@ #include "../../Minecraft.World/Platform/stdafx.h" #include "SoundEngine.h" -#include "PathHelper.h" +#include "../../Minecraft.World/Util/PathHelper.h" #include "../Consoles_App.h" #include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.h" diff --git a/Minecraft.Client/Textures/BufferedImage.cpp b/Minecraft.Client/Textures/BufferedImage.cpp index 7981e60d7..a5533d71f 100644 --- a/Minecraft.Client/Textures/BufferedImage.cpp +++ b/Minecraft.Client/Textures/BufferedImage.cpp @@ -1,7 +1,7 @@ #include "../Platform/stdafx.h" #include "../../Minecraft.World/Util/StringHelpers.h" #include "Textures.h" -#include "PathHelper.h" +#include "../../Minecraft.World/Util/PathHelper.h" #include "../../Minecraft.World/Util/ArrayWithLength.h" #include "BufferedImage.h" #if defined(__linux__) diff --git a/Minecraft.World/IO/Files/File.cpp b/Minecraft.World/IO/Files/File.cpp index b67d8db33..d77d4010e 100644 --- a/Minecraft.World/IO/Files/File.cpp +++ b/Minecraft.World/IO/Files/File.cpp @@ -2,7 +2,7 @@ #include "FileFilter.h" #include "../../Level/Storage/McRegionLevelStorageSource.h" #include "File.h" -#include "PathHelper.h" +#include "../../../Minecraft.World/Util/PathHelper.h" #if !defined(__PS3__) && !defined(__ORBIS__) && !defined(__PSVITA__) #include #include diff --git a/Minecraft.World/Platform/PathHelper.h b/Minecraft.World/Util/PathHelper.h similarity index 100% rename from Minecraft.World/Platform/PathHelper.h rename to Minecraft.World/Util/PathHelper.h From 0644d9bcde8938a6fcbdcd0d953b39687b2ef66a Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Sun, 29 Mar 2026 23:18:26 -0500 Subject: [PATCH 2/3] fix: use correct 4jlibs branch --- subprojects/4jlibs.wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/4jlibs.wrap b/subprojects/4jlibs.wrap index ab584a950..e9e21334c 100644 --- a/subprojects/4jlibs.wrap +++ b/subprojects/4jlibs.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4jcraft/4jlibs.git -revision = immediategone-v2 +revision = main [provide] dependency_names = 4j-render, 4j-input, 4j-profile, 4j-storage From e4c0a3a35b1ac2ee38436caecf18d0046a79f25f Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Sun, 29 Mar 2026 23:24:37 -0500 Subject: [PATCH 3/3] fix: assets loading and text input issues --- Minecraft.Client/Platform/Common/Consoles_App.cpp | 3 ++- .../Platform/Common/UI/UIScene_CreateWorldMenu.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 4dbd93892..2667890be 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -22,6 +22,7 @@ #include "../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h" #include "../Minecraft.World/Blocks/TileEntities/SignTileEntity.h" #include "../Minecraft.World/Blocks/TileEntities/HopperTileEntity.h" +#include "../Minecraft.World/Util/PathHelper.h" #include "../Minecraft.Client/GameState/StatsCounter.h" #include "../Minecraft.Client/GameState/GameMode.h" #include "../Minecraft.Client/Platform/Xbox/Social/SocialManager.h" @@ -4618,7 +4619,7 @@ void CMinecraftApp::loadMediaArchive() { m_mediaArchive = new ArchiveFile(File(mediapath)); #endif } -} + #if 0 std::string path = "Common\\media.arc"; HANDLE hFile = CreateFile( path.c_str(), diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp index 4a3c44c61..a326fb41a 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp @@ -898,7 +898,7 @@ IDS_PRO_NOTONLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad()); return; bool pccFriendsAllowed = true; bool bContentRestricted = false; - GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(), + ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(), false, &pccAllowed, &pccFriendsAllowed); #if defined(__PS3__) || defined(__PSVITA__) @@ -1343,7 +1343,7 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void* pParam, bool pccAllowed = true; bool pccFriendsAllowed = true; - GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(), + ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(), false, &pccAllowed, &pccFriendsAllowed); if (!pccAllowed && !pccFriendsAllowed) noUGC = true;