From 52a9574bb08b3d37eefacdab949360b05feeac4a Mon Sep 17 00:00:00 2001
From: rollrat <rollrat.cse@gmail.com>
Date: Sun, 17 Nov 2024 15:11:53 +0900
Subject: [PATCH] Fix nbt position translation

---
 src/nbt/mod.rs              |  80 +++++++++++++++++++-----------------
 src/transform/placer/mod.rs |   2 +-
 src/world/position.rs       |   2 +-
 test/alu-export.nbt         | Bin 11278 -> 13433 bytes
 test/and-gate.nbt           | Bin 462 -> 454 bytes
 5 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/nbt/mod.rs b/src/nbt/mod.rs
index ec481dc..33c2806 100644
--- a/src/nbt/mod.rs
+++ b/src/nbt/mod.rs
@@ -108,30 +108,33 @@ fn nbt_block_name(block: &Block) -> (String, String, Option<NBTPaletteProperty>)
     let (palette_name, specify_name, property) = match block.kind {
         BlockKind::Air => ("air", "air".to_owned(), None),
         BlockKind::Cobble { .. } => ("stone_bricks", "stone_bricks".to_owned(), None),
-        BlockKind::Switch { is_on } => (
-            "lever",
-            "lever".to_owned(),
-            Some(NBTPaletteProperty {
-                face: match block.direction {
-                    Direction::Bottom => Some("floor".to_owned()),
-                    Direction::Top => Some("ceiling".to_owned()),
-                    Direction::East | Direction::West | Direction::South | Direction::North => {
-                        Some("wall".to_owned())
-                    }
-                    _ => unreachable!(),
-                },
-                facing: match block.direction {
-                    Direction::Bottom | Direction::Top => None,
-                    Direction::East => Some("south".to_owned()),
-                    Direction::West => Some("north".to_owned()),
-                    Direction::South => Some("west".to_owned()),
-                    Direction::North => Some("east".to_owned()),
-                    _ => unreachable!(),
-                },
-                powered: is_on.then(|| "true".to_owned()),
-                ..Default::default()
-            }),
-        ),
+        BlockKind::Switch { is_on } => {
+            let facing = match block.direction {
+                Direction::Bottom | Direction::Top => None,
+                Direction::East => Some("north".to_owned()),
+                Direction::West => Some("south".to_owned()),
+                Direction::South => Some("east".to_owned()),
+                Direction::North => Some("west".to_owned()),
+                _ => unreachable!(),
+            };
+            (
+                "lever",
+                format!("lever_{is_on}_{}", facing.clone().unwrap_or_default()),
+                Some(NBTPaletteProperty {
+                    face: match block.direction {
+                        Direction::Bottom => Some("floor".to_owned()),
+                        Direction::Top => Some("ceiling".to_owned()),
+                        Direction::East | Direction::West | Direction::South | Direction::North => {
+                            Some("wall".to_owned())
+                        }
+                        _ => unreachable!(),
+                    },
+                    facing,
+                    powered: is_on.then(|| "true".to_owned()),
+                    ..Default::default()
+                }),
+            )
+        }
         BlockKind::Redstone {
             state, strength, ..
         } => (
@@ -151,10 +154,10 @@ fn nbt_block_name(block: &Block) -> (String, String, Option<NBTPaletteProperty>)
                 ("redstone_torch", "redstone_torch".to_owned(), None)
             } else {
                 let facing = match block.direction {
-                    Direction::East => "south",
-                    Direction::West => "north",
-                    Direction::South => "west",
-                    Direction::North => "east",
+                    Direction::East => "north",
+                    Direction::West => "south",
+                    Direction::South => "east",
+                    Direction::North => "west",
                     _ => unreachable!(),
                 }
                 .to_owned();
@@ -176,17 +179,17 @@ fn nbt_block_name(block: &Block) -> (String, String, Option<NBTPaletteProperty>)
             ..
         } => {
             let facing = match block.direction {
-                Direction::East => "north",
-                Direction::West => "south",
-                Direction::South => "east",
-                Direction::North => "west",
+                Direction::East => "south",
+                Direction::West => "north",
+                Direction::South => "west",
+                Direction::North => "east",
                 _ => unreachable!(),
             }
             .to_owned();
 
             (
                 "repeater",
-                "repeater".to_owned(),
+                format!("repeater_{facing}_{is_on}_{is_locked}_{delay}"),
                 Some(NBTPaletteProperty {
                     facing: Some(facing),
                     delay: Some(delay.to_string()),
@@ -224,15 +227,15 @@ fn world3d_to_nbt(world: &World3D) -> NBTRoot {
 
         blocks.push(NBTBlock {
             state: palette_index[&specify_name] as i32,
-            pos: (pos.2 as i32, pos.0 as i32, pos.1 as i32),
+            pos: (pos.1 as i32, pos.2 as i32, pos.0 as i32),
         });
     }
 
     NBTRoot {
         size: (
+            world.size.1 as i32,
             world.size.2 as i32,
             world.size.0 as i32,
-            world.size.1 as i32,
         ),
         blocks,
         palette,
@@ -595,8 +598,11 @@ mod tests {
     #[test]
     fn unittest_import_nbt_as_world() -> eyre::Result<()> {
         let nbt = NBTRoot::load("test/alu.nbt")?;
-        nbt.save("test/alu-export.nbt");
-        let g = WorldGraphBuilder::new(&nbt.to_world()).build();
+        let world = nbt.to_world();
+        let world_3d = World3D::from(&world);
+        world_3d.to_nbt().save("test/alu-export.nbt");
+
+        let g = WorldGraphBuilder::new(&world).build();
         println!("{}", g.to_graphviz());
 
         Ok(())
diff --git a/src/transform/placer/mod.rs b/src/transform/placer/mod.rs
index 99f2fbc..2ce77de 100644
--- a/src/transform/placer/mod.rs
+++ b/src/transform/placer/mod.rs
@@ -15,7 +15,7 @@ use crate::{
     logic::LogicType,
     world::{
         block::{Block, BlockKind, Direction, RedstoneState},
-        position::{self, DimSize, Position},
+        position::{DimSize, Position},
         world::World3D,
     },
 };
diff --git a/src/world/position.rs b/src/world/position.rs
index 80708c6..8008b5d 100644
--- a/src/world/position.rs
+++ b/src/world/position.rs
@@ -1,6 +1,6 @@
 use super::block::{Direction, RedstoneState, RedstoneStateType};
 
-// 위치
+// 위치 (x, y, z)
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, PartialOrd, Ord)]
 pub struct Position(pub usize, pub usize, pub usize);
 
diff --git a/test/alu-export.nbt b/test/alu-export.nbt
index 87de2df41ac7af0fe3b197ef075f3f7d37daa263..e20633dd14c04a34b7f2e0af59721925aaf16177 100644
GIT binary patch
literal 13433
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
Qr;*mwvE=yPTaFX{4_P!0;s5{u

literal 11278
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
Kw|4G#u=_7x1o^lC

diff --git a/test/and-gate.nbt b/test/and-gate.nbt
index bf4316462fda970548d0b6cbcaae384245df304a..aaa908f8f787f13b723827161a09030a99e4a17b 100644
GIT binary patch
literal 454
zcmV;%0XhC3iwFP!00002|E1R5PQox42H>wh9|DQ-Og-@)JoXAaGTs3h@F9zXE?t$x
ztG6iI_$l;_k`U;4`|inTmyL-=WSjC!3=wVLgWabc(O_D+*?TjNqh~|hgd#}%9%q=^
zHSL7{wU<%pjG}yx271hXMjvJr;87{hnH~-F9C*xOMyEVyG789C^5~T3C}UC{o6abp
zM+2El9-H!TI-`Id4P-8P7+60Hco^_7;Gu4v<ueM%Xdq)UYd+^ufJXrymGTTu*Zhg+
zDxFb4Pi}wZu8#q(j{&Za0XzoqSioZej|Dsy@G#(Ez{7xt0S|Te&3r}y84YA|`%44+
zO9T5$1N$rI(SSz-9u0Uj;4y&503HK)4B)YV#{wP;cr4&yz{7xt0S|Yc5na_qB_YW6
zad9{#`%<igZdT=5X1-X2r%FD>k7@ksT`fM8(!|iBm<jQsa?ZzDyGhsmq@wiQ;k*8@
zmw6N1S|*#)%TXuSZX=%5V_$gN&-|S>^<{jp?S6kqH5XMi3C_=!NBx6nF4u2lrDy{E
wSvTAj#E0*>#KA_|LEm|w==>r5<E-4ckFab{%WLP`QT*S&0WxHcoevBE0L81>^8f$<

literal 462
zcmb2|=3oE;rvFQ)UGzI-AkudGvRGp0N58!vW%qpJ++(zlQSz}ucXI44txo@Z)?*1}
zZ~7<cEPQPJe_zi(Ph-V2r{ABtrwT0ETe3&Z*f26=TgCUt7+dYcniI^&-xoTWUfW*q
z-7@h>zT3B%E_{rZtIh}9a%ZwDQfY6HxtbnwtKCh4)8I-vTg|Z<w&jOjZ0VOesn`(6
zpj<ZlU5jC+JnxT;1MbXrY&Y!LJ{UHfS9N3hJ85N|ssxh+t3fh|$@|0O!1JD&OKQ)3
z`x6Q@t?1Y<)yBG$A^X|x^)mrcjmU$=jBsOsX7n@G=ozwn>29bKyr9qY%hh2&#|v@B
zzl(r6YB)Y99%yHf2Ww)GXZ@i8vRmrI#fE;i8lDHq4D!rBW>ieuo%N~9`N90hk4m(@
zc<)Or+^m_c7qgGcU$lPHX_s%Wat`ZFd854L6t`GfXyofhR}x?Bl0M~KzNhy3-LgGj
z4qmglKdrBN=CX~^WlnZwjoa@&smpnIs$zrfzkd_F&aKXpTcdq#?;p<+z1QXox4&ur
zu{n0mV;i<3hrdr+-oEATqSJf)Q{GMa_c7%0Tla|V{ia(>-)jBKzdzwpjU+!00|Nk2
Cli%n7