diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index a13bd8c95..752016d29 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -24,7 +24,6 @@ #include "platform/NetTypes.h" #include "minecraft/client/model/SkinBox.h" #include "platform/XboxStubs.h" -#include "platform/PlatformServices.h" #include "java/Class.h" #include "java/File.h" #include "java/Random.h" diff --git a/targets/app/meson.build b/targets/app/meson.build index bdaec6d56..4fb3c2340 100644 --- a/targets/app/meson.build +++ b/targets/app/meson.build @@ -51,11 +51,10 @@ if get_option('ui_backend') == 'shiggy' client_dependencies += shiggy_dep endif -platform_services_src = files('../platform/PlatformServices.cpp') client = executable( 'Minecraft.Client', - platform_sources + platform_services_src + localisation[1], + platform_sources + localisation[1], include_directories: include_directories('..'), dependencies: client_dependencies, cpp_args: global_cpp_args diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index 59b7d990e..fbc292b91 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -50,7 +50,6 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" #include "nbt/CompoundTag.h" -#include "platform/PlatformServices.h" const double Ocelot::SNEAK_SPEED_MOD = 0.6; const double Ocelot::WALK_SPEED_MOD = 0.8; diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index f81c53971..d7cd0b255 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -73,7 +73,6 @@ #include "minecraft/world/phys/HitResult.h" #include "minecraft/world/phys/Vec3.h" #include "minecraft/world/scores/Scoreboard.h" -#include "platform/PlatformServices.h" class CompoundTag; class ItemInstance; diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp index d4dfd30ac..21eb3d0aa 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.cpp +++ b/targets/minecraft/world/level/biome/BiomeSource.cpp @@ -20,7 +20,6 @@ #include "minecraft/world/level/biome/BiomeCache.h" #include "minecraft/world/level/newbiome/layer/Layer.h" #include "minecraft/world/level/storage/LevelData.h" -#include "platform/PlatformServices.h" #include "strings.h" // 4J - removal of separate temperature & downfall layers brought forward diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 30178cbb6..d6952cf88 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -32,7 +32,6 @@ #include "minecraft/world/level/storage/LevelData.h" #include "nbt/CompoundTag.h" #include "nbt/NbtIo.h" -#include "platform/PlatformServices.h" class DataInput; diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index eeb876ec7..c4c5d5651 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -33,7 +33,6 @@ #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" #include "nbt/NbtIo.h" -#include "platform/PlatformServices.h" thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage = nullptr; diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index 8073dd8dc..ea1e22252 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -27,7 +27,6 @@ #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/Vec3.h" -#include "platform/PlatformServices.h" class Pos; diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index 48a8da1d8..27e5f97e5 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -17,7 +17,6 @@ #include "minecraft/world/level/levelgen/HellRandomLevelSource.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/phys/Vec3.h" -#include "platform/PlatformServices.h" void HellDimension::init() { biomeSource = new FixedBiomeSource(Biome::hell, 1, 0); diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp index 53bfde0c9..c2605e23a 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp @@ -27,7 +27,6 @@ #include "minecraft/world/level/newbiome/layer/SwampRiversLayer.h" #include "minecraft/world/level/newbiome/layer/VoronoiZoom.h" #include "minecraft/world/level/newbiome/layer/ZoomLayer.h" -#include "platform/PlatformServices.h" std::vector> Layer::getDefaultLayers( int64_t seed, LevelType* levelType) { diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index ec3600168..299deac45 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -38,7 +38,6 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "minecraft/world/level/storage/LevelData.h" #include "platform/storage/storage.h" -#include "platform/PlatformServices.h" class ProgressListener; diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index edf927cda..360b99f02 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -43,7 +43,6 @@ #include "nbt/ListTag.h" #include "nbt/NbtIo.h" #include "platform/storage/storage.h" -#include "platform/PlatformServices.h" const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/"); diff --git a/targets/platform/PlatformServices.cpp b/targets/platform/PlatformServices.cpp deleted file mode 100644 index d898f56b5..000000000 --- a/targets/platform/PlatformServices.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "PlatformServices.h" \ No newline at end of file diff --git a/targets/platform/PlatformServices.h b/targets/platform/PlatformServices.h deleted file mode 100644 index d8b52c721..000000000 --- a/targets/platform/PlatformServices.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "IPlatformLeaderboard.h" -#include "IPlatformNetwork.h"