From 73e5c12cdee73a15d3e005791bd833a1e6488065 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 25 Jun 2021 19:43:14 +0200 Subject: [PATCH] Rename .inc files to .inc.cpp for better language detection by editors and Github --- resource/README.md | 4 ++-- resource/generate.py | 2 +- src/Resource/BlockType.cpp | 4 ++-- src/Resource/{BlockType.inc => BlockType.inc.cpp} | 0 src/Resource/{LegacyBlockType.inc => LegacyBlockType.inc.cpp} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename src/Resource/{BlockType.inc => BlockType.inc.cpp} (100%) rename src/Resource/{LegacyBlockType.inc => LegacyBlockType.inc.cpp} (100%) diff --git a/resource/README.md b/resource/README.md index ed35118..f9dc955 100644 --- a/resource/README.md +++ b/resource/README.md @@ -10,7 +10,7 @@ work. of two different versions - `extract.py`: Takes the block type information from `blocks.json` and texture data from an unpacked Minecraft JAR, storing the result in `colors.json` -- `generate.py`: Generates `BlockType.inc` from `colors.json` +- `generate.py`: Generates `BlockType.inc.cpp` from `colors.json` In addition to these scripts, the JSON processor *jq* is a useful tool to work with MinedMap's resource metadata. @@ -63,7 +63,7 @@ with MinedMap's resource metadata. 7. Update the source code with the new block colors: ```sh - ./generate.py colors.json ../src/Resource/BlockType.inc + ./generate.py colors.json ../src/Resource/BlockType.inc.cpp ``` After the update, the new version should be tested with old savegames (both diff --git a/resource/generate.py b/resource/generate.py index 8508c6b..de1f828 100755 --- a/resource/generate.py +++ b/resource/generate.py @@ -6,7 +6,7 @@ import sys if len(sys.argv) != 3: - sys.exit('Usage: extract.py ') + sys.exit('Usage: extract.py ') with open(sys.argv[1]) as f: colors = json.load(f) diff --git a/src/Resource/BlockType.cpp b/src/Resource/BlockType.cpp index e72456e..8e04c58 100644 --- a/src/Resource/BlockType.cpp +++ b/src/Resource/BlockType.cpp @@ -32,7 +32,7 @@ namespace Resource { const std::unordered_map BlockType::Types = { -#include "BlockType.inc" +#include "BlockType.inc.cpp" }; @@ -51,7 +51,7 @@ static constexpr LegacyBlockType simple(const char *t) { static const LegacyBlockType LEGACY_BLOCK_TYPE_DATA[256] = { -#include "LegacyBlockType.inc" +#include "LegacyBlockType.inc.cpp" }; diff --git a/src/Resource/BlockType.inc b/src/Resource/BlockType.inc.cpp similarity index 100% rename from src/Resource/BlockType.inc rename to src/Resource/BlockType.inc.cpp diff --git a/src/Resource/LegacyBlockType.inc b/src/Resource/LegacyBlockType.inc.cpp similarity index 100% rename from src/Resource/LegacyBlockType.inc rename to src/Resource/LegacyBlockType.inc.cpp