Cleanup, remove DeriveGeneric language extensions

src/Color/Data.hs

@@ -1,7 +1,4 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
---{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Color.Data where

src/Dodge/Creature/Memory.hs

@@ -1,2 +0,0 @@
-module Dodge.Creature.Memory
-    where

src/Dodge/Data/ActionPlan.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/AimStance.hs

@@ -1,9 +1,8 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.AimStance where
+
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH

src/Dodge/Data/ArcStep.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -18,10 +16,5 @@ data ArcStep = ArcStep
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
---data NextArcStep
---    = DefaultArcStep
---    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 makeLenses ''ArcStep
 deriveJSON defaultOptions ''ArcStep
---deriveJSON defaultOptions ''NextArcStep

src/Dodge/Data/Beam.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/BlBl.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Block.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Bounds.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Bullet.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Button.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/CWorld.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Camera.hs

@@ -1,7 +1,6 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Camera where
 
 import Control.Lens
@@ -13,12 +12,12 @@ data CamInGameType
     = CamOnPlayer
     | CamOpticScope
     | CamRemoteScope
-  deriving (Eq,Show,Read,Enum,Bounded)
+    deriving (Eq, Show, Read, Enum, Bounded)
 
 data CamControl
-    = CamInGame { _cigType :: CamInGameType}
+    = CamInGame {_cigType :: CamInGameType}
     | CamFloat
-  deriving (Eq,Show,Read)
+    deriving (Eq, Show, Read)
 
 data Camera = Camera
     { _camCenter :: Point2
@@ -38,6 +37,7 @@ makeLenses ''CamInGameType
 concat
     <$> mapM
         (deriveJSON defaultOptions)
-        [''CamInGameType
-        ,''CamControl 
-        ,''Camera ]
+        [ ''CamInGameType
+        , ''CamControl
+        , ''Camera
+        ]

src/Dodge/Data/Cloud.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/CombAmount.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}

src/Dodge/Data/CrGroupParams.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/CrWlID.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Creature.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
@@ -9,7 +7,6 @@ module Dodge.Data.Creature (
     module Dodge.Data.Creature.Misc,
     module Dodge.Data.Creature.State,
     module Dodge.Data.Creature.Perception,
-    module Dodge.Data.Creature.Memory,
     module Dodge.Data.Creature.Stance,
     module Dodge.Data.ActionPlan,
     module Dodge.Data.Item,
@@ -26,7 +23,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import Dodge.Data.ActionPlan
-import Dodge.Data.Creature.Memory
 import Dodge.Data.Creature.Misc
 import Dodge.Data.Creature.Perception
 import Dodge.Data.Creature.Stance
@@ -39,7 +35,6 @@ import Geometry.Data
 data Creature = Creature
     { _crPos :: Point3
     , _crOldPos :: Point3
---    , _crZ :: Float
     , _crZVel :: Float
     , _crDir :: Float
     , _crMvDir :: Float
@@ -60,13 +55,10 @@ data Creature = Creature
     , _crFaction :: Faction
     , _crGroup :: CrGroup
     , _crIntention :: Intention
---    , _crMvType :: CrMvType
     , _crName :: String
     , _crDeathTimer :: Int
     }
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data CrHP
     = HP Int
     | CrIsCorpse SPic
@@ -80,12 +72,19 @@ data Intention = Intention
     }
     deriving (Show)
 
---deriving (Eq, Show, Read) --Generic, Flat)
+data Memory = Memory
+    { _soundsToInvestigate :: [Point2]
+    , _nodesSearched :: [Int]
+    }
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+makeLenses ''Memory
 
 makeLenses ''Creature
 makeLenses ''Intention
 makePrisms ''CrHP
 
+deriveJSON defaultOptions ''Memory
 concat
     <$> mapM
         (deriveJSON defaultOptions)

src/Dodge/Data/Creature/Memory.hs

@@ -1,20 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Creature.Memory where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import Geometry.Data
-
-data Memory = Memory
-    { _soundsToInvestigate :: [Point2]
-    , _nodesSearched :: [Int]
-    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''Memory
-deriveJSON defaultOptions ''Memory

src/Dodge/Data/Creature/Misc.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Creature/Perception.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Creature/Stance.hs

@@ -1,17 +1,15 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Creature.Stance 
-    ( module Dodge.Data.Creature.Stance
-    , module Dodge.Data.AimStance
-    )where
+module Dodge.Data.Creature.Stance (
+    module Dodge.Data.Creature.Stance,
+    module Dodge.Data.AimStance,
+) where
 
-import Dodge.Data.AimStance
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Dodge.Data.AimStance
 import Geometry.Data
 
 data Stance = Stance
@@ -22,7 +20,7 @@ data Stance = Stance
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Carriage
-    = Walking { _strideAmount :: Float , _currentFoot :: FootForward }
+    = Walking {_strideAmount :: Float, _currentFoot :: FootForward}
     | Standing
     | Floating
     | Flying

src/Dodge/Data/Creature/State.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/CreatureEffect.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Damage.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -7,9 +5,7 @@
 Datatypes describing the type of damage effects that are to be applied to
 creatures.
 -}
-module Dodge.Data.Damage (
-    module Dodge.Data.Damage,
-) where
+module Dodge.Data.Damage where
 
 import Control.Lens
 import Data.Aeson

src/Dodge/Data/Distortion.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Door.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -22,14 +20,12 @@ import Geometry.Data
 
 data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int
     deriving Eq
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PushSource
     = PushesItself
     | PushedBy Int
     | NotPushed
     deriving Eq
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Door = Door
     { _drID :: Int
@@ -49,7 +45,6 @@ data Door = Door
     , _drObstructs :: Set PathEdgeNodes
     , _drObstacleType :: EdgeObstacle
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Door
 deriveJSON defaultOptions ''DoorStatus

src/Dodge/Data/DoubleTree.hs

@@ -1,6 +1,4 @@
 {-# LANGUAGE LambdaCase #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 --{-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/EnergyBall.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/EnergyBall/Type.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Equipment/Misc.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Flame.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/FloatFunction.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/FloorItem.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -8,12 +6,9 @@ module Dodge.Data.FloorItem where
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
---import Dodge.Data.Item
 import Geometry.Data
 
-
 data FloorItem = FlIt {_flItPos :: Point2, _flItRot :: Float}--, _flItID :: NewInt FloorInt}
-    --deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''FloorItem
 deriveJSON defaultOptions ''FloorItem

src/Dodge/Data/ForegroundShape.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/GenFloat.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 module Dodge.Data.GenFloat

src/Dodge/Data/GenParams.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Gust.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/HUD.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Input.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Item/Combine.hs

@@ -1,4 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Item/Location.hs

@@ -1,30 +1,32 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE EmptyDataDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE EmptyDataDeriving #-}
+
 module Dodge.Data.Item.Location where
 
-import NewInt
-import ShortShow
-import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Dodge.Data.Equipment.Misc
+import NewInt
+import ShortShow
 
 -- it would be nice to have these as empty types, but I'm not sure how to get
 -- aeson to handle that
 data InvInt = InvInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 data TurretInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 data CrInt = CrInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 data ItmInt = ItmInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
 
 data ItemLocation
-    = InInv 
+    = InInv
         { _ilCrID :: Int
         , _ilInvID :: NewInt InvInt
         , _ilIsRoot :: Bool -- of any item
@@ -33,16 +35,22 @@ data ItemLocation
         , _ilEquipSite :: Maybe EquipSite
         }
     | OnTurret {_ilTuID :: Int}
-    | OnFloor-- {_ilFlID :: NewInt FloorInt}
+    | OnFloor -- {_ilFlID :: NewInt FloorInt}
     | InVoid
     deriving (Eq, Show, Ord, Read) --Generic, Flat)
 
 instance ShortShow ItemLocation where
-    shortShow (InInv cid invid rootb selb attb esite)
-        = "InInv:cid" <> shortShow cid <> "invid"<> shortShow (_unNInt invid)
-            <>"root"<>shortShow rootb<>"sel"<>shortShow selb<>"att"<>shortShow attb<>
-            shortShow (fmap (SString . show) esite)
+    shortShow (InInv cid invid rootb selb attb esite) =
+        "InInv:cid" <> shortShow cid <> "invid" <> shortShow (_unNInt invid)
+            <> "root"
+            <> shortShow rootb
+            <> "sel"
+            <> shortShow selb
+            <> "att"
+            <> shortShow attb
+            <> shortShow (fmap (SString . show) esite)
     shortShow x = show x
+
 --    | OnTurret {_ilTuID :: Int}
 --    | OnFloor-- {_ilFlID :: NewInt FloorInt}
 --    | InVoid

src/Dodge/Data/Item/Misc.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Item/Params.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -27,8 +25,6 @@ data ItemParams
 
 data ShrinkGunStatus = FullSize | Shrunk
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 makeLenses ''ItemParams
 deriveJSON defaultOptions ''ShrinkGunStatus
 deriveJSON defaultOptions ''ItemParams

src/Dodge/Data/Item/Scope.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Item/Targeting.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Item/Use.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Item/Use/Consumption/LoadAction.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/LWorld.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -49,8 +47,6 @@ import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
---import Dodge.Data.PathGraph
-
 import qualified Data.Map.Strict as M
 import Dodge.Data.Beam
 import Dodge.Data.Block

src/Dodge/Data/Laser.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/LightSource.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/LinearShockwave.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Machine.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Machine/Sensor.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Magnet.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Material.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Modification.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/MountedObject.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/ObjectType.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/PathGraph.hs

@@ -1,11 +1,5 @@
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE ScopedTypeVariables #-}
---{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
---{-# LANGUAGE FlexibleInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {- |

src/Dodge/Data/Payload.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Projectile.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Prop.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/RadarBlip.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/RadarSweep.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/RightButtonOptions.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/SaveSlot.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Shockwave.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/SoundOrigin.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Spark.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -8,7 +6,6 @@ module Dodge.Data.Spark where
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
---import Dodge.Data.Damage.Type
 import Geometry.Data
 
 data Spark = Spark

src/Dodge/Data/Terminal.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/TeslaArc.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/TractorBeam.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Universe.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Wall.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/Wall/Structure.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/World.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/Data/WorldEffect.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Dodge/GameRoom.hs

@@ -1,6 +1,3 @@
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Geometry/ConvexPoly.hs

@@ -1,6 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Geometry.ConvexPoly (

src/MaybeHelp.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}

src/NewInt.hs

@@ -1,30 +1,30 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE TypeFamilies #-}
+
 --{-# LANGUAGE StandaloneDeriving #-}
 module NewInt where
 
-import qualified Data.IntSet as IS
-import qualified Data.IntMap.Strict as IM
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import qualified Data.IntMap.Strict as IM
+import qualified Data.IntSet as IS
 
-newtype NewInt a = NInt { _unNInt :: Int}
-    deriving newtype (Eq,Ord,Show,Num,Read,Integral,Real,Enum)
+newtype NewInt a = NInt {_unNInt :: Int}
+    deriving newtype (Eq, Ord, Show, Num, Read, Integral, Real, Enum)
 
-newtype NewIntSet a = NIntSet { _unNIntSet :: IS.IntSet}
-    deriving newtype (Eq,Ord,Show,Read)
+newtype NewIntSet a = NIntSet {_unNIntSet :: IS.IntSet}
+    deriving newtype (Eq, Ord, Show, Read)
 
-newtype NewIntMap a b = NIntMap { _unNIntMap :: IM.IntMap b}
-    deriving newtype (Foldable,Functor,Monoid,Semigroup)
-    deriving (Eq,Ord,Show,Read)
+newtype NewIntMap a b = NIntMap {_unNIntMap :: IM.IntMap b}
+    deriving newtype (Foldable, Functor, Monoid, Semigroup)
+    deriving (Eq, Ord, Show, Read)
 
 type instance Index (NewIntMap a b) = NewInt a
+
 type instance IxValue (NewIntMap a b) = b
 
 instance Ixed (NewIntMap a b) where

src/Picture/Data.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 

src/Quaternion.hs

@@ -1,7 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE StandaloneDeriving #-}
---{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 

src/Shape/Data.hs

@@ -1,10 +1,5 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE GeneralisedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# OPTIONS_GHC -Wno-missing-signatures #-}
 
 module Shape.Data where
 

src/Sound/Data.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}