* More work getting this shit to compile again

2026-09-23 20:09:46 +03:00 · 2023-08-05 14:57:18 +03:00
parent 8b92eced31
commit 71e700a300
48 changed files with 2076 additions and 2011 deletions
--- a/source/client/common/CThread.cpp
+++ b/source/client/common/CThread.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "CThread.hpp"
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"

 #ifdef _WIN32
 #include <Windows.h> // for Sleep()
--- a/source/client/common/PerlinNoise.cpp
+++ b/source/client/common/PerlinNoise.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "PerlinNoise.hpp"
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"

 PerlinNoise::PerlinNoise(int nOctaves)
 {
--- a/source/client/common/Random.cpp
+++ b/source/client/common/Random.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Random.hpp"
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"

 /* Period parameters */
 #define N 624
--- a/source/client/common/Timer.cpp
+++ b/source/client/common/Timer.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Timer.hpp"
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"

 #if !defined(_WIN32) && defined(USE_ACCURATE_TIMER)
 #error "Implement getAccurateTimeMs() for your platform!"
--- a/source/client/common/Utils.cpp
+++ b/source/client/common/Utils.cpp
@@ -8,7 +8,7 @@

 // note: not an official file name

-#include "Utils.hpp"
+#include "client/common/Utils.hpp"

 #ifdef _WIN32

--- a/source/client/gui/Gui.hpp
+++ b/source/client/gui/Gui.hpp
@@ -10,8 +10,8 @@

 #include "GuiComponent.hpp"
 #include "Minecraft.hpp"
-#include "Random.hpp"
-#include "Utils.hpp"
+#include "client/common/Random.hpp"
+#include "client/common/Utils.hpp"

 class Minecraft; // in case we're included from Minecraft.hpp

--- a/source/client/gui/GuiComponent.hpp
+++ b/source/client/gui/GuiComponent.hpp
@@ -8,8 +8,8 @@

 #pragma once

-#include "Tesselator.hpp"
-#include "Font.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/Font.hpp"

 class GuiComponent
 {
--- a/source/client/gui/Screen.hpp
+++ b/source/client/gui/Screen.hpp
@@ -8,10 +8,10 @@

 #pragma once

-#include "Mouse.hpp"
-#include "Keyboard.hpp"
-#include "Button.hpp"
-#include "TextInputBox.hpp"
+#include "client/player/input/Mouse.hpp"
+#include "client/player/input/Keyboard.hpp"
+#include "components/Button.hpp"
+#include "components/TextInputBox.hpp"

 class Button;

--- a/source/client/gui/components/AvailableGamesList.hpp
+++ b/source/client/gui/components/AvailableGamesList.hpp
@@ -9,7 +9,7 @@
 #pragma once

 #include "ScrolledSelectionList.hpp"
-#include "PingedCompatibleServer.hpp"
+#include "client/network/PingedCompatibleServer.hpp"

 class AvailableGamesList : public ScrolledSelectionList
 {
--- a/source/client/gui/components/Button.hpp
+++ b/source/client/gui/components/Button.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "GuiComponent.hpp"
+#include "../GuiComponent.hpp"
 #include "Minecraft.hpp"

 class Screen;
--- a/source/client/gui/components/RolledSelectionList.hpp
+++ b/source/client/gui/components/RolledSelectionList.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "GuiComponent.hpp"
+#include "../GuiComponent.hpp"
 #include "Minecraft.hpp"

 class RolledSelectionList : public GuiComponent
--- a/source/client/gui/components/ScrolledSelectionList.hpp
+++ b/source/client/gui/components/ScrolledSelectionList.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "GuiComponent.hpp"
+#include "../GuiComponent.hpp"
 #include "Minecraft.hpp"

 class ScrolledSelectionList : public GuiComponent
--- a/source/client/gui/components/TextInputBox.hpp
+++ b/source/client/gui/components/TextInputBox.hpp
@@ -8,8 +8,8 @@

 #pragma once

-#include "Utils.hpp"
-#include "GuiComponent.hpp"
+#include "../GuiComponent.hpp"
+#include "client/common/Utils.hpp"

 class Minecraft;

--- a/source/client/gui/components/WorldSelectionList.cpp
+++ b/source/client/gui/components/WorldSelectionList.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "WorldSelectionList.hpp"
-#include "Utils.hpp"
+#include "client/common/Utils.hpp"

 static float WorldSelectionList_Static1(float a, float b, float c, float d)
 {
--- a/source/client/gui/screens/ChatScreen.hpp
+++ b/source/client/gui/screens/ChatScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class ChatScreen : public Screen
 {
--- a/source/client/gui/screens/ConfirmScreen.hpp
+++ b/source/client/gui/screens/ConfirmScreen.hpp
@@ -8,8 +8,8 @@

 #pragma once

-#include "Screen.hpp"
-#include "SmallButton.hpp"
+#include "../Screen.hpp"
+#include "../components/SmallButton.hpp"

 class ConfirmScreen : public Screen
 {
--- a/source/client/gui/screens/CreateWorldScreen.hpp
+++ b/source/client/gui/screens/CreateWorldScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 #ifndef ORIGINAL_CODE

--- a/source/client/gui/screens/DeleteWorldScreen.hpp
+++ b/source/client/gui/screens/DeleteWorldScreen.hpp
@@ -9,6 +9,7 @@
 #pragma once

 #include "ConfirmScreen.hpp"
+#include "world/level/storage/LevelStorageSource.hpp"

 class DeleteWorldScreen : public ConfirmScreen
 {
--- a/source/client/gui/screens/IngameBlockSelectionScreen.hpp
+++ b/source/client/gui/screens/IngameBlockSelectionScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class Inventory;

--- a/source/client/gui/screens/InvalidLicenseScreen.hpp
+++ b/source/client/gui/screens/InvalidLicenseScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class InvalidLicenseScreen : public Screen
 {
--- a/source/client/gui/screens/JoinGameScreen.hpp
+++ b/source/client/gui/screens/JoinGameScreen.hpp
@@ -8,8 +8,8 @@

 #pragma once

-#include "Screen.hpp"
-#include "AvailableGamesList.hpp"
+#include "../Screen.hpp"
+#include "../components/AvailableGamesList.hpp"

 class JoinGameScreen : public Screen
 {
--- a/source/client/gui/screens/OptionsScreen.hpp
+++ b/source/client/gui/screens/OptionsScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class OptionsScreen : public Screen
 {
--- a/source/client/gui/screens/PauseScreen.cpp
+++ b/source/client/gui/screens/PauseScreen.cpp
@@ -8,7 +8,7 @@

 #include "PauseScreen.hpp"
 #include "OptionsScreen.hpp"
-#include "ServerSideNetworkHandler.hpp"
+#include "client/network/ServerSideNetworkHandler.hpp"

 PauseScreen::PauseScreen() :
 	m_btnBack(1, "Back to game"),
--- a/source/client/gui/screens/PauseScreen.hpp
+++ b/source/client/gui/screens/PauseScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class PauseScreen : public Screen
 {
--- a/source/client/gui/screens/ProgressScreen.hpp
+++ b/source/client/gui/screens/ProgressScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class ProgressScreen : public Screen
 {
--- a/source/client/gui/screens/RenameMPLevelScreen.hpp
+++ b/source/client/gui/screens/RenameMPLevelScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class RenameMPLevelScreen : public Screen
 {
--- a/source/client/gui/screens/SavingWorldScreen.hpp
+++ b/source/client/gui/screens/SavingWorldScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 #ifdef ENH_IMPROVED_SAVING

--- a/source/client/gui/screens/SelectWorldScreen.hpp
+++ b/source/client/gui/screens/SelectWorldScreen.hpp
@@ -8,8 +8,8 @@

 #pragma once

-#include "Screen.hpp"
-#include "WorldSelectionList.hpp"
+#include "../Screen.hpp"
+#include "../components/WorldSelectionList.hpp"

 class SelectWorldScreen : public Screen
 {
--- a/source/client/gui/screens/StartMenuScreen.hpp
+++ b/source/client/gui/screens/StartMenuScreen.hpp
@@ -8,7 +8,7 @@

 #pragma once

-#include "Screen.hpp"
+#include "../Screen.hpp"

 class StartMenuScreen : public Screen
 {
--- a/source/client/network/NetEventCallback.hpp
+++ b/source/client/network/NetEventCallback.hpp
@@ -23,7 +23,7 @@ class UpdateBlockPacket;
 class RequestChunkPacket;
 class ChunkDataPacket;
 class PlayerEquipmentPacket;
-#include "Level.hpp"
+#include "world/level/Level.hpp"
 class Level;

 class NetEventCallback
--- a/source/client/network/Packet.hpp
+++ b/source/client/network/Packet.hpp
@@ -9,7 +9,7 @@
 #pragma once

 #include <string>
-#include "LongHack.hpp"
+#include "client/common/LongHack.hpp"
 #include "RakNetTypes.h"
 #include "BitStream.h"
 #include "MessageIdentifiers.h"
--- a/source/client/renderer/Font.hpp
+++ b/source/client/renderer/Font.hpp
@@ -9,7 +9,7 @@
 #pragma once

 #include "Textures.hpp"
-#include "Options.hpp"
+#include "client/common/Options.hpp"

 class Font
 {
--- a/source/client/renderer/Textures.hpp
+++ b/source/client/renderer/Textures.hpp
@@ -10,7 +10,7 @@
 #include <map>

 #include "compat/GL.hpp"
-#include "Options.hpp"
+#include "client/common/Options.hpp"
 #include "AppPlatform.hpp"
 #include "DynamicTexture.hpp"