Cleanup module pathing

src/Dodge/Data.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE StrictData #-}
@@ -15,142 +14,49 @@ The warnings have been disabled.
 -}
 module Dodge.Data (
     module Dodge.Data,
-    module Dodge.Data.CrGroupParams,
-    module Dodge.Data.Corpse,
-    module Dodge.Data.ActionPlan,
-    module Dodge.Data.CreatureEffect,
-    module Dodge.Data.WorldEffect,
-    module Dodge.Data.Button,
-    module Dodge.Data.Beam,
-    module Dodge.Data.Hammer,
     module Dodge.Data.ArcStep,
-    module Dodge.Data.CrWlID,
-    module Dodge.Data.Gas,
-    module Dodge.Data.Ammo,
-    module Dodge.Data.Payload,
-    module Dodge.Data.RadarSweep,
-    module Dodge.Data.PosEvent,
-    module Dodge.Data.EnergyBall,
-    module Dodge.Data.Flame,
-    module Dodge.Data.Magnet,
-    module Dodge.Data.Spark,
-    module Dodge.Data.Bullet,
-    module Dodge.Data.Door,
-    module Dodge.Data.Item,
-    module Dodge.Data.HUD,
-    module Dodge.Data.Cloud,
-    module Dodge.Data.RightButtonOptions,
-    module Dodge.Data.Material,
-    module Dodge.Data.LightSource,
-    module Dodge.Data.Creature,
-    module Dodge.Data.Block,
-    module Dodge.Data.Flare,
-    module Dodge.Data.LoadAction,
-    module Dodge.Data.ForegroundShape,
-    module Dodge.Data.Wall,
-    module Dodge.Data.Object,
     module Dodge.Data.Zoning,
-    module Dodge.Data.Bounds,
-    module Dodge.Data.Sensor,
     module Dodge.Data.Distortion,
-    module Dodge.Data.Damage,
+    module Dodge.Data.Material,
     module Dodge.Data.SoundOrigin,
+    module Dodge.Data.Hammer,
+    module Dodge.Data.RightButtonOptions,
     module Dodge.Data.Config,
     module MaybeHelp,
     module Dodge.Data.RoomCluster,
     module Dodge.Data.Room,
-    module Dodge.Data.RadarBlip,
-    module Dodge.Data.PathGraph,
-    module Dodge.Data.Gust,
-    module Dodge.Data.Projectile,
-    module Dodge.Data.Modification,
-    module Dodge.Data.PressPlate,
-    module Dodge.Data.Laser,
-    module Dodge.Data.TeslaArc,
-    module Dodge.Data.Shockwave,
-    module Dodge.Data.Prop,
-    module Dodge.Data.LinearShockwave,
-    module Dodge.Data.TractorBeam,
-    module Dodge.Data.MountedObject,
-    module Dodge.Data.Machine,
-    module Dodge.Data.GenParams,
-    module Dodge.Data.Terminal,
-    module Dodge.Data.FloorItem,
     module Dodge.Data.CWorld,
+    module Dodge.Data.ObjectType,
+    module Dodge.Data.CrWlID,
+    module Dodge.Data.CreatureEffect,
+    module Dodge.Data.MountedObject,
 ) where
 
-import Dodge.Data.CWorld
 import Color
 import Control.Lens
 import Control.Monad.State
-import Data.Aeson
 import qualified Data.Map.Strict as M
 import Data.Preload
 import qualified Data.Set as S
 import qualified Data.Text as T
 import Data.Tile
-import Dodge.Data.Config
 import Dodge.Config.KeyConfig
 import Dodge.Data.ActionPlan
-import Dodge.Data.Ammo
 import Dodge.Data.ArcStep
-import Dodge.Data.Beam
-import Dodge.Data.Block
-import Dodge.Data.Bounds
-import Dodge.Data.Bullet
-import Dodge.Data.Button
-import Dodge.Data.Cloud
-import Dodge.Data.Corpse
-import Dodge.Data.CrGroupParams
+import Dodge.Data.CWorld
+import Dodge.Data.Config
 import Dodge.Data.CrWlID
-import Dodge.Data.Creature
 import Dodge.Data.CreatureEffect
-import Dodge.Data.Damage
-import Dodge.Data.Door
-import Dodge.Data.EnergyBall
-import Dodge.Data.Flame
-import Dodge.Data.Flare
-import Dodge.Data.FloorItem
-import Dodge.Data.ForegroundShape
-import Dodge.Data.Gas
-import Dodge.Data.GenParams
-import Dodge.Data.Gust
-import Dodge.Data.HUD
+import Dodge.Data.Distortion
 import Dodge.Data.Hammer
-import Dodge.Data.Item
-import Dodge.Data.Laser
-import Dodge.Data.LightSource
-import Dodge.Data.LinearShockwave
-import Dodge.Data.LoadAction
-import Dodge.Data.Machine
-import Dodge.Data.Magnet
 import Dodge.Data.Material
-import Dodge.Data.Modification
 import Dodge.Data.MountedObject
-import Dodge.Data.Object
-import Dodge.Data.PathGraph
-import Dodge.Data.Payload
-import Dodge.Data.PosEvent
-import Dodge.Data.PressPlate
-import Dodge.Data.Projectile
-import Dodge.Data.Prop
-import Dodge.Data.RadarBlip
-import Dodge.Data.RadarSweep
+import Dodge.Data.ObjectType
 import Dodge.Data.RightButtonOptions
 import Dodge.Data.Room
-import Dodge.Data.Sensor
-import Dodge.Data.Shockwave
-import Dodge.Data.SoundOrigin
-import Dodge.Data.Spark
-import Dodge.Data.Terminal
-import Dodge.Data.TeslaArc
-import Dodge.Data.TractorBeam
-import Dodge.Data.Wall
-import Dodge.Data.WorldEffect
-import Dodge.Data.Zoning
-import Dodge.Data.Distortion
 import Dodge.Data.RoomCluster
-import GHC.Generics
+import Dodge.Data.SoundOrigin
+import Dodge.Data.Zoning
 import Geometry.Data
 import qualified IntMapHelp as IM
 import MaybeHelp
@@ -198,49 +104,16 @@ data World = World
     , _rbOptions :: RightButtonOptions
     }
 
-
-instance ToJSON MouseButton where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON MouseButton
-
-instance ToJSONKey MouseButton
-
-instance FromJSONKey MouseButton
-
-instance ToJSON Scancode where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON Scancode
-
-instance ToJSONKey Scancode
-
-instance FromJSONKey Scancode
-
 data TimeFlowStatus
     = RewindingNow
     | RewindingLastFrame
     | NormalTimeFlow
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON TimeFlowStatus where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TimeFlowStatus
+    deriving (Eq, Ord, Show, Read)
 
 data WorldHammer
     = SubInvHam
     | DoubleMouseHam
-    deriving (Eq, Ord, Show, Read, Enum, Bounded, Generic)
-
-instance ToJSON WorldHammer where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON WorldHammer
-
-instance ToJSONKey WorldHammer
-
-instance FromJSONKey WorldHammer
+    deriving (Eq, Ord, Show, Read, Enum, Bounded)
 
 data SaveSlot
     = QuicksaveSlot
@@ -295,15 +168,12 @@ data MenuOption
 
 data IntID a = IntID Int a
 
-
 type HitEffect' =
     Flame ->
     Stream (Of (Point2, Either Creature Wall)) Identity () ->
     World ->
     (World, Maybe Flame)
 
-data Either3 a b c = E3x1 a | E3x2 b | E3x3 c
-
 ---- ROOM DATATYPES
 data PSType
     = PutCrit {_unPutCrit :: Creature}
@@ -414,7 +284,6 @@ data InPlacement = InPlacement
 
 makeLenses ''World
 
---makeLenses ''Particle
 makeLenses ''Universe
 makeLenses ''ScreenLayer
 makeLenses ''GenWorld