.h -> .hpp everything

src/App.cpp

@@ -1,8 +1,8 @@
-#include "App.h"
+#include "App.hpp"
-#include "IPlatform.h"
+#include "IPlatform.hpp"
 
-#include "platform/server/PlatformServer.h"
+#include "platform/server/PlatformServer.hpp"
-#include "platform/glfw/PlatformGlfw.h"
+#include "platform/glfw/PlatformGlfw.hpp"
 
 std::unique_ptr<IPlatform> App::CreatePlatform() {
 #if defined(STANDALONE_SERVER)

src/App.hpp

@@ -8,7 +8,7 @@
 #define NO_EGL
 #endif
 
-#include <IPlatform.h>
+#include <IPlatform.hpp>
 #ifndef NO_EGL 
     #include <EGL/egl.h>
 #endif

src/IPlatform.cpp

@@ -1,5 +1,5 @@
-#include <IPlatform.h>
+#include <IPlatform.hpp>
-#include <App.h>
+#include <App.hpp>
 #include <fstream>
 
 void IPlatform::runMainLoop(App& app) {

src/IPlatform.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 #include <string>
-#include "client/renderer/TextureData.h"
+#include "client/renderer/TextureData.hpp"
 #include <cstdint>
 
 typedef std::vector<std::string> StringVector;

src/Minecraft.cpp

@@ -1,17 +1,17 @@
-#include <Minecraft.h>
+#include <Minecraft.hpp>
-#include "gamemode/CreativeMode.h"
+#include "gamemode/CreativeMode.hpp"
-#include "gamemode/SurvivalMode.h"
+#include "gamemode/SurvivalMode.hpp"
-#include "gamemode/CreatorMode.h"
+#include "gamemode/CreatorMode.hpp"
-#include "world/entity/player/Player.h"
+#include "world/entity/player/Player.hpp"
-#include "world/item/Item.h"
+#include "world/item/Item.hpp"
-#include "world/item/ItemInstance.h"
+#include "world/item/ItemInstance.hpp"
-#include "world/item/crafting/Recipes.h"
+#include "world/item/crafting/Recipes.hpp"
-#include "world/level/Level.h"
+#include "world/level/Level.hpp"
-#include "world/level/tile/entity/TileEntity.h"
+#include "world/level/tile/entity/TileEntity.hpp"
 #include <string>
 #include <cstdlib>
-#include "client/gui/Screen.h"
+#include "client/gui/Screen.hpp"
-#include "world/level/storage/ExternalFileLevelStorageSource.h"
+#include "world/level/storage/ExternalFileLevelStorageSource.hpp"
 
 #if defined(APPLE_DEMO_PROMOTION)
     #define NO_NETWORK
@@ -20,32 +20,32 @@
 #if defined(RPI)
 	#define CREATORMODE
 #endif
-#include "network/RakNetInstance.h"
+#include "network/RakNetInstance.hpp"
-#include "network/ClientSideNetworkHandler.h"
+#include "network/ClientSideNetworkHandler.hpp"
-#include "network/ServerSideNetworkHandler.h"
+#include "network/ServerSideNetworkHandler.hpp"
-//#include "network/Packet.h"
+//#include "network/Packet.hpp"
-#include "world/entity/player/Inventory.h"
+#include "world/entity/player/Inventory.hpp"
-#include "world/level/tile/Tile.h"
+#include "world/level/tile/Tile.hpp"
-#include "world/level/storage/LevelStorageSource.h"
+#include "world/level/storage/LevelStorageSource.hpp"
-#include "world/level/storage/LevelStorage.h"
+#include "world/level/storage/LevelStorage.hpp"
-#include "world/level/chunk/ChunkSource.h"
+#include "world/level/chunk/ChunkSource.hpp"
 
-#include "platform/CThread.h"
+#include "platform/CThread.hpp"
-#include <IPlatform.h>
+#include <IPlatform.hpp>
-#include "util/PerfTimer.h"
+#include "util/PerfTimer.hpp"
-#include "util/PerfRenderer.h"
+#include "util/PerfRenderer.hpp"
 
-#include "world/entity/MobFactory.h"
+#include "world/entity/MobFactory.hpp"
-#include "world/level/MobSpawner.h"
+#include "world/level/MobSpawner.hpp"
-#include "util/Mth.h"
+#include "util/Mth.hpp"
-#include "world/entity/MobCategory.h"
+#include "world/entity/MobCategory.hpp"
-#include "server/ServerLevel.h"
+#include "server/ServerLevel.hpp"
 
 #ifdef CREATORMODE
-#include "server/CreatorLevel.h"
+#include "server/CreatorLevel.hpp"
 #endif
 
-#include "network/command/CommandServer.h"
+#include "network/command/CommandServer.hpp"
 
 /*static*/
 const char* Minecraft::progressMessages[] = {

src/Minecraft.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "client/Options.h"
+#include "client/Options.hpp"
-#include "client/Timer.h"
+#include "client/Timer.hpp"
 
-//#include "../network/RakNetInstance.h"
+//#include "../network/RakNetInstance.hpp"
-#include "world/phys/HitResult.h"
+#include "world/phys/HitResult.hpp"
 
-#include "App.h"
+#include "App.hpp"
 #include <cstddef>
 
 class Level;

src/MinecraftClient.cpp

@@ -1,36 +1,36 @@
-#include "Minecraft.h"
+#include "Minecraft.hpp"
-#include "client/Options.h"
+#include "client/Options.hpp"
-#include "client/gamemode/GameMode.h"
+#include "client/gamemode/GameMode.hpp"
-#include "client/gui/screens/ChatScreen.h"
+#include "client/gui/screens/ChatScreen.hpp"
-#include "client/gui/screens/ConsoleScreen.h"
+#include "client/gui/screens/ConsoleScreen.hpp"
-#include "client/gui/screens/DeathScreen.h"
+#include "client/gui/screens/DeathScreen.hpp"
-#include "client/gui/screens/UsernameScreen.h"
+#include "client/gui/screens/UsernameScreen.hpp"
-#include "client/player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "client/player/input/IBuildInput.h"
+#include "client/player/input/IBuildInput.hpp"
-#include "client/player/input/IInputHolder.h"
+#include "client/player/input/IInputHolder.hpp"
-#include "client/player/input/KeyboardInput.h"
+#include "client/player/input/KeyboardInput.hpp"
-#include "client/player/input/MouseBuildInput.h"
+#include "client/player/input/MouseBuildInput.hpp"
-#include "client/player/input/MouseTurnInput.h"
+#include "client/player/input/MouseTurnInput.hpp"
-#include "client/player/input/touchscreen/TouchscreenInput.h"
+#include "client/player/input/touchscreen/TouchscreenInput.hpp"
-#include "client/player/input/touchscreen/TouchInputHolder.h"
+#include "client/player/input/touchscreen/TouchInputHolder.hpp"
-#include "client/renderer/Chunk.h"
+#include "client/renderer/Chunk.hpp"
-#include "client/renderer/EntityTileRenderer.h"
+#include "client/renderer/EntityTileRenderer.hpp"
-#include "client/renderer/ItemInHandRenderer.h"
+#include "client/renderer/ItemInHandRenderer.hpp"
-#include "client/renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "client/renderer/entity/EntityRenderDispatcher.h"
+#include "client/renderer/entity/EntityRenderDispatcher.hpp"
-#include "client/renderer/entity/ItemRenderer.h"
+#include "client/renderer/entity/ItemRenderer.hpp"
-#include "client/renderer/ptexture/DynamicTexture.h"
+#include "client/renderer/ptexture/DynamicTexture.hpp"
-#include "network/RakNetInstance.h"
+#include "network/RakNetInstance.hpp"
-#include "network/ServerSideNetworkHandler.h"
+#include "network/ServerSideNetworkHandler.hpp"
-#include "network/packet/InteractPacket.h"
+#include "network/packet/InteractPacket.hpp"
-#include "network/packet/RespawnPacket.h"
+#include "network/packet/RespawnPacket.hpp"
-#include "platform/CThread.h"
+#include "platform/CThread.hpp"
-#include "platform/input/Multitouch.h"
+#include "platform/input/Multitouch.hpp"
-#include "util/PerfRenderer.h"
+#include "util/PerfRenderer.hpp"
-#include "util/PerfTimer.h"
+#include "util/PerfTimer.hpp"
-#include "world/level/Level.h"
+#include "world/level/Level.hpp"
-#include "world/level/chunk/ChunkSource.h"
+#include "world/level/chunk/ChunkSource.hpp"
-#include <MinecraftClient.h>
+#include <MinecraftClient.hpp>
 
 static void checkGlError(const char* tag) {
 #ifdef GLDEBUG

src/MinecraftClient.hpp

@@ -1,18 +1,18 @@
 #pragma once
-#include "client/gui/Font.h"
+#include "client/gui/Font.hpp"
-#include "client/gui/Screen.h"
+#include "client/gui/Screen.hpp"
-#include "client/particle/ParticleEngine.h"
+#include "client/particle/ParticleEngine.hpp"
-#include "client/player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "client/renderer/GameRenderer.h"
+#include "client/renderer/GameRenderer.hpp"
-#include "client/renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include "client/sound/SoundEngine.h"
+#include "client/sound/SoundEngine.hpp"
-#include <Minecraft.h>
+#include <Minecraft.hpp>
 
-#include <client/MouseHandler.h>
+#include <client/MouseHandler.hpp>
-#include <client/gui/Gui.h>
+#include <client/gui/Gui.hpp>
-#include <client/gui/screens/ScreenChooser.h>
+#include <client/gui/screens/ScreenChooser.hpp>
-#include <client/PixelCalc.h>
+#include <client/PixelCalc.hpp>
-#include <client/renderer/LevelRenderer.h>
+#include <client/renderer/LevelRenderer.hpp>
 
 class MinecraftClient : public Minecraft {
 public:

src/MinecraftServer.cpp

@@ -1,6 +1,6 @@
-#include "MinecraftServer.h"
+#include "MinecraftServer.hpp"
-#include <Minecraft.h>
+#include <Minecraft.hpp>
-#include <network/RakNetInstance.h>
+#include <network/RakNetInstance.hpp>
 
 
 void MinecraftServer::hostMultiplayer(int port) {

src/MinecraftServer.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.h>
+#include <Minecraft.hpp>
 
 class MinecraftServer : public Minecraft { 
 public:

src/Performance.cpp

@@ -1,4 +1,4 @@
-#include "Performance.h"
+#include "Performance.hpp"
 
 /*static*/
 StopwatchHandler Performance::watches;

src/Performance.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "platform/time.h"
+#include "platform/time.hpp"
 
 class Performance
 {

src/SharedConstants.cpp

@@ -1,4 +1,4 @@
-#include "SharedConstants.h"
+#include "SharedConstants.hpp"
 
 namespace Common {
 

src/client/IConfigListener.cpp

@@ -1,7 +1,7 @@
-#include "IConfigListener.h"
+#include "IConfigListener.hpp"
-#include "Minecraft.h"
+#include "Minecraft.hpp"
 #ifndef STANDALONE_SERVER
-#include "gui/Gui.h"
+#include "gui/Gui.hpp"
 #endif /* STANDALONE_SERVER */
 Config createConfig(Minecraft* mc) {
 	Config c;

src/client/IConfigListener.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "PixelCalc.h"
+#include "PixelCalc.hpp"
 class Minecraft;
 class Options;
 

src/client/MouseHandler.cpp

@@ -1,5 +1,5 @@
-#include "MouseHandler.h"
+#include "MouseHandler.hpp"
-#include "player/input/ITurnInput.h"
+#include "player/input/ITurnInput.hpp"
 
 #ifdef RPI
 #include <SDL/SDL.h>

src/client/Option.cpp

@@ -1,4 +1,4 @@
-#include "Option.h"
+#include "Option.hpp"
 #include <sstream>
 #include <cstdio>
 

src/client/Option.hpp

@@ -1,7 +1,7 @@
 #pragma once 
 #include <sstream>
 #include <type_traits>
-#include <util/Mth.h>
+#include <util/Mth.hpp>
 /*
 template<typename T>
 struct is_option_type : std::false_type {};

src/client/OptionStrings.cpp

@@ -1,4 +1,4 @@
-#include "OptionStrings.h"
+#include "OptionStrings.hpp"
 
 const char* OptionStrings::Multiplayer_Username        = "mp_username";
 const char* OptionStrings::Multiplayer_ServerVisible   = "mp_server_visible_default";

src/client/Options.cpp

@@ -1,6 +1,6 @@
-#include "Options.h"
+#include "Options.hpp"
-#include "../world/Difficulty.h"
+#include "world/Difficulty.hpp"
-#include <MinecraftClient.h>
+#include <MinecraftClient.hpp>
 
 bool Options::debugGl = false;
 

src/client/Options.hpp

@@ -11,13 +11,13 @@
 
 //package net.minecraft.client;
 
-//#include "locale/Language.h"
+//#include "locale/Language.hpp"
 
 #include <string>
-#include <platform/input/Keyboard.h>
+#include <platform/input/Keyboard.hpp>
-#include <util/StringUtils.h>
+#include <util/StringUtils.hpp>
-#include "OptionsFile.h"
+#include "OptionsFile.hpp"
-#include "Option.h"
+#include "Option.hpp"
 #include <array>
 
 enum OptionId {

src/client/OptionsFile.cpp

@@ -1,8 +1,8 @@
-#include "OptionsFile.h"
+#include "OptionsFile.hpp"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <platform/log.h>
+#include <platform/log.hpp>
 
 #if defined(_WIN32)
     #include <direct.h>

src/client/Timer.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 //package net.minecraft.client;
-#include "../platform/time.h"
+#include "platform/time.hpp"
 
 class Timer
 {

src/client/gui/Font.cpp

@@ -1,10 +1,10 @@
-#include "Font.h"
+#include "Font.hpp"
 
-//#include "SharedConstants.h"
+//#include "SharedConstants.hpp"
-#include "../Options.h"
+#include "client/Options.hpp"
-#include "../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include "../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../util/Mth.h"
+#include "util/Mth.hpp"
 #include <cstring>
 
 Font::Font( Options* options, const std::string& name, Textures* textures )

src/client/gui/Font.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <cctype>
 
-#include "../renderer/gles.h"
+#include "client/renderer/gles.hpp"
 
 class Textures;
 class Options;

src/client/gui/Gui.cpp

@@ -1,31 +1,31 @@
-#include "Gui.h"
+#include "Gui.hpp"
-#include "Font.h"
+#include "Font.hpp"
-#include "MinecraftClient.h"
+#include "MinecraftClient.hpp"
-#include "client/Options.h"
+#include "client/Options.hpp"
-#include "platform/input/Keyboard.h"
+#include "platform/input/Keyboard.hpp"
-#include "screens/IngameBlockSelectionScreen.h"
+#include "screens/IngameBlockSelectionScreen.hpp"
-#include "screens/ChatScreen.h"
+#include "screens/ChatScreen.hpp"
-#include "screens/ConsoleScreen.h"
+#include "screens/ConsoleScreen.hpp"
-#include <Minecraft.h>
+#include <Minecraft.hpp>
-#include "../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../renderer/TileRenderer.h"
+#include "client/renderer/TileRenderer.hpp"
-#include "../renderer/LevelRenderer.h"
+#include "client/renderer/LevelRenderer.hpp"
-#include "../renderer/GameRenderer.h"
+#include "client/renderer/GameRenderer.hpp"
-#include "../renderer/entity/ItemRenderer.h"
+#include "client/renderer/entity/ItemRenderer.hpp"
-#include "../player/input/IInputHolder.h"
+#include "client/player/input/IInputHolder.hpp"
-#include "../gamemode/GameMode.h"
+#include "client/gamemode/GameMode.hpp"
-#include "../gamemode/CreativeMode.h"
+#include "client/gamemode/CreativeMode.hpp"
-#include "../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include "../../AppConstants.h"
+#include "AppConstants.hpp"
-#include "../../world/entity/player/Inventory.h"
+#include "world/entity/player/Inventory.hpp"
-#include "../../world/level/material/Material.h"
+#include "world/level/material/Material.hpp"
-#include "../../world/item/Item.h"
+#include "world/item/Item.hpp"
-#include "../../world/item/ItemInstance.h"
+#include "world/item/ItemInstance.hpp"
-#include "../../platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
-#include "../../world/level/Level.h"
+#include "world/level/Level.hpp"
-#include "../../world/PosTranslator.h"
+#include "world/PosTranslator.hpp"
-#include "../../platform/time.h"
+#include "platform/time.hpp"
 #include <cmath>
 #include <algorithm>
 #include <sstream>

src/client/gui/Gui.hpp

@@ -2,12 +2,12 @@
 
 //package net.minecraft.client.gui;
 
-#include "GuiComponent.h"
+#include "GuiComponent.hpp"
-#include "Font.h"
+#include "Font.hpp"
-#include "../player/input/touchscreen/TouchAreaModel.h"
+#include "client/player/input/touchscreen/TouchAreaModel.hpp"
-#include "../renderer/RenderChunk.h"
+#include "client/renderer/RenderChunk.hpp"
-#include "../../util/Random.h"
+#include "util/Random.hpp"
-#include "../IConfigListener.h"
+#include "client/IConfigListener.hpp"
 
 class MinecraftClient;
 class ItemInstance;

src/client/gui/GuiComponent.cpp

@@ -1,8 +1,8 @@
-#include "GuiComponent.h"
+#include "GuiComponent.hpp"
 
-#include "../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../renderer/gles.h"
+#include "client/renderer/gles.hpp"
-#include "Font.h"
+#include "Font.hpp"
 
 
 GuiComponent::GuiComponent()

src/client/gui/Screen.cpp

@@ -1,12 +1,12 @@
-#include "Screen.h"
+#include "Screen.hpp"
-#include "components/Button.h"
+#include "components/Button.hpp"
-#include "components/TextBox.h"
+#include "components/TextBox.hpp"
-#include <Minecraft.h>
+#include <Minecraft.hpp>
-#include "../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../sound/SoundEngine.h"
+#include "client/sound/SoundEngine.hpp"
-#include "../../platform/input/Keyboard.h"
+#include "platform/input/Keyboard.hpp"
-#include "../../platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
-#include "../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
 
 Screen::Screen()
 :   passEvents(false),

src/client/gui/Screen.hpp

@@ -3,7 +3,7 @@
 //package net.minecraft.client.gui;
 
 #include <vector>
-#include "GuiComponent.h"
+#include "GuiComponent.hpp"
 
 class Font;
 class Minecraft;

src/client/gui/components/Button.cpp

@@ -1,6 +1,6 @@
-#include "Button.h"
+#include "Button.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
 
 Button::Button(int id, const std::string& msg)
 :	GuiElement(true, true, 0, 0, 200, 24),

src/client/gui/components/Button.hpp

@@ -3,8 +3,8 @@
 //package net.minecraft.client.gui;
 
 #include <string>
-#include "GuiElement.h"
+#include "GuiElement.hpp"
-#include "../../Options.h"
+#include "client/Options.hpp"
 
 class Font;
 class Minecraft;

src/client/gui/components/GButton.cpp

@@ -1 +1 @@
-#include "GuiElement.h"
+#include "GuiElement.hpp"

src/client/gui/components/GButton.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "Button.h"
+#include "Button.hpp"
 
 class GButton: public Button {
 	typedef Button super;

src/client/gui/components/GuiElement.cpp

@@ -1,4 +1,4 @@
-#include "GuiElement.h"
+#include "GuiElement.hpp"
 
 GuiElement::GuiElement( bool active/*=false*/, bool visible/*=true*/, int x /*= 0*/, int y /*= 0*/, int width/*=24*/, int height/*=24*/ )
 : active(active),

src/client/gui/components/GuiElement.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "../GuiComponent.h"
+#include "client/gui/GuiComponent.hpp"
 
 class Tesselator;
 class Minecraft;

src/client/gui/components/GuiElementContainer.cpp

@@ -1,4 +1,4 @@
-#include "GuiElementContainer.h"
+#include "GuiElementContainer.hpp"
 #include <algorithm>
 GuiElementContainer::GuiElementContainer( bool active/*=false*/, bool visible/*=true*/, int x /*= 0*/, int y /*= 0*/, int width/*=24*/, int height/*=24*/ )
 : GuiElement(active, visible, x, y, width, height) {

src/client/gui/components/GuiElementContainer.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "GuiElement.h"
+#include "GuiElement.hpp"
 #include <vector>
 class Tesselator;
 class Minecraft;

src/client/gui/components/ImageButton.cpp

@@ -1,10 +1,10 @@
-#include "ImageButton.h"
+#include "ImageButton.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../../platform/log.h"
+#include "platform/log.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include <client/Option.h>
+#include <client/Option.hpp>
 
 
 ImageButton::ImageButton(int id, const std::string& msg)

src/client/gui/components/ImageButton.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Button.h"
+#include "Button.hpp"
 
 typedef struct IntRectangle {
 	IntRectangle()

src/client/gui/components/InventoryPane.cpp

@@ -1,12 +1,12 @@
-#include "InventoryPane.h"
+#include "InventoryPane.hpp"
-#include "../Gui.h"
+#include "client/gui/Gui.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/input/touchscreen/TouchAreaModel.h"
+#include "client/player/input/touchscreen/TouchAreaModel.hpp"
-#include "../../renderer/entity/ItemRenderer.h"
+#include "client/renderer/entity/ItemRenderer.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include "../../../world/item/ItemInstance.h"
+#include "world/item/ItemInstance.hpp"
-#include "../../../world/entity/player/Inventory.h"
+#include "world/entity/player/Inventory.hpp"
 
 namespace Touch {
 

src/client/gui/components/InventoryPane.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ScrollingPane.h"
+#include "ScrollingPane.hpp"
-#include "ImageButton.h"
+#include "ImageButton.hpp"
 
 class Minecraft;
 class ItemInstance;

src/client/gui/components/ItemPane.cpp

@@ -1,9 +1,9 @@
-#include "ItemPane.h"
+#include "ItemPane.hpp"
-#include "../Gui.h"
+#include "client/gui/Gui.hpp"
-#include "../../renderer/gles.h"
+#include "client/renderer/gles.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "NinePatch.h"
+#include "NinePatch.hpp"
-#include "../../renderer/entity/ItemRenderer.h"
+#include "client/renderer/entity/ItemRenderer.hpp"
 
 const int rgbActive = 0xfff0f0f0;
 const int rgbInactive = 0xc0635558;

src/client/gui/components/ItemPane.hpp

@@ -2,8 +2,8 @@
 
 #include <string>
 #include <vector>
-#include "ScrollingPane.h"
+#include "ScrollingPane.hpp"
-#include "../../../world/item/ItemInstance.h"
+#include "world/item/ItemInstance.hpp"
 
 class Font;
 class Textures;

src/client/gui/components/KeyOption.cpp

@@ -1,5 +1,5 @@
-#include "KeyOption.h"
+#include "KeyOption.hpp"
-#include <client/Minecraft.h>
+#include <client/Minecraft.hpp>
 
 KeyOption::KeyOption(Minecraft* minecraft, OptionId optId) 
     : Touch::TButton((int)optId, Keyboard::getKeyName(minecraft->options.getIntValue(optId))) {}

src/client/gui/components/KeyOption.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "Button.h"
+#include "Button.hpp"
-#include <client/Options.h>
+#include <client/Options.hpp>
 
 class KeyOption : public Touch::TButton {
 public:

src/client/gui/components/LargeImageButton.cpp

@@ -1,10 +1,10 @@
-#include "LargeImageButton.h"
+#include "LargeImageButton.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
-#include "../../../platform/log.h"
+#include "platform/log.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
 
 
 LargeImageButton::LargeImageButton(int id, const std::string& msg)

src/client/gui/components/LargeImageButton.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ImageButton.h"
+#include "ImageButton.hpp"
 
 class LargeImageButton: public ImageButton
 {

src/client/gui/components/NinePatch.cpp

@@ -1,4 +1,4 @@
-#include "NinePatch.h"
+#include "NinePatch.hpp"
 
 NinePatchDescription::NinePatchDescription( float x, float y, float x1, float x2, float x3, float y1, float y2, float y3, float w, float e, float n, float s ) :   u0(x), u1(x + x1), u2(x + x2), u3(x + x3),
 	v0(y), v1(y + y1), v2(y + y2), v3(y + y3),

src/client/gui/components/NinePatch.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "ImageButton.h"
+#include "ImageButton.hpp"
-#include "../../renderer/TextureData.h"
+#include "client/renderer/TextureData.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
 
 class Tesselator;
 

src/client/gui/components/OptionsGroup.cpp

@@ -1,11 +1,11 @@
-#include "OptionsGroup.h"
+#include "OptionsGroup.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "ImageButton.h"
+#include "ImageButton.hpp"
-#include "OptionsItem.h"
+#include "OptionsItem.hpp"
-#include "Slider.h"
+#include "Slider.hpp"
-#include "../../../locale/I18n.h"
+#include "locale/I18n.hpp"
-#include "TextOption.h"
+#include "TextOption.hpp"
-#include "KeyOption.h"
+#include "KeyOption.hpp"
 
 OptionsGroup::OptionsGroup( std::string labelID )  {
 	label = I18n::get(labelID);

src/client/gui/components/OptionsGroup.hpp

@@ -3,9 +3,9 @@
 //package net.minecraft.client.gui;
 
 #include <string>
-#include "GuiElementContainer.h"
+#include "GuiElementContainer.hpp"
-#include "ScrollingPane.h"
+#include "ScrollingPane.hpp"
-#include "../../Options.h"
+#include "client/Options.hpp"
 
 class Font;
 class Minecraft;

src/client/gui/components/OptionsItem.cpp

@@ -1,7 +1,7 @@
-#include "OptionsItem.h"
+#include "OptionsItem.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../../locale/I18n.h"
+#include "locale/I18n.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
 OptionsItem::OptionsItem( OptionId optionId, std::string label, GuiElement* element )
 : GuiElementContainer(false, true, 0, 0, 24, 12),
   m_optionId(optionId),

src/client/gui/components/OptionsItem.hpp

@@ -2,9 +2,9 @@
 
 #include <string>
 #include <vector>
-#include "GuiElementContainer.h"
+#include "GuiElementContainer.hpp"
-#include "../../../world/item/ItemInstance.h"
+#include "world/item/ItemInstance.hpp"
-#include "../../../client/Options.h"
+#include "client/Options.hpp"
 class Font; 
 class Textures;
 class NinePatchLayer;

src/client/gui/components/RolledSelectionListH.cpp

@@ -1,11 +1,11 @@
-#include "RolledSelectionListH.h"
+#include "RolledSelectionListH.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../renderer/gles.h"
+#include "client/renderer/gles.hpp"
-#include "../../../platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
-#include "../../../platform/input/Multitouch.h"
+#include "platform/input/Multitouch.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include "MinecraftClient.h"
+#include "MinecraftClient.hpp"
 
 
 RolledSelectionListH::RolledSelectionListH( MinecraftClient& minecraft, int width, int height, int x0, int x1, int y0, int y1, int itemWidth )

src/client/gui/components/RolledSelectionListH.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../GuiComponent.h"
+#include "client/gui/GuiComponent.hpp"
 class MinecraftClient;
 class Tesselator;
 

src/client/gui/components/RolledSelectionListV.cpp

@@ -1,10 +1,10 @@
-#include "RolledSelectionListV.h"
+#include "RolledSelectionListV.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../renderer/gles.h"
+#include "client/renderer/gles.hpp"
-#include "../../../platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
 
 
 RolledSelectionListV::RolledSelectionListV( Minecraft* minecraft_, int width_, int height_, int x0_, int x1_, int y0_, int y1_, int itemHeight_ )

src/client/gui/components/RolledSelectionListV.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../GuiComponent.h"
+#include "client/gui/GuiComponent.hpp"
 class Minecraft;
 class Tesselator;
 

src/client/gui/components/ScrolledSelectionList.cpp

@@ -1,9 +1,9 @@
-#include "ScrolledSelectionList.h"
+#include "ScrolledSelectionList.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../renderer/gles.h"
+#include "client/renderer/gles.hpp"
-#include "../../../platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
 
 static int Abs(int d) {
 	return d >= 0? d : -d;

src/client/gui/components/ScrolledSelectionList.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../GuiComponent.h"
+#include "client/gui/GuiComponent.hpp"
 class Minecraft;
 class Tesselator;
 

src/client/gui/components/ScrollingPane.cpp

@@ -1,8 +1,8 @@
-#include "ScrollingPane.h"
+#include "ScrollingPane.hpp"
-#include "../../renderer/gles.h"
+#include "client/renderer/gles.hpp"
-#include "../Gui.h"
+#include "client/gui/Gui.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
-#include "../../../SharedConstants.h"
+#include "SharedConstants.hpp"
 
 #define STR(x) (x.toString().c_str())
 

src/client/gui/components/ScrollingPane.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../GuiComponent.h"
+#include "client/gui/GuiComponent.hpp"
-#include "ImageButton.h"
+#include "ImageButton.hpp"
-#include "../../player/input/touchscreen/TouchAreaModel.h"
+#include "client/player/input/touchscreen/TouchAreaModel.hpp"
-#include "../../../world/phys/Vec3.h"
+#include "world/phys/Vec3.hpp"
-#include "../../Timer.h"
+#include "client/Timer.hpp"
 
 enum ScrollingPaneFlags {
 	SF_LockX		= 1 << 0,

src/client/gui/components/Slider.cpp

@@ -1,9 +1,9 @@
-#include "Slider.h"
+#include "Slider.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../renderer/Textures.h"
+#include "client/renderer/Textures.hpp"
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../../../locale/I18n.h"
+#include "locale/I18n.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
 #include <algorithm>
 #include <assert.h>
 

src/client/gui/components/Slider.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "GuiElement.h"
+#include "GuiElement.hpp"
-#include "../../../client/Options.h"
+#include "client/Options.hpp"
-#include <client/Option.h>
+#include <client/Option.hpp>
 
 class Slider : public GuiElement {
 	typedef GuiElement super;

src/client/gui/components/TextBox.cpp

@@ -1,8 +1,8 @@
-#include "TextBox.h"
+#include "TextBox.hpp"
-#include "../Gui.h"
+#include "client/gui/Gui.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../../AppPlatform.h"
+#include "AppPlatform.hpp"
-#include "../../../platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
 
 // delegate constructors
 TextBox::TextBox(int id, const std::string& msg)

src/client/gui/components/TextBox.hpp

@@ -3,10 +3,10 @@
 //package net.minecraft.client.gui;
 
 #include <string>
-#include "GuiElement.h"
+#include "GuiElement.hpp"
-#include "../../Options.h"
+#include "client/Options.hpp"
-#include "../../../platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
-#include "../../../platform/input/Keyboard.h"
+#include "platform/input/Keyboard.hpp"
 
 class Font;
 class Minecraft;

src/client/gui/components/TextOption.cpp

@@ -1,5 +1,5 @@
-#include "TextOption.h"
+#include "TextOption.hpp"
-#include <client/Minecraft.h>
+#include <client/Minecraft.hpp>
 
 TextOption::TextOption(Minecraft* minecraft, OptionId optId) 
     : TextBox((int)optId, minecraft->options.getOpt(optId)->getStringId()) 

src/client/gui/components/TextOption.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "TextBox.h"
+#include "TextBox.hpp"
-#include <client/Options.h>
+#include <client/Options.hpp>
 
 class TextOption : public TextBox {
 public:

src/client/gui/screens/ArmorScreen.cpp

@@ -1,18 +1,18 @@
-#include "ArmorScreen.h"
+#include "ArmorScreen.hpp"
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../components/NinePatch.h"
+#include "client/gui/components/NinePatch.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../renderer/entity/ItemRenderer.h"
+#include "client/renderer/entity/ItemRenderer.hpp"
-#include "../../../world/item/Item.h"
+#include "world/item/Item.hpp"
-#include "../../../world/item/ItemCategory.h"
+#include "world/item/ItemCategory.hpp"
-#include "../../../world/entity/player/Inventory.h"
+#include "world/entity/player/Inventory.hpp"
-#include "../../../world/entity/item/ItemEntity.h"
+#include "world/entity/item/ItemEntity.hpp"
-#include "../../../world/level/Level.h"
+#include "world/level/Level.hpp"
-#include "../../../network/RakNetInstance.h"
+#include "network/RakNetInstance.hpp"
-#include "../../renderer/entity/EntityRenderDispatcher.h"
+#include "client/renderer/entity/EntityRenderDispatcher.hpp"
-#include "../../../world/item/ArmorItem.h"
+#include "world/item/ArmorItem.hpp"
 
 static void setIfNotSet(bool& ref, bool condition) {
 	ref = (ref || condition);

src/client/gui/screens/ArmorScreen.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "BaseContainerScreen.h"
+#include "BaseContainerScreen.hpp"
 
-#include "../components/InventoryPane.h"
+#include "client/gui/components/InventoryPane.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
 
 class Font;
 class CItem;

src/client/gui/screens/BaseContainerScreen.hpp

@@ -3,9 +3,9 @@
 //package net.minecraft.client.gui.screens;
 
 #include <vector>
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
 
 class BaseContainerMenu;
 

src/client/gui/screens/ChatScreen.cpp

@@ -1,9 +1,9 @@
-#include "ChatScreen.h"
+#include "ChatScreen.hpp"
-#include "DialogDefinitions.h"
+#include "DialogDefinitions.hpp"
-#include "../Gui.h"
+#include "client/gui/Gui.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../../AppPlatform.h"
+#include "AppPlatform.hpp"
-#include "../../../platform/log.h"
+#include "platform/log.hpp"
 
 void ChatScreen::init() {
 	minecraft->platform()->createUserInput(DialogDefinitions::DIALOG_NEW_CHAT_MESSAGE);

src/client/gui/screens/ChatScreen.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
 
 class ChatScreen: public Screen
 {

src/client/gui/screens/ChestScreen.cpp

@@ -1,24 +1,24 @@
-#include "ChestScreen.h"
+#include "ChestScreen.hpp"
-#include "touch/TouchStartMenuScreen.h"
+#include "touch/TouchStartMenuScreen.hpp"
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../components/NinePatch.h"
+#include "client/gui/components/NinePatch.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../renderer/entity/ItemRenderer.h"
+#include "client/renderer/entity/ItemRenderer.hpp"
-#include "../../../world/item/Item.h"
+#include "world/item/Item.hpp"
-#include "../../../world/item/ItemCategory.h"
+#include "world/item/ItemCategory.hpp"
-#include "../../../world/entity/player/Inventory.h"
+#include "world/entity/player/Inventory.hpp"
-#include "../../../world/entity/item/ItemEntity.h"
+#include "world/entity/item/ItemEntity.hpp"
-#include "../../../world/level/Level.h"
+#include "world/level/Level.hpp"
-#include "../../../locale/I18n.h"
+#include "locale/I18n.hpp"
-#include "../../../util/StringUtils.h"
+#include "util/StringUtils.hpp"
-#include "../../../network/packet/ContainerSetSlotPacket.h"
+#include "network/packet/ContainerSetSlotPacket.hpp"
-#include "../../../network/RakNetInstance.h"
+#include "network/RakNetInstance.hpp"
-#include "../../../world/level/tile/entity/TileEntity.h"
+#include "world/level/tile/entity/TileEntity.hpp"
-#include "../../../world/level/tile/entity/ChestTileEntity.h"
+#include "world/level/tile/entity/ChestTileEntity.hpp"
-#include "../../../world/inventory/ContainerMenu.h"
+#include "world/inventory/ContainerMenu.hpp"
-#include "../../../util/Mth.h"
+#include "util/Mth.hpp"
 
 //static NinePatchLayer* guiPaneFrame = NULL;
 

src/client/gui/screens/ChestScreen.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "BaseContainerScreen.h"
+#include "BaseContainerScreen.hpp"
 
-#include "../components/InventoryPane.h"
+#include "client/gui/components/InventoryPane.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
 
 class Font;
 class CItem;

src/client/gui/screens/ChooseLevelScreen.cpp

@@ -1,7 +1,7 @@
-#include "ChooseLevelScreen.h"
+#include "ChooseLevelScreen.hpp"
 #include <algorithm>
 #include <set>
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
 
 void ChooseLevelScreen::init() {
 	loadLevelSource();

src/client/gui/screens/ChooseLevelScreen.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../../../world/level/storage/LevelStorageSource.h"
+#include "world/level/storage/LevelStorageSource.hpp"
 
 class ChooseLevelScreen: public Screen
 {

src/client/gui/screens/ConfirmScreen.cpp

@@ -1,6 +1,6 @@
-#include "ConfirmScreen.h"
+#include "ConfirmScreen.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
 
 ConfirmScreen::ConfirmScreen(Screen* parent_, const std::string& title1_, const std::string& title2_, int id_)
 :   parent(parent_),

src/client/gui/screens/ConfirmScreen.hpp

@@ -2,7 +2,7 @@
 
 //package net.minecraft.client.gui;
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
 #include <string>
 
 class ConfirmScreen: public Screen

src/client/gui/screens/ConsoleScreen.cpp

@@ -1,13 +1,13 @@
-#include "ConsoleScreen.h"
+#include "ConsoleScreen.hpp"
-#include "../Gui.h"
+#include "client/gui/Gui.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "../../../platform/input/Keyboard.h"
+#include "platform/input/Keyboard.hpp"
-#include "../../../world/level/Level.h"
+#include "world/level/Level.hpp"
-#include "../../../network/RakNetInstance.h"
+#include "network/RakNetInstance.hpp"
-#include "../../../network/ServerSideNetworkHandler.h"
+#include "network/ServerSideNetworkHandler.hpp"
-#include "../../../network/packet/ChatPacket.h"
+#include "network/packet/ChatPacket.hpp"
-#include "../../../platform/log.h"
+#include "platform/log.hpp"
 
 #include <sstream>
 #include <cstdlib>

src/client/gui/screens/ConsoleScreen.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
 #include <string>
 
 class ConsoleScreen: public Screen

src/client/gui/screens/CreditsScreen.cpp

@@ -1,10 +1,10 @@
-#include "CreditsScreen.h"
+#include "CreditsScreen.hpp"
-#include "StartMenuScreen.h"
+#include "StartMenuScreen.hpp"
-#include "OptionsScreen.h"
+#include "OptionsScreen.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
-#include "../components/ImageButton.h"
+#include "client/gui/components/ImageButton.hpp"
-#include "platform/input/Mouse.h"
+#include "platform/input/Mouse.hpp"
 
 CreditsScreen::CreditsScreen()
 : bHeader(NULL), btnBack(NULL)

src/client/gui/screens/CreditsScreen.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
 
 class ImageButton;
 

src/client/gui/screens/DeathScreen.cpp

@@ -1,9 +1,9 @@
-#include "DeathScreen.h"
+#include "DeathScreen.hpp"
-#include "ScreenChooser.h"
+#include "ScreenChooser.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "../../../platform/time.h"
+#include "platform/time.hpp"
 
 static const int WAIT_TICKS = 30;
 

src/client/gui/screens/DeathScreen.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
 class Button;
 
 class DeathScreen: public Screen

src/client/gui/screens/DisconnectionScreen.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../Font.h"
+#include "client/gui/Font.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
 #include <string>
 
 class DisconnectionScreen: public Screen

src/client/gui/screens/FurnaceScreen.cpp

@@ -1,25 +1,25 @@
-#include "FurnaceScreen.h"
+#include "FurnaceScreen.hpp"
-#include "crafting/PaneCraftingScreen.h"
+#include "crafting/PaneCraftingScreen.hpp"
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
-#include "../components/NinePatch.h"
+#include "client/gui/components/NinePatch.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "../../renderer/Tesselator.h"
+#include "client/renderer/Tesselator.hpp"
-#include "../../renderer/entity/ItemRenderer.h"
+#include "client/renderer/entity/ItemRenderer.hpp"
-#include "../../../world/item/Item.h"
+#include "world/item/Item.hpp"
-#include "../../../world/item/crafting/Recipes.h"
+#include "world/item/crafting/Recipes.hpp"
-#include "../../../world/item/ItemCategory.h"
+#include "world/item/ItemCategory.hpp"
-#include "../../../world/entity/player/Inventory.h"
+#include "world/entity/player/Inventory.hpp"
-#include "../../../world/entity/item/ItemEntity.h"
+#include "world/entity/item/ItemEntity.hpp"
-#include "../../../world/level/Level.h"
+#include "world/level/Level.hpp"
-#include "../../../world/item/DyePowderItem.h"
+#include "world/item/DyePowderItem.hpp"
-#include "../../../world/item/crafting/FurnaceRecipes.h"
+#include "world/item/crafting/FurnaceRecipes.hpp"
-#include "../../../world/level/tile/entity/FurnaceTileEntity.h"
+#include "world/level/tile/entity/FurnaceTileEntity.hpp"
-#include "../../../locale/I18n.h"
+#include "locale/I18n.hpp"
-#include "../../../util/StringUtils.h"
+#include "util/StringUtils.hpp"
-#include "../../../world/inventory/FurnaceMenu.h"
+#include "world/inventory/FurnaceMenu.hpp"
-#include "../../../network/packet/ContainerSetSlotPacket.h"
+#include "network/packet/ContainerSetSlotPacket.hpp"
-#include "../../../network/RakNetInstance.h"
+#include "network/RakNetInstance.hpp"
 
 static int heldMs = -1;
 static int percent = -1;

src/client/gui/screens/FurnaceScreen.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "BaseContainerScreen.h"
+#include "BaseContainerScreen.hpp"
 
-#include "../components/InventoryPane.h"
+#include "client/gui/components/InventoryPane.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
 
 class Font;
 class CItem;

src/client/gui/screens/InBedScreen.cpp

@@ -1,9 +1,9 @@
-#include "InBedScreen.h"
+#include "InBedScreen.hpp"
-#include "ScreenChooser.h"
+#include "ScreenChooser.hpp"
-#include "../components/Button.h"
+#include "client/gui/components/Button.hpp"
-#include "../../Minecraft.h"
+#include "client/Minecraft.hpp"
-#include "../../player/LocalPlayer.h"
+#include "client/player/LocalPlayer.hpp"
-#include "../../../platform/time.h"
+#include "platform/time.hpp"
 
 static const int WAIT_TICKS = 30;
 

src/client/gui/screens/InBedScreen.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Screen.h"
+#include "client/gui/Screen.hpp"
 class Button;
 
 class InBedScreen: public Screen