From 9518a273570e8d38438c2a29aa10f987e7d44ce1 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@outlook.com>
Date: Mon, 21 Dec 2020 13:54:04 +0000
Subject: Prepare for 1.15+ (#4856)

+ Add type-safe container for states
* Split registry Blocks into BlockTypes, BlockStates so the block types enumeration can be #included without too much penalty
* Ensure Registry uses type-safe container
---
 .../IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h')

diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h
index 02da327a1..f9545d997 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h
+++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h
@@ -3,8 +3,9 @@
 
 #include <stack>
 
-#include "../RedstoneSimulator.h"
-#include "../../Chunk.h"
+#include "Chunk.h"
+#include "BlockState.h"
+#include "Simulator/RedstoneSimulator.h"
 
 
 
@@ -82,7 +83,7 @@ public:
 	}
 
 	/** Temporary, should be chunk data: wire block store, to avoid recomputing states every time. */
-	std::unordered_map<Vector3i, short, VectorHasher<int>> WireStates;
+	std::unordered_map<Vector3i, BlockState, VectorHasher<int>> WireStates;
 
 	std::unordered_set<Vector3i, VectorHasher<int>> AlwaysTickedPositions;
 
-- 
cgit v1.2.3