update pippidon to osu-lazer v2018.1227.1

sadly multiplayer doesn't work :(
jorolf · Dec 27, 2018 · 93623ee · 93623ee
1 parent 618b53c
commit 93623ee
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 43 deletions.
diff --git a/osu b/osu
diff --git a/osu.Game.Rulesets.Pippidon/Mods/PippidonMods.cs b/osu.Game.Rulesets.Pippidon/Mods/PippidonMods.cs
@@ -1,18 +1,21 @@
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Pippidon.Objects;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Users;
-using osu.Game.Rulesets.Pippidon.Replays;
-
-namespace osu.Game.Rulesets.Pippidon.Mods
-{
-    public class PippidonModAutoplay : ModAutoplay<PippidonObject>
-    {
-        protected override Score CreateReplayScore(Beatmap<PippidonObject> beatmap) => new Score
-        {
-            User = new User { Username = "pippidon" },
-            Replay = new PippidonAutoGenerator(beatmap).Generate(),
-        };
-    }
-}
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Users;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Scoring;
+
+namespace osu.Game.Rulesets.Pippidon.Mods
+{
+    public class PippidonModAutoplay : ModAutoplay<PippidonObject>
+    {
+        protected override Score CreateReplayScore(Beatmap<PippidonObject> beatmap) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "pippidon" },
+            },
+            Replay = new PippidonAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs b/osu.Game.Rulesets.Pippidon/Objects/Drawables/Coin.cs
@@ -2,9 +2,9 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using OpenTK;
+using osuTK;
 using System;
-using OpenTK.Graphics;
+using osuTK.Graphics;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Pippidon.Objects.Drawables

diff --git a/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -1,9 +1,9 @@
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Pippidon.Objects;
 using osu.Game.Rulesets.Replays;
-using osu.Game.Users;
 using System.Collections.Generic;
 using System;
+using osu.Game.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
@@ -14,13 +14,7 @@ public class PippidonAutoGenerator : AutoGenerator<PippidonObject>
 
         public PippidonAutoGenerator(Beatmap<PippidonObject> beatmap) : base(beatmap)
         {
-            Replay = new Replay
-            {
-                User = new User
-                {
-                    Username = @"Pippppipiddddooon",
-                }
-            };
+            Replay = new Replay();
         }
 
         public override Replay Generate()

diff --git a/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs b/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayInputHandler.cs
@@ -2,6 +2,7 @@
 using osu.Game.Rulesets.Replays;
 using System.Linq;
 using osu.Framework.Input.StateChanges;
+using osu.Game.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {

diff --git a/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs b/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
@@ -3,13 +3,14 @@
 using osu.Game.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
-using OpenTK;
+using osuTK;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics.Containers;
 using osu.Framework.Audio.Track;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Pippidon.UI
@@ -18,24 +19,20 @@ public class PippidonPlayfield : ScrollingPlayfield
     {
         private readonly Container content;
 
-        protected override Container<Drawable> Content => content;
-
         private readonly PippidonContainer pippidon;
         public int PippidonLane => pippidon.LanePosition;
 
         public PippidonPlayfield(PippidonRuleset ruleset)
         {
-            VisibleTimeRange.Value = 6000;
-            Direction.Value = ScrollingDirection.Left;
-
-            base.Content.AddRange(new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Left = 200 },
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
+                    Child = HitObjectContainer
                 },
                 new LaneContainer
                 {
@@ -97,7 +94,7 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint,
 
         private class PippidonContainer : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
         {
-            public override bool HandleKeyboardInput => true;
+            public override bool HandleNonPositionalInput => true;
 
             public int LanePosition
             {

diff --git a/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs b/osu.Game.Rulesets.Pippidon/UI/PippidonRulesetContainer.cs
@@ -6,12 +6,11 @@
 using osu.Framework.Input;
 using osu.Framework.Graphics;
 using osu.Game.Input.Handlers;
+using osu.Game.Replays;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Pippidon.Objects.Drawables;
-using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Pippidon.Replays;
 using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
 
 namespace osu.Game.Rulesets.Pippidon.UI
 {
@@ -22,13 +21,15 @@ public class PippidonRulesetContainer : ScrollingRulesetContainer<PippidonPlayfi
         public PippidonRulesetContainer(PippidonRuleset ruleset, WorkingBeatmap beatmap) : base(ruleset, beatmap)
         {
             pippidonRuleset = ruleset;
+            Direction.Value = ScrollingDirection.Left;
+            TimeRange.Value = 6000;
         }
 
         public override ScoreProcessor CreateScoreProcessor() => new PippidonScoreProcessor(this);
 
         protected override Playfield CreatePlayfield() => new PippidonPlayfield(pippidonRuleset);
 
-        protected override DrawableHitObject<PippidonObject> GetVisualRepresentation(PippidonObject h)
+        public override DrawableHitObject<PippidonObject> GetVisualRepresentation(PippidonObject h)
         {
             return new Coin(h, pippidonRuleset.TextureStore, lane => Playfield.PippidonLane == lane)
             {
@@ -40,7 +41,5 @@ protected override DrawableHitObject<PippidonObject> GetVisualRepresentation(Pip
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonReplayInputHandler(replay);
 
         public override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo);
-
-        protected override Vector2 PlayfieldArea => new Vector2(1);
     }
 }
diff --git a/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -11,6 +11,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Copy SourceFiles="$(OutDir)osu.Game.Rulesets.Pippidon.dll;$(OutDir)osu.Game.Rulesets.Pippidon.pdb" DestinationFolder="$(SolutionDir)osu/osu.Desktop/bin/$(ConfigurationName)/netcoreapp2.1" />
+    <Copy SourceFiles="$(OutDir)osu.Game.Rulesets.Pippidon.dll;$(OutDir)osu.Game.Rulesets.Pippidon.pdb" DestinationFolder="$(SolutionDir)osu/osu.Desktop/bin/$(ConfigurationName)/netcoreapp2.2" />
   </Target>
 </Project>
diff --git a/pippidon.sln.DotSettings b/pippidon.sln.DotSettings
@@ -598,6 +598,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -653,6 +654,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-frame
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>