From c4bbf6cf1f79d8ca3003246dc4b45c48f7b458dd Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Thu, 9 Apr 2026 22:57:31 -0500 Subject: [PATCH] remove a bunch of linux ifdefs --- .../minecraft/server/level/TrackedEntity.cpp | 3 --- .../storage/ChunkStorageProfileDecorator.cpp | 12 ------------ .../world/level/levelgen/CustomLevelSource.cpp | 2 -- .../level/newbiome/layer/BiomeOverrideLayer.cpp | 2 -- .../level/storage/DirectoryLevelStorage.cpp | 17 ----------------- targets/minecraft/world/level/tile/Tile.cpp | 2 +- 6 files changed, 1 insertion(+), 37 deletions(-) diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index 254c7e8e1..f50c34428 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -59,9 +59,6 @@ class AttributeInstance; class MobEffectInstance; -#ifndef __linux__ -#include -#endif // __linux__ TrackedEntity::TrackedEntity(std::shared_ptr e, int range, int updateInterval, bool trackDelta) { diff --git a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp index b2292f58e..2e4230967 100644 --- a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp +++ b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp @@ -45,29 +45,17 @@ void ChunkStorageProfilerDecorator::tick() { if (counter > 500) { if (loadCount > 0) { #if !defined(_CONTENT_PACKAGE) -#if defined(__linux__) sprintf(buf, "Average load time: %f (%lld)", 0.000001 * (double)timeSpentLoading / (double)loadCount, (long long)loadCount); -#else - sprintf(buf, "Average load time: %f (%I64d)", - 0.000001 * (double)timeSpentLoading / (double)loadCount, - loadCount); -#endif Log::info("%s", buf); #endif } if (saveCount > 0) { #if !defined(_CONTENT_PACKAGE) -#if defined(__linux__) sprintf(buf, "Average save time: %f (%lld)", 0.000001 * (double)timeSpentSaving / (double)loadCount, (long long)loadCount); -#else - sprintf(buf, "Average save time: %f (%I64d)", - 0.000001 * (double)timeSpentSaving / (double)loadCount, - loadCount); -#endif Log::info("%s", buf); #endif } diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp index 71f528ed3..dc881bc4c 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -10,8 +10,6 @@ #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/chunk/ChunkSource.h" #include "platform/fs/fs.h" -#if defined(__linux__) -#endif #include "java/Random.h" #include "minecraft/world/entity/MobCategory.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp index f11c6a6d7..c1788941f 100644 --- a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp @@ -6,8 +6,6 @@ #include "minecraft/util/Log.h" #include "minecraft/world/level/newbiome/layer/Layer.h" #include "platform/fs/fs.h" -#if defined(__linux__) -#endif #include "minecraft/world/level/biome/Biome.h" BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 467cd851a..99f93312c 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -280,17 +280,8 @@ LevelData* DirectoryLevelStorage::prepareLevel() { Log::info("Loading %d mappings\n", count); for (unsigned int i = 0; i < count; ++i) { PlayerUID playerUid = dis.readPlayerUID(); -#if defined(_WINDOWS64) || defined(__linux__) Log::info(" -- %llu\n", static_cast(playerUid)); -#else -#if defined(__linux__) - Log::info(" -- %llu\n", - static_cast(playerUid)); -#else - Log::info(" -- %s\n", playerUid.toWString().c_str()); -#endif -#endif m_playerMappings[playerUid].readMappings(&dis); } dis.readFully(m_usedMappings); @@ -641,16 +632,8 @@ void DirectoryLevelStorage::saveMapIdLookup() { Log::info("Saving %zu mappings\n", m_playerMappings.size()); for (auto it = m_playerMappings.begin(); it != m_playerMappings.end(); ++it) { -#if defined(_WINDOWS64) || defined(__linux__) Log::info(" -- %llu\n", static_cast(it->first)); -#else -#if defined(__linux__) - Log::info(" -- %d\n", it->first); -#else - Log::info(" -- %s\n", it->first.toWString().c_str()); -#endif -#endif dos.writePlayerUID(it->first); it->second.writeMappings(&dos); } diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index 25e0dfded..81f514233 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -2737,7 +2737,7 @@ int Tile::SoundType::getPlaceSound() const { return iPlaceSound; } 4J: These are necessary on the PS3. (and 4 and Vita). */ -#if (0 || 0 || 0 || defined __linux__) +#if 1 const int Tile::stone_Id; const int Tile::grass_Id; const int Tile::dirt_Id;