diff --git a/targets/app/common/Consoles_App.cpp b/targets/app/common/Consoles_App.cpp index 145a0c469..199a19115 100644 --- a/targets/app/common/Consoles_App.cpp +++ b/targets/app/common/Consoles_App.cpp @@ -83,7 +83,7 @@ #include "Minecraft_Macros.h" #include "util/Timer.h" #include "util/StringHelpers.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/User.h" #include "minecraft/client/gui/Gui.h" #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h" diff --git a/targets/app/common/src/GameRules/GameRuleManager.cpp b/targets/app/common/src/GameRules/GameRuleManager.cpp index d25f369dd..2dad1d3ea 100644 --- a/targets/app/common/src/GameRules/GameRuleManager.cpp +++ b/targets/app/common/src/GameRules/GameRuleManager.cpp @@ -20,7 +20,7 @@ #include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "app/common/src/Localisation/StringTable.h" #include "app/linux/Linux_App.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index 85c538ae2..af4186568 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -10,7 +10,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/Class.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h index 66d4bf0db..fba4c63a4 100644 --- a/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -14,7 +14,7 @@ #include #include "app/linux/Stubs/winapi_stubs.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/world/phys/Vec3.h" class Level; diff --git a/targets/app/common/src/Network/GameNetworkManager.cpp b/targets/app/common/src/Network/GameNetworkManager.cpp index 70939f46c..b4442905b 100644 --- a/targets/app/common/src/Network/GameNetworkManager.cpp +++ b/targets/app/common/src/Network/GameNetworkManager.cpp @@ -29,7 +29,7 @@ #include "XboxStubs.h" #include "util/StringHelpers.h" #include "platform/PlatformServices.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp index 06b4b1f08..96b7f0568 100644 --- a/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp +++ b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp @@ -8,7 +8,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "platform/PlatformServices.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/FileInputStream.h" diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index 77eb21579..ac6e7c0b5 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -19,7 +19,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index b0dd81b33..1b0352831 100644 --- a/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -16,7 +16,7 @@ #include "app/linux/Iggy/include/rrCore.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/ChunkSource.h" diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index cdb79f36f..121f53475 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -62,7 +62,7 @@ static void sigsegv_handler(int sig) { #include "app/common/src/Network/GameNetworkManager.h" #include "app/linux/Linux_App.h" #include "app/linux/Linux_UIController.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/app/windows/Source Files/Windows64_Minecraft.cpp b/targets/app/windows/Source Files/Windows64_Minecraft.cpp index 5003d8d7a..eb0bdae26 100644 --- a/targets/app/windows/Source Files/Windows64_Minecraft.cpp +++ b/targets/app/windows/Source Files/Windows64_Minecraft.cpp @@ -28,7 +28,7 @@ // #include "NetworkManager.h" #include "../Resource.h" #include "Sentient/SentientManager.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/Options.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index ef473829c..706606392 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -33,7 +33,7 @@ #include "Timer.h" #include "User.h" #include "minecraft/world/entity/player/SkinTypes.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/gui/DeathScreen.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index c90b1496e..08c992dd7 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -22,7 +22,7 @@ #include "app/include/FrameProfiler.h" #include "app/include/stubs.h" #include "Tesselator.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/Class.h" #include "java/FloatBuffer.h" diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index 2f32f6aa1..2b049ccd1 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -11,7 +11,7 @@ #include "app/common/src/Network/NetworkPlayerInterface.h" #include "app/common/src/Network/Socket.h" #include "util/StringHelpers.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp index d07f4586d..6eb4ef032 100644 --- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -5,7 +5,7 @@ #include "app/linux/Linux_App.h" #include "PacketListener.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index a420852d1..b51f07f44 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -70,7 +70,7 @@ #include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "app/common/src/Network/Socket.h" #include "app/common/src/UI/All Platforms/UIStructs.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" #include "minecraft/client/renderer/GameRenderer.h" diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp index af2bcc849..cc30cbf9c 100644 --- a/targets/minecraft/server/level/ServerChunkCache.cpp +++ b/targets/minecraft/server/level/ServerChunkCache.cpp @@ -9,7 +9,7 @@ #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" #include "ServerLevel.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/util/ProgressListener.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 2d75fee22..3406282aa 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -12,7 +12,7 @@ #include "app/common/src/Console_Debug_enum.h" #include "app/linux/Linux_App.h" #include "platform/C4JThread.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp index 648bac6de..7f778a06f 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -7,7 +7,7 @@ #include #include "app/linux/Stubs/winapi_stubs.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.h b/targets/minecraft/world/level/chunk/storage/RegionFile.h index 88ed22fac..bca5b99d4 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.h +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.h @@ -4,7 +4,7 @@ #include #include -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/InputOutputStream.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index e5f302819..680e1def5 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -18,7 +18,7 @@ #include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "app/linux/Linux_App.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index bb225db4c..c9b7cb4c7 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -21,7 +21,7 @@ #include "app/linux/Stubs/winapi_stubs.h" #include "util/Timer.h" #include "util/StringHelpers.h" -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/storage/compression.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/compression.cpp similarity index 99% rename from targets/minecraft/world/level/storage/compression.cpp rename to targets/minecraft/world/level/storage/ConsoleSaveFileIO/compression.cpp index 6c0228d8e..0397adb6d 100644 --- a/targets/minecraft/world/level/storage/compression.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/compression.cpp @@ -1,4 +1,4 @@ -#include "minecraft/world/level/storage/compression.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include #include diff --git a/targets/minecraft/world/level/storage/compression.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/compression.h similarity index 100% rename from targets/minecraft/world/level/storage/compression.h rename to targets/minecraft/world/level/storage/ConsoleSaveFileIO/compression.h