Cleanup

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

@@ -1,6 +1,7 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -11,8 +12,6 @@ module Dodge.Data.Item.Use.Consumption (
 ) where
 
 import Flat
-import TH.Derive
-import Data.Store
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -45,7 +44,10 @@ data LeftConsumption
     deriving (Eq, Show, Read, Generic, Flat)
 
 newtype ItAmount = ItAmount {_getItAmount :: Int}
-    deriving (Eq, Ord, Read, Show, Num, Real, Enum, Integral, Generic, Flat)
+--    deriving (Eq, Ord, Read, Show, Num, Real, Generic, Flat)
+    deriving newtype (Eq, Ord, Read, Show, Num, Real, Enum, Integral)
+    deriving stock (Generic)
+    deriving anyclass (Flat)
 
 makeLenses ''HeldConsumption
 makeLenses ''LeftConsumption

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

@@ -10,8 +10,6 @@ module Dodge.Data.Item.Use.Consumption.Ammo (
 ) where
 
 import Flat
-import TH.Derive
-import Data.Store
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH

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

@@ -11,8 +11,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Hammer
 import Sound.Data
-import TH.Derive
-import Data.Store
 
 data LoadAction
     = LoadEject {_actionTime :: Int, _actionSound :: SoundID}

src/Dodge/Data/Item/Use/Equipment.hs

@@ -14,8 +14,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Equipment.Misc
 import Dodge.Data.Item.HeldUse
-import TH.Derive
-import Data.Store
 
 data EquipEffect = EquipEffect
     { _eeUse :: Euse --Item -> Creature -> World -> World