diff --git a/sample-cmd/say3.mcf b/sample-cmd/say3.mcf deleted file mode 100644 index 2bfc14f..0000000 --- a/sample-cmd/say3.mcf +++ /dev/null @@ -1 +0,0 @@ -say 6 diff --git a/src/OneCommand/Generator.hs b/src/OneCommand/Generator.hs index 23e2d37..c49c5d7 100644 --- a/src/OneCommand/Generator.hs +++ b/src/OneCommand/Generator.hs @@ -15,6 +15,8 @@ data CommandBlock = CommandBlock , _pos :: Pos } deriving (Show) +makeLenses ''CommandBlock + defaultCommandBlock :: CommandBlock defaultCommandBlock = CommandBlock Impulse "" defaultPos @@ -25,8 +27,6 @@ instance Show CommandBlockType where Repeating -> "repeating_command_block" Redstone -> "redstone_block" -- quick-dirty -makeLenses ''CommandBlock - generateCommandChain :: ChainType -> [String] -> [CommandBlock] generateCommandChain ct = zipWith genCommand [0..] where diff --git a/src/OneCommand/PosUtil.hs b/src/OneCommand/PosUtil.hs index d8e3cf4..c9d3069 100644 --- a/src/OneCommand/PosUtil.hs +++ b/src/OneCommand/PosUtil.hs @@ -24,10 +24,10 @@ data Pos = Pos , _scope :: PosScope } deriving (Show, Eq) +makeLenses ''Pos + defaultPos :: Pos defaultPos = Pos (Vec3i 0 0 0) CommandChainScope toRelativeStr :: Vec3i -> String toRelativeStr (Vec3i x y z) = [i|~#{x} ~#{y} ~#{z}|] - -makeLenses ''Pos