Cleanup

src/Dodge/Data/CWorld.hs

@@ -1,11 +1,13 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.CWorld where
+module Dodge.Data.CWorld (
+    module Dodge.Data.CWorld,
+) where
 
 import Control.Lens
 import Data.Aeson
+import Data.Aeson.TH
 import Data.Graph.Inductive
 import qualified Data.IntSet as IS
 import Dodge.Data.Beam
@@ -18,6 +20,7 @@ import Dodge.Data.Corpse
 import Dodge.Data.CrGroupParams
 import Dodge.Data.Creature
 import Dodge.Data.Damage
+import Dodge.Data.Distortion
 import Dodge.Data.Door
 import Dodge.Data.EnergyBall
 import Dodge.Data.Flame
@@ -48,9 +51,7 @@ import Dodge.Data.TeslaArc
 import Dodge.Data.TractorBeam
 import Dodge.Data.Wall
 import Dodge.Data.WorldEffect
-import Dodge.Distortion.Data
 import Dodge.GameRoom
-import GHC.Generics
 import Geometry.ConvexPoly
 import Geometry.Data
 import qualified IntMapHelp as IM
@@ -135,12 +136,6 @@ data CWorld = CWorld
     , _genParams :: GenParams
     , _deathDelay :: Maybe Int
     }
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON CWorld where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON CWorld
 
 data WorldBeams = WorldBeams
     { _blockingBeams :: [Beam]
@@ -148,12 +143,9 @@ data WorldBeams = WorldBeams
     , _positronBeams :: [Beam]
     , _electronBeams :: [Beam]
     }
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON WorldBeams where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON WorldBeams
+    deriving (Eq, Ord, Show, Read)
 
+deriveJSON defaultOptions ''CWorld
+deriveJSON defaultOptions ''WorldBeams
 makeLenses ''CWorld
 makeLenses ''WorldBeams