backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-20 04:02:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #351 from 4jcraft/fix/pathhelper-include

Browse source 
fix: PathHelper include path
This commit is contained in:
MatthewBeshay 2026-03-30 15:25:10 +11:00 committed by GitHub
parent 2c72e3de6d e4c0a3a35b
commit 9375009dd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
View file

@ -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"

3
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

@ -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(),

4
Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
View file

@ -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;

2
Minecraft.Client/Textures/BufferedImage.cpp
View file

@ -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__)

2
Minecraft.World/IO/Files/File.cpp
View file

@ -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 <chrono>
#include <filesystem>

0
Minecraft.World/Platform/PathHelper.h → Minecraft.World/Util/PathHelper.h
View file

2
subprojects/4jlibs.wrap
View file

@ -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