backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-07 21:22:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: duplicate telemetry includes

Browse source
This commit is contained in:
Tropical 2026-03-02 16:09:21 -06:00
parent 0f560867c0
commit a643690658
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Common/Telemetry/TelemetryManager.h
View file

@ -1,7 +1,9 @@
#pragma once
#include "../../Common/UI/UIEnums.h"
#include "../../Xbox/Sentient/SentientTelemetryCommon.h"
// #include "../../Xbox/Sentient/SentientTelemetryCommon.h"
// #include "stdafx.h"
enum ETelemetryChallenges
{

22
Minecraft.Client/stdafx.h
View file

@ -280,18 +280,18 @@ typedef XUID GameSessionUID;
#include "Windows64\Iggy\gdraw\gdraw_d3d11.h"
#include "Windows64\Windows64_UIController.h"
#elif defined __linux__
#include "Windows64/Sentient/MinecraftTelemetry.h"
// #include "Windows64/Sentient/MinecraftTelemetry.h"
#include "Windows64Media/strings.h"
#include "Windows64/Windows64_App.h"
#include "Windows64/Sentient/DynamicConfigurations.h"
#include "Windows64/Sentient/SentientTelemetryCommon.h"
#include "Windows64/GameConfig/Minecraft.spa.h"
#include "Windows64/XML/ATGXmlParser.h"
#include "Windows64/Social/SocialManager.h"
#include "Common/Audio/SoundEngine.h"
#include "Windows64/Iggy/include/iggy.h"
#include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
#include "Windows64/Windows64_UIController.h"
// #include "Windows64/Windows64_App.h"
// #include "Windows64/Sentient/DynamicConfigurations.h"
// #include "Windows64/Sentient/SentientTelemetryCommon.h"
// #include "Windows64/GameConfig/Minecraft.spa.h"
// #include "Windows64/XML/ATGXmlParser.h"
// #include "Windows64/Social/SocialManager.h"
// #include "Common/Audio/SoundEngine.h"
// #include "Windows64/Iggy/include/iggy.h"
// #include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
// #include "Windows64/Windows64_UIController.h"
#elif defined __PSVITA__
#include "PSVita\PSVita_App.h"
#include "PSVitaMedia\strings.h" // TODO - create PSVita-specific version of this

2
Minecraft.World/BucketItem.cpp
View file

@ -15,7 +15,7 @@
#include "../Minecraft.Client/LocalPlayer.h"
#include "../Minecraft.Client/ServerPlayer.h"
#include "../Minecraft.Client/PlayerConnection.h"
#include "..\Minecraft.World\ChatPacket.h"
#include "../Minecraft.World/ChatPacket.h"
#include "SoundTypes.h"
BucketItem::BucketItem(int id, int content) : Item( id )

2
Minecraft.World/stdafx.h
View file

@ -249,7 +249,7 @@ void MemSect(int sect);
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#include "../Minecraft.Client/Windows64Media/strings.h"
#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h"
#include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
// #include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
#else
#include "..\Minecraft.Client\Orbis\Orbis_App.h"
#include "..\Minecraft.Client\OrbisMedia\strings.h"