Merge pull request #181 from tfausak/inline-encode

Inline encoding stuff
tfausak · Feb 13, 2021 · e22ebd2 · e22ebd2
2 parents dfe04bf + a74fcab
commit e22ebd2
Show file tree

Hide file tree

Showing 156 changed files with 1,057 additions and 1,863 deletions.
diff --git a/rattletrap.cabal b/rattletrap.cabal
@@ -121,83 +121,7 @@ library
     Rattletrap.Decode.Word32le
     Rattletrap.Decode.Word64le
     Rattletrap.Decode.Word8le
-    Rattletrap.Encode.AppliedDamageAttribute
-    Rattletrap.Encode.Attribute
-    Rattletrap.Encode.AttributeMapping
-    Rattletrap.Encode.AttributeValue
-    Rattletrap.Encode.BooleanAttribute
-    Rattletrap.Encode.ByteAttribute
-    Rattletrap.Encode.Cache
-    Rattletrap.Encode.CamSettingsAttribute
-    Rattletrap.Encode.ClassMapping
-    Rattletrap.Encode.ClubColorsAttribute
     Rattletrap.Encode.Common
-    Rattletrap.Encode.CompressedWord
-    Rattletrap.Encode.CompressedWordVector
-    Rattletrap.Encode.Content
-    Rattletrap.Encode.CustomDemolishAttribute
-    Rattletrap.Encode.DamageStateAttribute
-    Rattletrap.Encode.DemolishAttribute
-    Rattletrap.Encode.DestroyedReplication
-    Rattletrap.Encode.Dictionary
-    Rattletrap.Encode.EnumAttribute
-    Rattletrap.Encode.ExplosionAttribute
-    Rattletrap.Encode.ExtendedExplosionAttribute
-    Rattletrap.Encode.FlaggedByteAttribute
-    Rattletrap.Encode.FlaggedIntAttribute
-    Rattletrap.Encode.Float32le
-    Rattletrap.Encode.FloatAttribute
-    Rattletrap.Encode.Frame
-    Rattletrap.Encode.GameModeAttribute
-    Rattletrap.Encode.Header
-    Rattletrap.Encode.Initialization
-    Rattletrap.Encode.Int32le
-    Rattletrap.Encode.Int64Attribute
-    Rattletrap.Encode.Int64le
-    Rattletrap.Encode.Int8le
-    Rattletrap.Encode.Int8Vector
-    Rattletrap.Encode.IntAttribute
-    Rattletrap.Encode.KeyFrame
-    Rattletrap.Encode.List
-    Rattletrap.Encode.LoadoutAttribute
-    Rattletrap.Encode.LoadoutOnlineAttribute
-    Rattletrap.Encode.LoadoutsAttribute
-    Rattletrap.Encode.LoadoutsOnlineAttribute
-    Rattletrap.Encode.LocationAttribute
-    Rattletrap.Encode.Mark
-    Rattletrap.Encode.Message
-    Rattletrap.Encode.MusicStingerAttribute
-    Rattletrap.Encode.PartyLeaderAttribute
-    Rattletrap.Encode.PickupAttribute
-    Rattletrap.Encode.PickupAttributeNew
-    Rattletrap.Encode.PlayerHistoryKeyAttribute
-    Rattletrap.Encode.PrivateMatchSettingsAttribute
-    Rattletrap.Encode.ProductAttribute
-    Rattletrap.Encode.Property
-    Rattletrap.Encode.PropertyValue
-    Rattletrap.Encode.Quaternion
-    Rattletrap.Encode.QWordAttribute
-    Rattletrap.Encode.RemoteId
-    Rattletrap.Encode.Replay
-    Rattletrap.Encode.Replication
-    Rattletrap.Encode.ReplicationValue
-    Rattletrap.Encode.ReservationAttribute
-    Rattletrap.Encode.RigidBodyStateAttribute
-    Rattletrap.Encode.Rotation
-    Rattletrap.Encode.Section
-    Rattletrap.Encode.SpawnedReplication
-    Rattletrap.Encode.StatEventAttribute
-    Rattletrap.Encode.Str
-    Rattletrap.Encode.StringAttribute
-    Rattletrap.Encode.TeamPaintAttribute
-    Rattletrap.Encode.TitleAttribute
-    Rattletrap.Encode.UniqueIdAttribute
-    Rattletrap.Encode.UpdatedReplication
-    Rattletrap.Encode.Vector
-    Rattletrap.Encode.WeldedInfoAttribute
-    Rattletrap.Encode.Word32le
-    Rattletrap.Encode.Word64le
-    Rattletrap.Encode.Word8le
     Rattletrap.Type.AppliedDamageAttribute
     Rattletrap.Type.Attribute
     Rattletrap.Type.AttributeMapping
@@ -285,6 +209,7 @@ library
     -Wno-all-missed-specialisations
     -Wno-implicit-prelude
     -Wno-missing-deriving-strategies
+    -Wno-missing-export-lists
     -Wno-missing-exported-signatures
     -Wno-missing-import-lists
     -Wno-safe

diff --git a/src/lib/Rattletrap/Decode/CompressedWord.hs b/src/lib/Rattletrap/Decode/CompressedWord.hs
@@ -3,7 +3,7 @@ module Rattletrap.Decode.CompressedWord
   ) where
 
 import Rattletrap.Decode.Common
-import Rattletrap.Type.CompressedWord
+import Rattletrap.Type.CompressedWord hiding (getMaxBits)
 
 import qualified Data.Bits as Bits
 

diff --git a/src/lib/Rattletrap/Decode/Replay.hs b/src/lib/Rattletrap/Decode/Replay.hs
@@ -6,7 +6,6 @@ import Rattletrap.Decode.Common
 import Rattletrap.Decode.Content
 import Rattletrap.Decode.Header
 import Rattletrap.Decode.Section
-import Rattletrap.Encode.Content
 import Rattletrap.Type.Content
 import Rattletrap.Type.Dictionary
 import Rattletrap.Type.Header

diff --git a/src/lib/Rattletrap/Encode/AppliedDamageAttribute.hs b/src/lib/Rattletrap/Encode/AppliedDamageAttribute.hs
diff --git a/src/lib/Rattletrap/Encode/Attribute.hs b/src/lib/Rattletrap/Encode/Attribute.hs
diff --git a/src/lib/Rattletrap/Encode/AttributeMapping.hs b/src/lib/Rattletrap/Encode/AttributeMapping.hs
diff --git a/src/lib/Rattletrap/Encode/AttributeValue.hs b/src/lib/Rattletrap/Encode/AttributeValue.hs
diff --git a/src/lib/Rattletrap/Encode/BooleanAttribute.hs b/src/lib/Rattletrap/Encode/BooleanAttribute.hs
diff --git a/src/lib/Rattletrap/Encode/ByteAttribute.hs b/src/lib/Rattletrap/Encode/ByteAttribute.hs
diff --git a/src/lib/Rattletrap/Encode/Cache.hs b/src/lib/Rattletrap/Encode/Cache.hs
diff --git a/src/lib/Rattletrap/Encode/CamSettingsAttribute.hs b/src/lib/Rattletrap/Encode/CamSettingsAttribute.hs
diff --git a/src/lib/Rattletrap/Encode/ClassMapping.hs b/src/lib/Rattletrap/Encode/ClassMapping.hs
diff --git a/src/lib/Rattletrap/Encode/ClubColorsAttribute.hs b/src/lib/Rattletrap/Encode/ClubColorsAttribute.hs
diff --git a/src/lib/Rattletrap/Encode/CompressedWord.hs b/src/lib/Rattletrap/Encode/CompressedWord.hs