summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Bindings/BlockState.cpp (renamed from src/BlockState.cpp)0
-rw-r--r--src/Bindings/BlockState.h (renamed from src/BlockState.h)0
-rw-r--r--src/Bindings/BlockTypePalette.cpp (renamed from src/BlockTypePalette.cpp)0
-rw-r--r--src/Bindings/BlockTypePalette.h (renamed from src/BlockTypePalette.h)0
-rw-r--r--src/Bindings/BlockTypeRegistry.cpp (renamed from src/BlockTypeRegistry.cpp)0
-rw-r--r--src/Bindings/BlockTypeRegistry.h (renamed from src/BlockTypeRegistry.h)0
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/PalettedBlockArea.h2
-rw-r--r--tests/BlockTypeRegistry/BlockStateTest.cpp2
-rw-r--r--tests/BlockTypeRegistry/BlockTypePaletteTest.cpp2
-rw-r--r--tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp2
-rw-r--r--tests/BlockTypeRegistry/CMakeLists.txt14
12 files changed, 11 insertions, 19 deletions
diff --git a/src/BlockState.cpp b/src/Bindings/BlockState.cpp
index 8ee87c50f..8ee87c50f 100644
--- a/src/BlockState.cpp
+++ b/src/Bindings/BlockState.cpp
diff --git a/src/BlockState.h b/src/Bindings/BlockState.h
index ab451236b..ab451236b 100644
--- a/src/BlockState.h
+++ b/src/Bindings/BlockState.h
diff --git a/src/BlockTypePalette.cpp b/src/Bindings/BlockTypePalette.cpp
index 7759505cf..7759505cf 100644
--- a/src/BlockTypePalette.cpp
+++ b/src/Bindings/BlockTypePalette.cpp
diff --git a/src/BlockTypePalette.h b/src/Bindings/BlockTypePalette.h
index 2aade422b..2aade422b 100644
--- a/src/BlockTypePalette.h
+++ b/src/Bindings/BlockTypePalette.h
diff --git a/src/BlockTypeRegistry.cpp b/src/Bindings/BlockTypeRegistry.cpp
index 491e03593..491e03593 100644
--- a/src/BlockTypeRegistry.cpp
+++ b/src/Bindings/BlockTypeRegistry.cpp
diff --git a/src/BlockTypeRegistry.h b/src/Bindings/BlockTypeRegistry.h
index 3a85ee510..3a85ee510 100644
--- a/src/BlockTypeRegistry.h
+++ b/src/Bindings/BlockTypeRegistry.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69ea7dbd1..a3d34eb53 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,10 +6,7 @@ target_sources(
BiomeDef.cpp
BlockArea.cpp
BlockInfo.cpp
- BlockState.cpp
BlockType.cpp
- BlockTypePalette.cpp
- BlockTypeRegistry.cpp
BrewingRecipes.cpp
Broadcaster.cpp
BoundingBox.cpp
@@ -53,7 +50,6 @@ target_sources(
MonsterConfig.cpp
NetherPortalScanner.cpp
OverridesSettingsRepository.cpp
- PalettedBlockArea.cpp
ProbabDistrib.cpp
RankManager.cpp
RCONServer.cpp
@@ -76,11 +72,8 @@ target_sources(
BlockArea.h
BlockInServerPluginInterface.h
BlockInfo.h
- BlockState.h
BlockTracer.h
BlockType.h
- BlockTypePalette.h
- BlockTypeRegistry.h
BrewingRecipes.h
BoundingBox.h
BuildInfo.h.cmake
@@ -135,7 +128,6 @@ target_sources(
NetherPortalScanner.h
OpaqueWorld.h
OverridesSettingsRepository.h
- PalettedBlockArea.h
ProbabDistrib.h
RankManager.h
RCONServer.h
diff --git a/src/PalettedBlockArea.h b/src/PalettedBlockArea.h
index 3866d405b..5ded7bcb4 100644
--- a/src/PalettedBlockArea.h
+++ b/src/PalettedBlockArea.h
@@ -6,7 +6,7 @@
#include <utility>
-#include "BlockTypePalette.h"
+#include "Bindings/BlockTypePalette.h"
#include "Cuboid.h"
diff --git a/tests/BlockTypeRegistry/BlockStateTest.cpp b/tests/BlockTypeRegistry/BlockStateTest.cpp
index a9af34a9a..750e94d5f 100644
--- a/tests/BlockTypeRegistry/BlockStateTest.cpp
+++ b/tests/BlockTypeRegistry/BlockStateTest.cpp
@@ -1,5 +1,5 @@
#include "Globals.h"
-#include "BlockState.h"
+#include "Bindings/BlockState.h"
#include "../TestHelpers.h"
diff --git a/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp b/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp
index 1a2341bd9..23fe487c6 100644
--- a/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp
+++ b/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp
@@ -1,6 +1,6 @@
#include "Globals.h"
#include "../TestHelpers.h"
-#include "BlockTypePalette.h"
+#include "Bindings/BlockTypePalette.h"
#include "Stopwatch.h"
diff --git a/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp b/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
index 9e003cfcd..cac83c6a8 100644
--- a/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
+++ b/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
@@ -1,6 +1,6 @@
#include "Globals.h"
-#include "BlockTypeRegistry.h"
+#include "Bindings/BlockTypeRegistry.h"
#include "../TestHelpers.h"
diff --git a/tests/BlockTypeRegistry/CMakeLists.txt b/tests/BlockTypeRegistry/CMakeLists.txt
index b9036ffdf..e81d5ff38 100644
--- a/tests/BlockTypeRegistry/CMakeLists.txt
+++ b/tests/BlockTypeRegistry/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(${PROJECT_SOURCE_DIR}/src/)
add_executable(BlockStateTest
BlockStateTest.cpp
../TestHelpers.h
- ${PROJECT_SOURCE_DIR}/src/BlockState.cpp
+ ${PROJECT_SOURCE_DIR}/src/Bindings/BlockState.cpp
${PROJECT_SOURCE_DIR}/src/StringUtils.cpp
${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp
)
@@ -16,8 +16,8 @@ target_link_libraries(BlockStateTest fmt::fmt)
add_executable(BlockTypePaletteTest
BlockTypePaletteTest.cpp
../TestHelpers.h
- ${PROJECT_SOURCE_DIR}/src/BlockState.cpp
- ${PROJECT_SOURCE_DIR}/src/BlockTypePalette.cpp
+ ${PROJECT_SOURCE_DIR}/src/Bindings/BlockState.cpp
+ ${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypePalette.cpp
${PROJECT_SOURCE_DIR}/src/JsonUtils.cpp
${PROJECT_SOURCE_DIR}/src/StringUtils.cpp
${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp
@@ -29,7 +29,7 @@ target_link_libraries(BlockTypePaletteTest fmt::fmt jsoncpp_lib)
add_executable(BlockTypeRegistryTest
BlockTypeRegistryTest.cpp
../TestHelpers.h
- ${PROJECT_SOURCE_DIR}/src/BlockTypeRegistry.cpp
+ ${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypeRegistry.cpp
${PROJECT_SOURCE_DIR}/src/StringUtils.cpp
${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp
)
@@ -39,9 +39,9 @@ target_link_libraries(BlockTypeRegistryTest fmt::fmt Threads::Threads)
add_executable(PalettedBlockAreaTest
PalettedBlockAreaTest.cpp
../TestHelpers.h
- ${PROJECT_SOURCE_DIR}/src/BlockState.cpp
- ${PROJECT_SOURCE_DIR}/src/BlockTypeRegistry.cpp
- ${PROJECT_SOURCE_DIR}/src/BlockTypePalette.cpp
+ ${PROJECT_SOURCE_DIR}/src/Bindings/BlockState.cpp
+ ${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypeRegistry.cpp
+ ${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypePalette.cpp
${PROJECT_SOURCE_DIR}/src/Cuboid.cpp
${PROJECT_SOURCE_DIR}/src/JsonUtils.cpp
${PROJECT_SOURCE_DIR}/src/PalettedBlockArea.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:10:15 +0100