From 1eac848d3d5e626cc37c6412fdc7740b22305394 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Wed, 4 Mar 2026 18:24:32 -0600 Subject: [PATCH] fix: remove hardcoded win64 app includes --- Minecraft.World/BlockRegionUpdatePacket.cpp | 2 -- Minecraft.World/CommandDispatcher.cpp | 1 - Minecraft.World/CustomPayloadPacket.cpp | 2 +- Minecraft.World/EnderDragon.cpp | 2 -- Minecraft.World/EnderMan.cpp | 1 - Minecraft.World/Entity.cpp | 1 - Minecraft.World/FileHeader.cpp | 2 +- Minecraft.World/FileInputStream.cpp | 1 - Minecraft.World/Fireball.cpp | 1 - Minecraft.World/GameCommandPacket.cpp | 1 - Minecraft.World/LoginPacket.cpp | 1 - Minecraft.World/MobEffectInstance.cpp | 1 - Minecraft.World/Monster.cpp | 1 - Minecraft.World/Packet.cpp | 1 - Minecraft.World/PreLoginPacket.cpp | 2 -- Minecraft.World/RespawnPacket.cpp | 1 - Minecraft.World/Silverfish.cpp | 3 --- Minecraft.World/Stat.h | 2 -- Minecraft.World/SynchedEntityData.cpp | 2 -- Minecraft.World/Tag.cpp | 1 - Minecraft.World/stdafx.h | 4 ++-- 21 files changed, 4 insertions(+), 29 deletions(-) diff --git a/Minecraft.World/BlockRegionUpdatePacket.cpp b/Minecraft.World/BlockRegionUpdatePacket.cpp index b485ef057..fcceb59a5 100644 --- a/Minecraft.World/BlockRegionUpdatePacket.cpp +++ b/Minecraft.World/BlockRegionUpdatePacket.cpp @@ -10,8 +10,6 @@ #include "DataLayer.h" #include "Dimension.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" - BlockRegionUpdatePacket::~BlockRegionUpdatePacket() { delete [] buffer.data; diff --git a/Minecraft.World/CommandDispatcher.cpp b/Minecraft.World/CommandDispatcher.cpp index 0f494ba49..2cf4ce295 100644 --- a/Minecraft.World/CommandDispatcher.cpp +++ b/Minecraft.World/CommandDispatcher.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "net.minecraft.commands.h" #include "CommandDispatcher.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" void CommandDispatcher::performCommand(shared_ptr sender, EGameCommand command, byteArray commandData) { diff --git a/Minecraft.World/CustomPayloadPacket.cpp b/Minecraft.World/CustomPayloadPacket.cpp index eadc01fe9..75f27b414 100644 --- a/Minecraft.World/CustomPayloadPacket.cpp +++ b/Minecraft.World/CustomPayloadPacket.cpp @@ -3,7 +3,7 @@ #include "PacketListener.h" #include "BasicTypeContainers.h" #include "CustomPayloadPacket.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" + // Mojang-defined custom packets const wstring CustomPayloadPacket::CUSTOM_BOOK_PACKET = L"MC|BEdit"; const wstring CustomPayloadPacket::CUSTOM_BOOK_SIGN_PACKET = L"MC|BSign"; diff --git a/Minecraft.World/EnderDragon.cpp b/Minecraft.World/EnderDragon.cpp index 2211cdeb2..36e6eb99a 100644 --- a/Minecraft.World/EnderDragon.cpp +++ b/Minecraft.World/EnderDragon.cpp @@ -13,8 +13,6 @@ #include "SharedConstants.h" #include "EnderDragon.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" - #define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1 diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp index 39e4ebdb1..a34786054 100644 --- a/Minecraft.World/EnderMan.cpp +++ b/Minecraft.World/EnderMan.cpp @@ -9,7 +9,6 @@ #include "com.mojang.nbt.h" #include "../Minecraft.Client/Textures.h" #include "EnderMan.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" bool EnderMan::MAY_TAKE[256]; diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp index 4841e697c..24b4c5e5a 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -21,7 +21,6 @@ #include "../Minecraft.Client/MinecraftServer.h" #include "../Minecraft.Client/MultiPlayerLevel.h" #include "../Minecraft.Client/MultiPlayerLocalPlayer.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" int Entity::entityCounter = 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 as special unique smaller ids for things that need network tracked diff --git a/Minecraft.World/FileHeader.cpp b/Minecraft.World/FileHeader.cpp index febb021ac..5e853f318 100644 --- a/Minecraft.World/FileHeader.cpp +++ b/Minecraft.World/FileHeader.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "FileHeader.h" -#include "../Minecraft.Client/Windows64/Windows64_App.cpp" + //#define _DEBUG_FILE_HEADER extern CConsoleMinecraftApp app; diff --git a/Minecraft.World/FileInputStream.cpp b/Minecraft.World/FileInputStream.cpp index 62173f47d..5fdb9188c 100644 --- a/Minecraft.World/FileInputStream.cpp +++ b/Minecraft.World/FileInputStream.cpp @@ -2,7 +2,6 @@ #include "File.h" #include "FileInputStream.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" #include #include // for close() diff --git a/Minecraft.World/Fireball.cpp b/Minecraft.World/Fireball.cpp index d8be2d3b0..6efb230d4 100644 --- a/Minecraft.World/Fireball.cpp +++ b/Minecraft.World/Fireball.cpp @@ -9,7 +9,6 @@ #include "Fireball.h" #include "net.minecraft.world.level.dimension.h" #include "SharedConstants.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" // 4J - added common ctor code. diff --git a/Minecraft.World/GameCommandPacket.cpp b/Minecraft.World/GameCommandPacket.cpp index c5e2ca118..53be23fda 100644 --- a/Minecraft.World/GameCommandPacket.cpp +++ b/Minecraft.World/GameCommandPacket.cpp @@ -3,7 +3,6 @@ #include "PacketListener.h" #include "BasicTypeContainers.h" #include "GameCommandPacket.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" GameCommandPacket::GameCommandPacket() { diff --git a/Minecraft.World/LoginPacket.cpp b/Minecraft.World/LoginPacket.cpp index 92e998323..f5afb5ac5 100644 --- a/Minecraft.World/LoginPacket.cpp +++ b/Minecraft.World/LoginPacket.cpp @@ -5,7 +5,6 @@ #include "PacketListener.h" #include "LoginPacket.h" #include "LevelType.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" LoginPacket::LoginPacket() diff --git a/Minecraft.World/MobEffectInstance.cpp b/Minecraft.World/MobEffectInstance.cpp index fca51e4bc..2c6ea5eb8 100644 --- a/Minecraft.World/MobEffectInstance.cpp +++ b/Minecraft.World/MobEffectInstance.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "net.minecraft.world.effect.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" void MobEffectInstance::_init(int id, int duration, int amplifier) { diff --git a/Minecraft.World/Monster.cpp b/Minecraft.World/Monster.cpp index 25ec4a5d6..5a9502497 100644 --- a/Minecraft.World/Monster.cpp +++ b/Minecraft.World/Monster.cpp @@ -7,7 +7,6 @@ #include "net.minecraft.world.effect.h" #include "net.minecraft.world.item.enchantment.h" #include "Monster.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" #include "../Minecraft.Client/Minecraft.h" diff --git a/Minecraft.World/Packet.cpp b/Minecraft.World/Packet.cpp index 70bbe83dd..147d91b5d 100644 --- a/Minecraft.World/Packet.cpp +++ b/Minecraft.World/Packet.cpp @@ -6,7 +6,6 @@ #include "PacketListener.h" #include "Packet.h" #include "com.mojang.nbt.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" #ifndef _CONTENT_PACKAGE #include "../Minecraft.Client/Minecraft.h" diff --git a/Minecraft.World/PreLoginPacket.cpp b/Minecraft.World/PreLoginPacket.cpp index 7079af8b5..e162dba33 100644 --- a/Minecraft.World/PreLoginPacket.cpp +++ b/Minecraft.World/PreLoginPacket.cpp @@ -3,8 +3,6 @@ #include "PacketListener.h" #include "PreLoginPacket.h" #include "InputOutputStream.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" - PreLoginPacket::PreLoginPacket() { diff --git a/Minecraft.World/RespawnPacket.cpp b/Minecraft.World/RespawnPacket.cpp index 5211e3792..5c04bbebb 100644 --- a/Minecraft.World/RespawnPacket.cpp +++ b/Minecraft.World/RespawnPacket.cpp @@ -4,7 +4,6 @@ #include "PacketListener.h" #include "RespawnPacket.h" #include "LevelType.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" RespawnPacket::RespawnPacket() { diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp index a235492e7..dc597b743 100644 --- a/Minecraft.World/Silverfish.cpp +++ b/Minecraft.World/Silverfish.cpp @@ -7,9 +7,6 @@ #include "../Minecraft.Client/Textures.h" #include "Silverfish.h" #include "SoundTypes.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" - - Silverfish::Silverfish(Level *level) : Monster( level ) { diff --git a/Minecraft.World/Stat.h b/Minecraft.World/Stat.h index e46900773..3c2ab071d 100644 --- a/Minecraft.World/Stat.h +++ b/Minecraft.World/Stat.h @@ -4,8 +4,6 @@ using namespace std; #include "StatFormatter.h" #include "GenericStats.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" - class DecimalFormat; class Stat diff --git a/Minecraft.World/SynchedEntityData.cpp b/Minecraft.World/SynchedEntityData.cpp index bff268436..ebb831674 100644 --- a/Minecraft.World/SynchedEntityData.cpp +++ b/Minecraft.World/SynchedEntityData.cpp @@ -7,8 +7,6 @@ #include "net.minecraft.world.item.h" #include "SynchedEntityData.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" - SynchedEntityData::SynchedEntityData() { m_isDirty = false; diff --git a/Minecraft.World/Tag.cpp b/Minecraft.World/Tag.cpp index 2f8edf225..3c79b73fe 100644 --- a/Minecraft.World/Tag.cpp +++ b/Minecraft.World/Tag.cpp @@ -11,7 +11,6 @@ #include "StringTag.h" #include "ListTag.h" #include "CompoundTag.h" -#include "../Minecraft.Client/Windows64/Windows64_App.h" Tag::Tag(const wstring &name) { diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h index 841fb6900..fe28d124f 100644 --- a/Minecraft.World/stdafx.h +++ b/Minecraft.World/stdafx.h @@ -241,8 +241,8 @@ void MemSect(int sect); #include "../Minecraft.Client/PSVita/Sentient/MinecraftTelemetry.h" #elif defined(__linux__) // FIXME: Move and port to ../Minecraft.Client/Linux -#include "../Minecraft.Client/Windows64/Windows64_App.h" -#include "../Minecraft.Client/Windows64Media/strings.h" +#include "../Minecraft.Client/Linux/Linux_App.h" +#include "../Minecraft.Client/OrbisMedia/strings.h" #include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h" // #include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h" #else