Refactor, try to limit dependencies

src/Dodge/Data/Creature/State.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -7,9 +6,9 @@ module Dodge.Data.Creature.State where
 import Color
 import Control.Lens
 import Data.Aeson
+import Data.Aeson.TH
 import qualified Data.IntSet as IS
 import Dodge.Data.Damage
-import GHC.Generics
 import Geometry.Data
 
 data CreatureState = CrSt
@@ -17,33 +16,18 @@ data CreatureState = CrSt
     , _csSpState :: CrSpState
     , _csDropsOnDeath :: CreatureDropType
     }
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON CreatureState where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON CreatureState
+    deriving (Eq, Ord, Show, Read)
 
 data CreatureDropType
     = DropAll
     | DropAmount Int
     | DropSpecific [Int]
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON CreatureDropType where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON CreatureDropType
+    deriving (Eq, Ord, Show, Read)
 
 data CrSpState
     = Barrel {_piercedPoints :: [Point2]}
     | GenCr
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON CrSpState where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON CrSpState
+    deriving (Eq, Ord, Show, Read)
 
 data Faction
     = GenericFaction Int
@@ -54,12 +38,7 @@ data Faction
     | NoFaction
     | ColorFaction Color
     | PlayerFaction
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON Faction where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON Faction
+    deriving (Eq, Ord, Show, Read)
 
 data CrGroup
     = LoneWolf
@@ -69,13 +48,13 @@ data CrGroup
         }
     | CrGroupID {_crGroupID :: Int}
     | ShieldGroup
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON CrGroup where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON CrGroup
+    deriving (Eq, Ord, Show, Read)
 
 makeLenses ''CreatureState
 makeLenses ''CrSpState
 makeLenses ''CrGroup
+deriveJSON defaultOptions ''CreatureState
+deriveJSON defaultOptions ''CreatureDropType
+deriveJSON defaultOptions ''CrSpState
+deriveJSON defaultOptions ''Faction
+deriveJSON defaultOptions ''CrGroup