From 4d9a1c73e611efd8461b12dc95ea5b678bb739e9 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:31:29 -0600 Subject: [PATCH] fix: the usual --- Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h | 2 ++ Minecraft.Client/ItemRenderer.cpp | 2 +- Minecraft.Client/Linux/Stubs/winapi_stubs.h | 8 ++++++++ Minecraft.Client/MobRenderer.cpp | 2 +- Minecraft.Client/PaintingRenderer.cpp | 2 +- Minecraft.Client/PendingConnection.cpp | 2 +- Minecraft.Client/PlayerConnection.cpp | 4 ++-- Minecraft.Client/PlayerRenderer.cpp | 2 +- Minecraft.Client/TrackedEntity.cpp | 2 ++ Minecraft.World/PlayerInfoPacket.cpp | 2 ++ 10 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h index e06434558..32a3d095a 100644 --- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h +++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h @@ -1,7 +1,9 @@ #pragma once using namespace std; #include +#ifndef __linux__ #include +#endif // __linux__ #include "../Media/xuiscene_multi_gameinfo.h" class FriendSessionInfo; diff --git a/Minecraft.Client/ItemRenderer.cpp b/Minecraft.Client/ItemRenderer.cpp index 8d599c17e..7c0ecbc5e 100644 --- a/Minecraft.Client/ItemRenderer.cpp +++ b/Minecraft.Client/ItemRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ItemRenderer.h" #include "TileRenderer.h" -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" #include "../Minecraft.World/JavaMath.h" #include "../Minecraft.World/net.minecraft.world.entity.item.h" #include "../Minecraft.World/net.minecraft.world.item.h" diff --git a/Minecraft.Client/Linux/Stubs/winapi_stubs.h b/Minecraft.Client/Linux/Stubs/winapi_stubs.h index a51929460..146b8149d 100644 --- a/Minecraft.Client/Linux/Stubs/winapi_stubs.h +++ b/Minecraft.Client/Linux/Stubs/winapi_stubs.h @@ -116,6 +116,14 @@ typedef float FLOAT; #define TRUNCATE_EXISTING 5 #define WAIT_TIMEOUT 258 +#define FILE_FLAG_WRITE_THROUGH 0x80000000 +#define FILE_FLAG_OVERLAPPED 0x40000000 +#define FILE_FLAG_NO_BUFFERING 0x20000000 +#define FILE_FLAG_RANDOM_ACCESS 0x10000000 +#define FILE_FLAG_SEQUENTIAL_SCAN 0x08000000 +#define FILE_FLAG_DELETE_ON_CLOSE 0x04000000 +#define FILE_FLAG_BACKUP_SEMANTICS 0x02000000 + #define FILE_ATTRIBUTE_READONLY 0x00000001 #define FILE_ATTRIBUTE_HIDDEN 0x00000002 #define FILE_ATTRIBUTE_SYSTEM 0x00000004 diff --git a/Minecraft.Client/MobRenderer.cpp b/Minecraft.Client/MobRenderer.cpp index 4188cd5a0..64e3b7c76 100644 --- a/Minecraft.Client/MobRenderer.cpp +++ b/Minecraft.Client/MobRenderer.cpp @@ -6,7 +6,7 @@ #include "../Minecraft.World/net.minecraft.world.entity.projectile.h" #include "../Minecraft.World/StringHelpers.h" #include "../Minecraft.World/Mth.h" -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" MobRenderer::MobRenderer(Model *model, float shadow) : EntityRenderer() { diff --git a/Minecraft.Client/PaintingRenderer.cpp b/Minecraft.Client/PaintingRenderer.cpp index 7e6ad1461..a330fd185 100644 --- a/Minecraft.Client/PaintingRenderer.cpp +++ b/Minecraft.Client/PaintingRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PaintingRenderer.h" -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" #include "../Minecraft.World/net.minecraft.world.entity.h" #include "../Minecraft.World/net.minecraft.world.level.h" #include "../Minecraft.World/Random.h" diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp index add5bf5bd..1d7f333e7 100644 --- a/Minecraft.Client/PendingConnection.cpp +++ b/Minecraft.Client/PendingConnection.cpp @@ -8,7 +8,7 @@ #include "PlayerList.h" #include "MinecraftServer.h" #include "../Minecraft.World/net.minecraft.network.h" -#include "../Minecraft.World/pos.h" +#include "../Minecraft.World/Pos.h" #include "../Minecraft.World/net.minecraft.world.level.dimension.h" #include "../Minecraft.World/net.minecraft.world.level.storage.h" #include "../Minecraft.World/net.minecraft.world.item.h" diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp index 8a6d59bc4..8a90ba9d9 100644 --- a/Minecraft.Client/PlayerConnection.cpp +++ b/Minecraft.Client/PlayerConnection.cpp @@ -25,8 +25,8 @@ #include "../Minecraft.World/net.minecraft.h" #include "EntityTracker.h" #include "ServerConnection.h" -#include "..\Minecraft.World\GenericStats.h" -#include "..\Minecraft.World\JavaMath.h" +#include "../Minecraft.World/GenericStats.h" +#include "../Minecraft.World/JavaMath.h" // 4J Added #include "../Minecraft.World/net.minecraft.world.item.crafting.h" diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp index 15af95ab4..bb6019c09 100644 --- a/Minecraft.Client/PlayerRenderer.cpp +++ b/Minecraft.Client/PlayerRenderer.cpp @@ -5,7 +5,7 @@ #include "ModelPart.h" #include "LocalPlayer.h" #include "MultiPlayerLocalPlayer.h" -#include "entityRenderDispatcher.h" +#include "EntityRenderDispatcher.h" #include "../Minecraft.World/net.minecraft.world.entity.h" #include "../Minecraft.World/net.minecraft.world.entity.player.h" #include "../Minecraft.World/net.minecraft.world.item.h" diff --git a/Minecraft.Client/TrackedEntity.cpp b/Minecraft.Client/TrackedEntity.cpp index 49a0d49d4..c36d9209f 100644 --- a/Minecraft.Client/TrackedEntity.cpp +++ b/Minecraft.Client/TrackedEntity.cpp @@ -18,7 +18,9 @@ #include "PlayerList.h" #include "EntityTracker.h" #include "PlayerChunkMap.h" +#ifndef __linux__ #include +#endif // __linux__ TrackedEntity::TrackedEntity(shared_ptr e, int range, int updateInterval, bool trackDelta) { diff --git a/Minecraft.World/PlayerInfoPacket.cpp b/Minecraft.World/PlayerInfoPacket.cpp index 70628e133..37905a467 100644 --- a/Minecraft.World/PlayerInfoPacket.cpp +++ b/Minecraft.World/PlayerInfoPacket.cpp @@ -2,7 +2,9 @@ #include "net.minecraft.world.entity.player.h" #include "../Minecraft.Client/ServerPlayer.h" #include "../Minecraft.Client/PlayerConnection.h" +#ifndef __linux__ #include +#endif // __linux__ #include "PacketListener.h" #include "InputOutputStream.h" #include "PlayerInfoPacket.h"