Add BeatmapSkin to EditorBeatmap

osu.Game.Tests/Editing/EditorChangeHandlerTest.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestSaveRestoreState()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
             Assert.That(handler.CanUndo.Value, Is.False);
             Assert.That(handler.CanRedo.Value, Is.False);
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestMaxStatesSaved()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
             Assert.That(handler.CanUndo.Value, Is.False);
 
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Editing
         [Test]
         public void TestMaxStatesExceeded()
         {
-            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()), null);
+            var handler = new EditorChangeHandler(new EditorBeatmap(new Beatmap()));
 
             Assert.That(handler.CanUndo.Value, Is.False);
 

osu.Game/Screens/Edit/Editor.cs

@@ -33,7 +33,6 @@ using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Play;
-using osu.Game.Skinning;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Edit
@@ -65,7 +64,6 @@ namespace osu.Game.Screens.Edit
         private IBeatmap playableBeatmap;
         private EditorBeatmap editorBeatmap;
         private EditorChangeHandler changeHandler;
-        private IBeatmapSkin beatmapSkin;
 
         private DependencyContainer dependencies;
 
@@ -103,11 +101,9 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
-            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
+            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, Beatmap.Value.Skin));
             dependencies.CacheAs(editorBeatmap);
-
+            changeHandler = new EditorChangeHandler(editorBeatmap);
-            beatmapSkin = Beatmap.Value.Skin;
-            changeHandler = new EditorChangeHandler(editorBeatmap, beatmapSkin);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             EditorMenuBar menuBar;
@@ -402,7 +398,7 @@ namespace osu.Game.Screens.Edit
                 clock.SeekForward(!clock.IsRunning, amount);
         }
 
-        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, beatmapSkin);
+        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap, editorBeatmap.BeatmapSkin);
 
         private void exportBeatmap()
         {

osu.Game/Screens/Edit/EditorBeatmap.cs

@@ -15,6 +15,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
 {
@@ -47,6 +48,8 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
+        public readonly IBeatmapSkin BeatmapSkin;
+
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
 
@@ -54,9 +57,10 @@ namespace osu.Game.Screens.Edit
 
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
-        public EditorBeatmap(IBeatmap playableBeatmap)
+        public EditorBeatmap(IBeatmap playableBeatmap, IBeatmapSkin beatmapSkin = null)
         {
             PlayableBeatmap = playableBeatmap;
+            BeatmapSkin = beatmapSkin;
 
             beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset?.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap);
 

osu.Game/Screens/Edit/EditorChangeHandler.cs

@@ -8,7 +8,6 @@ using System.Text;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
 {
@@ -26,7 +25,6 @@ namespace osu.Game.Screens.Edit
         private int currentState = -1;
 
         private readonly EditorBeatmap editorBeatmap;
-        private readonly IBeatmapSkin beatmapSkin;
         private int bulkChangesStarted;
         private bool isRestoring;
 
@@ -36,8 +34,7 @@ namespace osu.Game.Screens.Edit
         /// Creates a new <see cref="EditorChangeHandler"/>.
         /// </summary>
         /// <param name="editorBeatmap">The <see cref="EditorBeatmap"/> to track the <see cref="HitObject"/>s of.</param>
-        /// <param name="beatmapSkin">The skin to track the inline skin configuration of.</param>
+        public EditorChangeHandler(EditorBeatmap editorBeatmap)
-        public EditorChangeHandler(EditorBeatmap editorBeatmap, IBeatmapSkin beatmapSkin)
         {
             this.editorBeatmap = editorBeatmap;
 
@@ -47,8 +44,6 @@ namespace osu.Game.Screens.Edit
 
             patcher = new LegacyEditorBeatmapPatcher(editorBeatmap);
 
-            this.beatmapSkin = beatmapSkin;
-
             // Initial state.
             SaveState();
         }
@@ -90,7 +85,7 @@ namespace osu.Game.Screens.Edit
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                    new LegacyBeatmapEncoder(editorBeatmap, beatmapSkin).Encode(sw);
+                    new LegacyBeatmapEncoder(editorBeatmap, editorBeatmap.BeatmapSkin).Encode(sw);
 
                 savedStates.Add(stream.ToArray());
             }