From 962df63e62a009e29f880076fc394132d8f8c36c Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 23 Jan 2026 09:59:18 +0000 Subject: [PATCH] Remove mtl dependency --- package.yaml | 4 ++-- src/Dodge/Creature/Impulse.hs | 3 ++- src/Dodge/Data/GenWorld.hs | 3 ++- src/Dodge/Data/MetaTree.hs | 3 ++- src/Dodge/Layout/Generate.hs | 3 ++- src/Dodge/LevelGen.hs | 3 ++- src/Dodge/Placement/PlaceSpot.hs | 3 ++- src/Dodge/PlacementSpot.hs | 3 ++- src/Dodge/RandImpulse.hs | 3 ++- src/Dodge/Randify.hs | 3 ++- src/Dodge/Room/BlinkAcross.hs | 3 ++- src/Dodge/Room/Branch.hs | 3 ++- src/Dodge/Room/Treasure.hs | 3 ++- src/Dodge/Spark.hs | 3 ++- src/Dodge/Tesla.hs | 1 - src/Dodge/Tree/Compose.hs | 3 ++- src/RandomHelp.hs | 6 ++++-- src/Sound.hs | 3 ++- 18 files changed, 36 insertions(+), 20 deletions(-) diff --git a/package.yaml b/package.yaml index 0ed1889c1..81e591038 100644 --- a/package.yaml +++ b/package.yaml @@ -25,7 +25,7 @@ dependencies: - aeson-pretty - containers - deepseq -- dlist +#- dlist - directory - extra - foldl @@ -34,7 +34,7 @@ dependencies: - text - bytestring - lens -- mtl +#- mtl - fgl - JuicyPixels - random diff --git a/src/Dodge/Creature/Impulse.hs b/src/Dodge/Creature/Impulse.hs index c87095174..4beb5f76c 100644 --- a/src/Dodge/Creature/Impulse.hs +++ b/src/Dodge/Creature/Impulse.hs @@ -3,7 +3,8 @@ module Dodge.Creature.Impulse (followImpulse) where -import Control.Monad.State +import Control.Monad.Trans.State.Lazy +--import Control.Monad.State -- moving from mtl to transformers import Data.Maybe import Dodge.Creature.Impulse.Movement import Dodge.Creature.MoveType diff --git a/src/Dodge/Data/GenWorld.hs b/src/Dodge/Data/GenWorld.hs index b018b8b25..0c2ddc860 100644 --- a/src/Dodge/Data/GenWorld.hs +++ b/src/Dodge/Data/GenWorld.hs @@ -10,7 +10,8 @@ module Dodge.Data.GenWorld ( import ShortShow import Control.Lens -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import qualified Data.Set as S import Data.Tile import Dodge.Data.Room diff --git a/src/Dodge/Data/MetaTree.hs b/src/Dodge/Data/MetaTree.hs index e5c36d1ea..ec8169cf2 100644 --- a/src/Dodge/Data/MetaTree.hs +++ b/src/Dodge/Data/MetaTree.hs @@ -6,7 +6,8 @@ module Dodge.Data.MetaTree where import Control.Lens import Data.Tree import System.Random -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy data MetaTree a b = MTree {_mtLabel :: b, _mtTree :: MetaNode a b, _mtBranches :: [MetaBranch a b]} diff --git a/src/Dodge/Layout/Generate.hs b/src/Dodge/Layout/Generate.hs index 7bb70f21b..c01012d23 100644 --- a/src/Dodge/Layout/Generate.hs +++ b/src/Dodge/Layout/Generate.hs @@ -4,7 +4,8 @@ Random generation of high level layout of rooms. module Dodge.Layout.Generate where import Data.Tree -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy --import System.Random generateLayout :: State g (Tree RoomProperties) diff --git a/src/Dodge/LevelGen.hs b/src/Dodge/LevelGen.hs index fd3e12c42..66b6caf19 100644 --- a/src/Dodge/LevelGen.hs +++ b/src/Dodge/LevelGen.hs @@ -1,7 +1,8 @@ module Dodge.LevelGen (generateWorldFromSeed) where import Control.Lens -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Data.Foldable import Data.Preload.Render import Dodge.Data.GenWorld diff --git a/src/Dodge/Placement/PlaceSpot.hs b/src/Dodge/Placement/PlaceSpot.hs index 48d6d8030..258a1bb61 100644 --- a/src/Dodge/Placement/PlaceSpot.hs +++ b/src/Dodge/Placement/PlaceSpot.hs @@ -6,7 +6,8 @@ -} module Dodge.Placement.PlaceSpot (placeSpot) where -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Data.Bifunctor import Data.Foldable import qualified Data.IntSet as IS diff --git a/src/Dodge/PlacementSpot.hs b/src/Dodge/PlacementSpot.hs index 00492ba36..5fb87661c 100644 --- a/src/Dodge/PlacementSpot.hs +++ b/src/Dodge/PlacementSpot.hs @@ -38,7 +38,8 @@ module Dodge.PlacementSpot ( ) where import Control.Lens -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Data.Bifunctor import Data.Maybe import qualified Data.Set as S diff --git a/src/Dodge/RandImpulse.hs b/src/Dodge/RandImpulse.hs index 7cd3fb579..31db64cb5 100644 --- a/src/Dodge/RandImpulse.hs +++ b/src/Dodge/RandImpulse.hs @@ -1,6 +1,7 @@ module Dodge.RandImpulse where -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Dodge.Data.ActionPlan import RandomHelp diff --git a/src/Dodge/Randify.hs b/src/Dodge/Randify.hs index ebcf0bf81..da0431eeb 100644 --- a/src/Dodge/Randify.hs +++ b/src/Dodge/Randify.hs @@ -4,7 +4,8 @@ module Dodge.Randify ( ) where import Control.Lens -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Dodge.Data.GenWorld import System.Random diff --git a/src/Dodge/Room/BlinkAcross.hs b/src/Dodge/Room/BlinkAcross.hs index 894fbc923..631f87f66 100644 --- a/src/Dodge/Room/BlinkAcross.hs +++ b/src/Dodge/Room/BlinkAcross.hs @@ -1,6 +1,7 @@ module Dodge.Room.BlinkAcross where -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Dodge.Cleat import Dodge.Data.GenWorld import Dodge.PlacementSpot diff --git a/src/Dodge/Room/Branch.hs b/src/Dodge/Room/Branch.hs index c42bd0044..2d56aade5 100644 --- a/src/Dodge/Room/Branch.hs +++ b/src/Dodge/Room/Branch.hs @@ -3,7 +3,8 @@ Collections of rooms that branch into multiple paths. -} module Dodge.Room.Branch where -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Dodge.Cleat import Dodge.Data.GenWorld import Dodge.Room.Door diff --git a/src/Dodge/Room/Treasure.hs b/src/Dodge/Room/Treasure.hs index a81879629..5c86f4900 100644 --- a/src/Dodge/Room/Treasure.hs +++ b/src/Dodge/Room/Treasure.hs @@ -4,7 +4,8 @@ Typically dead ends. -} module Dodge.Room.Treasure where -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Dodge.Data.GenWorld import Dodge.Default.Room import Dodge.LevelGen.PlacementHelper diff --git a/src/Dodge/Spark.hs b/src/Dodge/Spark.hs index 35f826c68..efc0029d0 100644 --- a/src/Dodge/Spark.hs +++ b/src/Dodge/Spark.hs @@ -7,13 +7,14 @@ module Dodge.Spark ( makeSpark, ) where -import Control.Monad.State +--import Control.Monad.State import Dodge.Damage import Dodge.Data.World import Dodge.WorldEvent.ThingsHit import Geometry import LensHelp import System.Random +import Control.Monad.Trans.State.Lazy -- should probably reduce spark speed more if it is very fast updateSpark :: World -> Spark -> (World, Maybe Spark) diff --git a/src/Dodge/Tesla.hs b/src/Dodge/Tesla.hs index 2e15e1da4..af3c92b74 100644 --- a/src/Dodge/Tesla.hs +++ b/src/Dodge/Tesla.hs @@ -23,7 +23,6 @@ import LensHelp --import MonadHelp import Picture import RandomHelp - --import Shape makeTeslaArc :: ItemParams -> Point2 -> Float -> World -> (World, ItemParams) diff --git a/src/Dodge/Tree/Compose.hs b/src/Dodge/Tree/Compose.hs index cf55cdc0c..6514e0d69 100644 --- a/src/Dodge/Tree/Compose.hs +++ b/src/Dodge/Tree/Compose.hs @@ -19,7 +19,8 @@ module Dodge.Tree.Compose ( module Dodge.Data.MetaTree ) where -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Data.List (intersperse) import Data.Maybe import Data.Tuple diff --git a/src/RandomHelp.hs b/src/RandomHelp.hs index a5e514f37..0f4c6d77b 100644 --- a/src/RandomHelp.hs +++ b/src/RandomHelp.hs @@ -2,12 +2,14 @@ {- Helpers for random generation. -} module RandomHelp ( module System.Random, - module Control.Monad.State, +-- module Control.Monad.State, module RandomHelp, + module Control.Monad.Trans.State.Lazy, ) where import Control.Monad -import Control.Monad.State +--import Control.Monad.State +import Control.Monad.Trans.State.Lazy import Data.List import Geometry import StrictHelp diff --git a/src/Sound.hs b/src/Sound.hs index f5e60f7d7..5152903a0 100644 --- a/src/Sound.hs +++ b/src/Sound.hs @@ -28,7 +28,8 @@ import Data.Maybe import qualified IntMapHelp as IM import qualified Data.Map as M import Control.Monad -import Control.Monad.Trans +import Control.Monad.IO.Class +--import Control.Monad.Trans import Control.Monad.Trans.Maybe import Control.Lens import Data.Int (Int16)