* Fix include paths. Now it builds properly.

2026-09-23 20:09:46 +03:00 · 2023-08-05 15:34:07 +03:00
parent 71e700a300
commit bfdd5beb75
144 changed files with 267 additions and 212 deletions
--- a/source/world/tile/BookshelfTile.cpp
+++ b/source/world/tile/BookshelfTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 BookshelfTile::BookshelfTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/Bush.cpp
+++ b/source/world/tile/Bush.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 Bush::Bush(int id, int texture) : Tile(id, Material::plant)
 {
--- a/source/world/tile/ClayTile.cpp
+++ b/source/world/tile/ClayTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 ClayTile::ClayTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/ClothTile.cpp
+++ b/source/world/tile/ClothTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 ClothTile::ClothTile(int id, int type) : Tile(id, TEXTURE_CLOTH_64, Material::cloth)
 {
--- a/source/world/tile/DirtTile.cpp
+++ b/source/world/tile/DirtTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 DirtTile::DirtTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/DoorTile.cpp
+++ b/source/world/tile/DoorTile.cpp
@@ -7,8 +7,8 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Item.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"
+#include "world/item/Item.hpp"

 DoorTile::DoorTile(int ID, Material* pMtl) : Tile(ID, pMtl)
 {
--- a/source/world/tile/FarmTile.cpp
+++ b/source/world/tile/FarmTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 FarmTile::FarmTile(int a, Material* c) : Tile(a, c)
 {
--- a/source/world/tile/FireTile.cpp
+++ b/source/world/tile/FireTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 FireTile::FireTile(int ID, int texture) : Tile(ID, texture, Material::fire)
 {
--- a/source/world/tile/GlassTile.cpp
+++ b/source/world/tile/GlassTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 GlassTile::GlassTile(int a, int b, Material* c) : HalfTransparentTile(a, b, c)
 {
--- a/source/world/tile/GrassTile.cpp
+++ b/source/world/tile/GrassTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 GrassTile::GrassTile(int id, Material* c) : Tile(id, c)
 {
--- a/source/world/tile/GravelTile.cpp
+++ b/source/world/tile/GravelTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 GravelTile::GravelTile(int a, int b, Material* c) : SandTile(a, b, c)
 {
--- a/source/world/tile/HalfTransparentTile.cpp
+++ b/source/world/tile/HalfTransparentTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 HalfTransparentTile::HalfTransparentTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/IceTile.cpp
+++ b/source/world/tile/IceTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 IceTile::IceTile(int a, int b, Material* c) : HalfTransparentTile(a, b, c)
 {
--- a/source/world/tile/InvisibleTile.cpp
+++ b/source/world/tile/InvisibleTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 InvisibleTile::InvisibleTile(int ID, int texture, Material* pMtl) :
 	Tile(ID, texture, pMtl)
--- a/source/world/tile/LadderTile.cpp
+++ b/source/world/tile/LadderTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 LadderTile::LadderTile(int ID, int texture) : Tile(ID, texture, Material::decoration)
 {
--- a/source/world/tile/LeafTile.cpp
+++ b/source/world/tile/LeafTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 LeafTile::LeafTile(int id) : TransparentTile(id, TEXTURE_LEAVES_TRANSPARENT, Material::leaves, false)
 {
--- a/source/world/tile/LiquidTile.cpp
+++ b/source/world/tile/LiquidTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 LiquidTile::LiquidTile(int id, Material* pMtl) : Tile(id, pMtl == Material::lava ? TEXTURE_LAVA : TEXTURE_WATER, pMtl)
 {
--- a/source/world/tile/LiquidTileDynamic.cpp
+++ b/source/world/tile/LiquidTileDynamic.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 bool g_bDisableSponges = false;

--- a/source/world/tile/LiquidTileStatic.cpp
+++ b/source/world/tile/LiquidTileStatic.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 LiquidTileStatic::LiquidTileStatic(int id, Material* pMtl) : LiquidTile(id, pMtl)
 {
--- a/source/world/tile/MetalTile.cpp
+++ b/source/world/tile/MetalTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 MetalTile::MetalTile(int ID, int texture, Material* pMtl) : Tile(ID, pMtl)
 {
--- a/source/world/tile/ObsidianTile.cpp
+++ b/source/world/tile/ObsidianTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 ObsidianTile::ObsidianTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/OreTile.cpp
+++ b/source/world/tile/OreTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 OreTile::OreTile(int id, int texture) : Tile(id, texture, Material::stone)
 {
--- a/source/world/tile/RedStoneOreTile.cpp
+++ b/source/world/tile/RedStoneOreTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 RedStoneOreTile::RedStoneOreTile(int id, int texture, bool bLit) : Tile(id, texture, Material::stone)
 {
--- a/source/world/tile/ReedTile.cpp
+++ b/source/world/tile/ReedTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 ReedTile::ReedTile(int id) : Tile(id, Material::plant)
 {
--- a/source/world/tile/SandStoneTile.cpp
+++ b/source/world/tile/SandStoneTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 SandStoneTile::SandStoneTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/SandTile.cpp
+++ b/source/world/tile/SandTile.cpp
@@ -7,8 +7,8 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
-#include "FallingTile.hpp"
+#include "world/level/Level.hpp"
+#include "world/entity/FallingTile.hpp"

 //@NOTE: True for now
 bool SandTile::instaFall = true;
--- a/source/world/tile/Sapling.cpp
+++ b/source/world/tile/Sapling.cpp
@@ -1,5 +1,13 @@
+/********************************************************************
+	Minecraft: Pocket Edition - Decompilation Project
+	Copyright (C) 2023 iProgramInCpp
+
+	The following code is licensed under the BSD 1 clause license.
+	SPDX-License-Identifier: BSD-1-Clause
+ ********************************************************************/
+
 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 Sapling::Sapling(int id, int texture) : Bush(id, texture)
 {
--- a/source/world/tile/SpongeTile.cpp
+++ b/source/world/tile/SpongeTile.cpp
@@ -1,5 +1,13 @@
+/********************************************************************
+	Minecraft: Pocket Edition - Decompilation Project
+	Copyright (C) 2023 iProgramInCpp
+
+	The following code is licensed under the BSD 1 clause license.
+	SPDX-License-Identifier: BSD-1-Clause
+ ********************************************************************/
+
 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 SpongeTile::SpongeTile(int id, int texture) : Tile(id, texture, Material::sponge)
 {
--- a/source/world/tile/StairTile.cpp
+++ b/source/world/tile/StairTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 // @NOTE: All this work for some stairs; damn

--- a/source/world/tile/StoneSlabTile.cpp
+++ b/source/world/tile/StoneSlabTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 StoneSlabTile::StoneSlabTile(int id, bool full) : Tile(id, TEXTURE_STONE_SLAB_TOP, Material::stone)
 {
--- a/source/world/tile/StoneTile.cpp
+++ b/source/world/tile/StoneTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 StoneTile::StoneTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/Tile.cpp
+++ b/source/world/tile/Tile.cpp
@@ -6,9 +6,9 @@
 	SPDX-License-Identifier: BSD-1-Clause
 ********************************************************************/

-#include "Level.hpp"
-#include "Item.hpp"
-#include "ItemEntity.hpp"
+#include "world/level/Level.hpp"
+#include "world/item/Item.hpp"
+#include "world/entity/ItemEntity.hpp"

 std::string Tile::TILE_DESCRIPTION_PREFIX = "tile.";

--- a/source/world/tile/TntTile.cpp
+++ b/source/world/tile/TntTile.cpp
@@ -7,8 +7,8 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
-#include "PrimedTnt.hpp"
+#include "world/level/Level.hpp"
+#include "world/entity/PrimedTnt.hpp"

 TntTile::TntTile(int id, int texture) : Tile(id, texture, Material::explosive)
 {
--- a/source/world/tile/TopSnowTile.cpp
+++ b/source/world/tile/TopSnowTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 TopSnowTile::TopSnowTile(int a, int b, Material* c) : Tile(a, b, c)
 {
--- a/source/world/tile/TorchTile.cpp
+++ b/source/world/tile/TorchTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 TorchTile::TorchTile(int ID, int texture, Material* pMtl) : Tile(ID, texture, pMtl)
 {
--- a/source/world/tile/TransparentTile.cpp
+++ b/source/world/tile/TransparentTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 TransparentTile::TransparentTile(int ID, int texture, Material* mtl, bool bTransparent) :Tile(ID, texture, mtl)
 {
--- a/source/world/tile/TreeTile.cpp
+++ b/source/world/tile/TreeTile.cpp
@@ -7,7 +7,7 @@
 ********************************************************************/

 #include "Tile.hpp"
-#include "Level.hpp"
+#include "world/level/Level.hpp"

 TreeTile::TreeTile(int id) : Tile(id, Material::wood)
 {