Move from store to flat

src/Dodge/Data/Item/Combine.hs

@@ -1,8 +1,11 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.Item.Combine where
 
+import Flat
 import Control.Lens
 import TH.Derive
 import Data.Store
@@ -17,10 +20,10 @@ data ItemType = ItemType
     , _iyModules :: M.Map ModuleSlot ItemModuleType
     , _iyStack :: Stack
     }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data Stack = NoStack | Stack ItAmount
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data CraftType
     = PIPE
@@ -69,7 +72,7 @@ data CraftType
     | TIMEMODULE
     | SIZEMODULE
     | GRAVITYMODULE
-    deriving (Eq, Ord, Show, Enum, Read)
+    deriving (Eq, Ord, Show, Enum, Read, Generic, Flat)
 
 data ItemBaseType
     = NoItemType
@@ -78,12 +81,12 @@ data ItemBaseType
     | EQUIP {_ibtEquip :: EquipItemType}
     | Consumable {_ibtConsumable :: ConsumableItemType}
     | CRAFT CraftType
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data ConsumableItemType
     = MEDKIT Int
     | EXPLOSIVES
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data EquipItemType
     = MAGSHIELD
@@ -99,7 +102,7 @@ data EquipItemType
     | JUMPLEGS
     | JETPACK
     | AUTODETECTOR Detector
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data LeftItemType
     = BOOSTER
@@ -108,7 +111,7 @@ data LeftItemType
     | BLINKERUNSAFE
     | SHRINKER
     | SPAWNER
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data HeldItemType
     = BANGSTICK {_xNum :: Int}
@@ -156,7 +159,7 @@ data HeldItemType
     | TORCH
     | FLATSHIELD
     | KEYCARD Int
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data ItemModuleType
     = EMPTYMODULE
@@ -181,13 +184,13 @@ data ItemModuleType
     | LAUNCHHOME
     | EXTRABATTERY
     | ATTACHTORCH
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data Detector
     = ITEMDETECTOR
     | CREATUREDETECTOR
     | WALLDETECTOR
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data ModuleSlot
     = ModBullet
@@ -201,7 +204,7 @@ data ModuleSlot
     | ModTeleport
     | ModDualBeam
     | ModHeldAttach
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 instance ToJSONKey ModuleSlot
 
@@ -221,14 +224,3 @@ deriveJSON defaultOptions ''ModuleSlot
 makeLenses ''ItemType
 makeLenses ''ItemBaseType
 makeLenses ''HeldItemType
-$($(derive [d| instance Deriving (Store ItemType) |]))
-$($(derive [d| instance Deriving (Store Stack) |]))
-$($(derive [d| instance Deriving (Store CraftType) |]))
-$($(derive [d| instance Deriving (Store ItemBaseType) |]))
-$($(derive [d| instance Deriving (Store ConsumableItemType) |]))
-$($(derive [d| instance Deriving (Store EquipItemType) |]))
-$($(derive [d| instance Deriving (Store LeftItemType) |]))
-$($(derive [d| instance Deriving (Store HeldItemType) |]))
-$($(derive [d| instance Deriving (Store ItemModuleType) |]))
-$($(derive [d| instance Deriving (Store Detector) |]))
-$($(derive [d| instance Deriving (Store ModuleSlot) |]))