Cleanup module pathing

src/Dodge/Data/Machine.hs

@@ -1,21 +1,25 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Machine where
+module Dodge.Data.Machine (
+    module Dodge.Data.Machine,
+    module Dodge.Data.Machine.Sensor,
+    module Dodge.Data.Material,
+    module Dodge.Data.ObjectType,
+) where
 
 import Color
 import Control.Lens
 import Data.Aeson
+import Data.Aeson.TH
 import qualified Data.IntSet as IS
 import qualified Data.Map.Strict as M
 import Dodge.Data.Damage
 import Dodge.Data.GenParams
 import Dodge.Data.Item
+import Dodge.Data.Machine.Sensor
 import Dodge.Data.Material
-import Dodge.Data.Object
-import Dodge.Data.Sensor
-import GHC.Generics
+import Dodge.Data.ObjectType
 import Geometry.Data
 import Sound.Data
 
@@ -24,17 +28,12 @@ data MachineDraw
     | MachineDrawTerminal
     | MachineDrawTurret
     | MachineDrawDamageSensor Float (PaletteColor, DecorationShape)
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON MachineDraw where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON MachineDraw
+    deriving (Eq, Show, Read)
 
 data Machine = Machine
     { _mcID :: Int
     , _mcWallIDs :: IS.IntSet
-    , _mcDraw :: MachineDraw --Machine -> SPic
+    , _mcDraw :: MachineDraw
     , _mcMaterial :: Material
     , _mcPos :: Point2
     , _mcDir :: Float
@@ -47,12 +46,7 @@ data Machine = Machine
     , _mcName :: String
     , _mcCloseSound :: Maybe SoundID
     }
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON Machine where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON Machine
+    deriving (Eq, Show, Read)
 
 data MachineType
     = StaticMachine
@@ -62,12 +56,10 @@ data MachineType
         , _tuFireTime :: Int
         , _tuMCrID :: Maybe Int
         }
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON MachineType where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON MachineType
+    deriving (Eq, Show, Read)
 
 makeLenses ''Machine
 makeLenses ''MachineType
+deriveJSON defaultOptions ''MachineDraw
+deriveJSON defaultOptions ''Machine
+deriveJSON defaultOptions ''MachineType