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

Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2

Browse source 
# Conflicts:
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.World/IO/Files/File.cpp
This commit is contained in:
MatthewBeshay 2026-03-30 15:28:11 +11:00
parent 6000900285 9375009dd3
commit a104252557
6 changed files with 6 additions and 5 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"

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

@ -23,6 +23,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/Windows64/Social/SocialManager.h"

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

@ -625,7 +625,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame() {
bool pccFriendsAllowed = true;
bool bContentRestricted = false;
GetAllowedPlayerCreatedContentFlags(ProfileManager.GetPrimaryPad(),
ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),
false, &pccAllowed,
&pccFriendsAllowed);
@ -931,7 +931,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__)

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