Folders reorganized.

.gitignore

@@ -49,8 +49,8 @@ doc/html
 doc/latex
 
 # Binaries
-client/openminer
-server/openminer_server
+openminer
+openminer_server
 *.exe
 *.dll
 

CMakeLists.txt

@@ -13,6 +13,8 @@ if (WIN32)
 	set(WIN_LIBRARIES_PATH "C:/Libraries")
 endif ()
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
 #------------------------------------------------------------------------------
 # Compiler flags
 #------------------------------------------------------------------------------
@@ -183,6 +185,6 @@ endif ()
 #------------------------------------------------------------------------------
 # Subdirectories
 #------------------------------------------------------------------------------
-add_subdirectory(common)
-add_subdirectory(server)
-add_subdirectory(client)
+add_subdirectory(source/common)
+add_subdirectory(source/server)
+add_subdirectory(source/client)

README.md

@@ -64,7 +64,7 @@ The long-term goal of this project is to provide a viable alternative to Minecra
 ### Using Linux
 
 - Dependencies:
-    - A compiler with C++14 support
+    - A compiler with C++14 support (GCC >= 5.0 or clang >= 3.4)
     - [CMake](http://www.cmake.org/download/)
     - [GameKit](http://github.com/Unarelith/GameKit) (requires `SDL2` + `tinyxml2`, will switch to `SFML` starting from 2.6)
     - [SFML](https://www.sfml-dev.org/) (only used for network)
@@ -72,8 +72,8 @@ The long-term goal of this project is to provide a viable alternative to Minecra
     - _Linux users: Check your distribution repositories for packages._
 - Run `cmake .`
 - Run `make -j8`
-- Run the server with `./server/openminer_server`
-- Run the client with `./client/openminer`
+- Run the client with `./openminer`
+- If you want a multiplayer game, run the server with `./openminer_server`
 
 ### Using Windows
 
@@ -128,4 +128,5 @@ This list is non exhaustive.
 ## Credits
 
 - xMrVizzy ([Faithful 32x](https://www.curseforge.com/minecraft/texture-packs/faithful-32x) texture pack, will completely replace Vanilla textures)
+- ThePhD ([sol2](https://github.com/ThePhD/sol2))
 

docs/lua-api-block.md

@@ -155,9 +155,9 @@ Table format:
 {0, 0, 0, 0, 0, 0}, // for size = 1
 {1, 1, 1, 1, 0, 0}, // for size = 2
 {2, 2, 2, 2, 1, 0}, // for size = 3
-{2, 3, 3, 3, 1, 0}, // for size = 4
-{2, 3, 4, 4, 1, 0}, // for size = 5
-{2, 3, 4, 5, 1, 0}, // for size = 6
+{3, 2, 3, 3, 1, 0}, // for size = 4
+{3, 2, 4, 4, 1, 0}, // for size = 5
+{3, 2, 4, 5, 1, 0}, // for size = 6
 ```
 
 The textures will be loaded from `mods/<your-mod>/textures/blocks`

source/client/CMakeLists.txt

@@ -6,8 +6,8 @@ set(PROJECT_NAME ${CMAKE_PROJECT_NAME})
 #------------------------------------------------------------------------------
 # Get source files
 #------------------------------------------------------------------------------
-file(GLOB_RECURSE SOURCE_FILES source/*.cpp)
-file(GLOB_RECURSE HEADER_FILES source/*.hpp ../server/*.hpp ../common/*.hpp ../external/*.hpp)
+file(GLOB_RECURSE SOURCE_FILES *.cpp)
+file(GLOB_RECURSE HEADER_FILES *.hpp ../server/*.hpp ../common/*.hpp ../../external/*.hpp)
 
 foreach(HEADER_FILE ${HEADER_FILES})
 	get_filename_component(HEADER_DIRECTORY ${HEADER_FILE} DIRECTORY)

source/common/CMakeLists.txt

@@ -6,8 +6,8 @@ set(PROJECT_NAME ${CMAKE_PROJECT_NAME}_common)
 #------------------------------------------------------------------------------
 # Get source files
 #------------------------------------------------------------------------------
-file(GLOB_RECURSE SOURCE_FILES source/*.cpp)
-file(GLOB_RECURSE HEADER_FILES source/*.hpp ../external/*.hpp)
+file(GLOB_RECURSE SOURCE_FILES *.cpp)
+file(GLOB_RECURSE HEADER_FILES *.hpp ../../external/*.hpp)
 
 foreach(HEADER_FILE ${HEADER_FILES})
 	get_filename_component(HEADER_DIRECTORY ${HEADER_FILE} DIRECTORY)

source/common/core/TilesDef.cpp

@@ -37,6 +37,7 @@ const std::string &TilesDef::getTextureForFace(u8 face, bool useAltTiles) const
 	static constexpr int nSizes = 6, nFaces = 6;
 	// Determine which indices correspond to each face, depending on how many
 	// textures were specified
+	// NOTE: If this table changes, please change 'docs/lua-api-blocks.md' accordingly
 	static constexpr u8 faceToIndex[nSizes][nFaces] = {
 		// Same order as enum BlockFace in TilesDef.hpp,
 		// namely: West, East, South, North, Bottom, Top