From 72aec0c6a2dbf740064c50a393a67685cba2424c Mon Sep 17 00:00:00 2001
From: iceiix <43691553+iceiix@users.noreply.github.com>
Date: Wed, 20 Jan 2021 17:07:27 -0800
Subject: [PATCH] blocks: fix hier block shift (#489), add tests (#492)

* blocks: fix soul fire/soil, exclude from <1.13, fixing #489

* blocks: add unit tests for #467 #469 #474
---
 blocks/src/lib.rs | 96 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/blocks/src/lib.rs b/blocks/src/lib.rs
index e9a3391..fd996b9 100644
--- a/blocks/src/lib.rs
+++ b/blocks/src/lib.rs
@@ -1397,6 +1397,7 @@ define_blocks! {
     }
     SoulFire {
         props {},
+        data None,
         offsets |protocol_version| { if protocol_version >= 735 { Some(0) } else { None } },
         model { ("minecraft", "soul_fire") },
         collision vec![],
@@ -2057,6 +2058,7 @@ define_blocks! {
     }
     SoulSoil {
         props {},
+        data None,
         offsets |protocol_version| { if protocol_version >= 735 { Some(0) } else { None } },
         model { ("minecraft", "soul_soil") },
     }
@@ -5786,6 +5788,100 @@ define_blocks! {
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // Spot check a few blocks across different versions, including the correctly recognized last supported block
+    // TODO: comprehensive testing against https://github.com/PrismarineJS/minecraft-data/tree/master/data/pc
+
+    #[test]
+    fn hier_1_12_2() {
+        let id_map = VanillaIDMap::new(340);
+        assert_eq!(
+            id_map.by_vanilla_id(255 << 4, &HashMap::new()),
+            StructureBlock {
+                mode: StructureBlockMode::Save
+            }
+        );
+        assert_eq!(
+            id_map.by_vanilla_id((255 << 4) | 3, &HashMap::new()),
+            StructureBlock {
+                mode: StructureBlockMode::Data
+            }
+        );
+    }
+
+    #[test]
+    fn flat_1_13_2() {
+        let id_map = VanillaIDMap::new(404);
+        assert_eq!(
+            id_map.by_vanilla_id(8595, &HashMap::new()),
+            StructureBlock {
+                mode: StructureBlockMode::Save
+            }
+        );
+        assert_eq!(
+            id_map.by_vanilla_id(8598, &HashMap::new()),
+            StructureBlock {
+                mode: StructureBlockMode::Data
+            }
+        );
+    }
+
+    #[test]
+    fn flat_1_14_4() {
+        let id_map = VanillaIDMap::new(477);
+        assert_eq!(
+            id_map.by_vanilla_id(9113, &HashMap::new()),
+            Conduit { waterlogged: true }
+        );
+        assert_eq!(
+            id_map.by_vanilla_id(9114, &HashMap::new()),
+            Conduit { waterlogged: false }
+        );
+    }
+
+    #[test]
+    fn flat_1_15_1() {
+        let id_map = VanillaIDMap::new(575);
+        assert_eq!(
+            id_map.by_vanilla_id(9113, &HashMap::new()),
+            Conduit { waterlogged: true }
+        );
+        assert_eq!(
+            id_map.by_vanilla_id(9114, &HashMap::new()),
+            Conduit { waterlogged: false }
+        );
+    }
+
+    #[test]
+    fn flat_1_16() {
+        let id_map = VanillaIDMap::new(735);
+        assert_eq!(
+            id_map.by_vanilla_id(1048, &HashMap::new()),
+            NoteBlock {
+                instrument: NoteBlockInstrument::Pling,
+                note: 24,
+                powered: false
+            }
+        );
+    }
+
+    #[test]
+    fn flat_1_16_2() {
+        let id_map = VanillaIDMap::new(751);
+        assert_eq!(
+            id_map.by_vanilla_id(1048, &HashMap::new()),
+            NoteBlock {
+                instrument: NoteBlockInstrument::Pling,
+                note: 24,
+                powered: false
+            }
+        );
+    }
+}
+
 fn can_burn<W: WorldAccess>(world: &W, pos: Position) -> bool {
     matches!(world.get_block(pos), Block::Planks { .. }
         | Block::DoubleWoodenSlab { .. }