From 4f80b48fccf9a8ee4fed3a8d1bc33a54cd707d29 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Mon, 14 Feb 2022 23:37:56 +1100
Subject: [PATCH] Prefer BLOCK_MAX_X over BLOCK_X_COUNT

---
 src/Block.c     | 4 ++--
 src/BlockID.h   | 2 --
 src/Chat.c      | 2 +-
 src/Inventory.c | 2 +-
 src/Protocol.c  | 2 +-
 src/Widgets.c   | 4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Block.c b/src/Block.c
index b76b8adaf..ff7d74ad9 100644
--- a/src/Block.c
+++ b/src/Block.c
@@ -205,7 +205,7 @@ static const cc_string Block_DefaultName(BlockID block) {
 	static const cc_string invalid = String_FromConst("Invalid");
 	int i, beg = 0, end;
 
-	if (block >= BLOCK_CPE_COUNT) return invalid;
+	if (block > BLOCK_MAX_CPE) return invalid;
 	/* Find start and end of this particular block name. */
 	for (i = 0; i < block; i++) {
 		beg = String_IndexOfAt(&names, beg, '_') + 1;
@@ -217,7 +217,7 @@ static const cc_string Block_DefaultName(BlockID block) {
 }
 
 void Block_ResetProps(BlockID block) {
-	const struct SimpleBlockDef* def = block < BLOCK_CPE_COUNT ? &core_blockDefs[block] : &invalid_blockDef;
+	const struct SimpleBlockDef* def = block <= BLOCK_MAX_CPE ? &core_blockDefs[block] : &invalid_blockDef;
 	const cc_string name = Block_DefaultName(block);
 
 	Blocks.BlocksLight[block] = def->blocksLight;
diff --git a/src/BlockID.h b/src/BlockID.h
index 1f118cca0..43b25dae0 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -78,8 +78,6 @@ enum BLOCKID {
 
 	/* Max block ID used in original classic */
 	BLOCK_MAX_ORIGINAL = BLOCK_OBSIDIAN,
-	/* Number of blocks in original classic. */
-	BLOCK_ORIGINAL_COUNT = (BLOCK_MAX_ORIGINAL + 1),
 	/* Max block ID used in original classic plus CPE blocks. */
 	BLOCK_MAX_CPE = BLOCK_STONE_BRICK,
 	/* Number of blocks in original classic plus CPE blocks. */
diff --git a/src/Chat.c b/src/Chat.c
index c898bf9b6..dd602fa2d 100644
--- a/src/Chat.c
+++ b/src/Chat.c
@@ -579,7 +579,7 @@ static cc_bool CuboidCommand_ParseArgs(const cc_string* args) {
 		Chat_Add1("&eCuboid: &c\"%s\" is not a valid block name or id.", &value); return false;
 	}
 
-	if (block >= BLOCK_CPE_COUNT && !Block_IsCustomDefined(block)) {
+	if (block > BLOCK_MAX_CPE && !Block_IsCustomDefined(block)) {
 		Chat_Add1("&eCuboid: &cThere is no block with id \"%s\".", &value); return false;
 	}
 
diff --git a/src/Inventory.c b/src/Inventory.c
index 0621fb224..9ee8e0c22 100644
--- a/src/Inventory.c
+++ b/src/Inventory.c
@@ -111,7 +111,7 @@ void Inventory_ResetMapping(void) {
 
 void Inventory_AddDefault(BlockID block) {
 	int slot;
-	if (block >= BLOCK_CPE_COUNT) {
+	if (block > BLOCK_MAX_CPE) {
 		Inventory.Map[block - 1] = block; return;
 	}
 	
diff --git a/src/Protocol.c b/src/Protocol.c
index e26855dc4..68c26110b 100644
--- a/src/Protocol.c
+++ b/src/Protocol.c
@@ -1713,7 +1713,7 @@ static void BlockDefs_UndefineBlock(cc_uint8* data) {
 	Block_UpdateCulling(block);
 
 	Inventory_Remove(block);
-	if (block < BLOCK_CPE_COUNT) { Inventory_AddDefault(block); }
+	if (block <= BLOCK_MAX_CPE) { Inventory_AddDefault(block); }
 
 	Block_SetCustomDefined(block, false);
 	Event_RaiseVoid(&BlockEvents.BlockDefChanged);
diff --git a/src/Widgets.c b/src/Widgets.c
index 6c73f70f4..9b6f12447 100644
--- a/src/Widgets.c
+++ b/src/Widgets.c
@@ -719,7 +719,7 @@ static cc_bool TableWidget_RowEmpty(struct TableWidget* w, int start) {
 }
 
 void TableWidget_RecreateBlocks(struct TableWidget* w) {
-	int i, max = Game_UseCPEBlocks ? BLOCK_COUNT : BLOCK_ORIGINAL_COUNT;
+	int i, max = Game_UseCPEBlocks ? BLOCK_MAX_DEFINED : BLOCK_MAX_ORIGINAL;
 	BlockID block;
 	w->blocksCount = 0;
 
@@ -729,7 +729,7 @@ void TableWidget_RecreateBlocks(struct TableWidget* w) {
 		}
 
 		block = Inventory.Map[i];
-		if (block < max) { w->blocks[w->blocksCount++] = block; }
+		if (block <= max) { w->blocks[w->blocksCount++] = block; }
 		i++;
 	}