Merge pull request #189 from naoei/dependabot/nuget/ppy.osu.Game-2021…

….720.0 Bump ppy.osu.Game from 2021.619.1 to 2021.720.0
taulazer · Jul 19, 2021 · c1d42c4 · c1d42c4
2 parents 5d51ad3 + 22da8be
commit c1d42c4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/osu.Game.Rulesets.Tau/Mods/TauModDifficultyAdjust.cs b/osu.Game.Rulesets.Tau/Mods/TauModDifficultyAdjust.cs
@@ -27,14 +27,6 @@ public class TauModDifficultyAdjust : ModDifficultyAdjust
             Value = 5,
         };
 
-        protected override void TransferSettings(BeatmapDifficulty difficulty)
-        {
-            base.TransferSettings(difficulty);
-
-            TransferSetting(PaddleSize, difficulty.CircleSize);
-            TransferSetting(ApproachRate, difficulty.ApproachRate);
-        }
-
         protected override void ApplySettings(BeatmapDifficulty difficulty)
         {
             base.ApplySettings(difficulty);

diff --git a/osu.Game.Rulesets.Tau/Skinning/Legacy/TauLegacySkinTransformer.cs b/osu.Game.Rulesets.Tau/Skinning/Legacy/TauLegacySkinTransformer.cs
@@ -6,7 +6,7 @@ namespace osu.Game.Rulesets.Tau.Skinning.Legacy
 {
     public class TauLegacySkinTransformer : LegacySkinTransformer
     {
-        public TauLegacySkinTransformer(ISkinSource source)
+        public TauLegacySkinTransformer(ISkin source)
             : base(source)
         {
         }
@@ -19,16 +19,16 @@ public override Drawable GetDrawableComponent(ISkinComponent component)
             switch (tauComponent.Component)
             {
                 case TauSkinComponents.Beat:
-                    return Source.GetTexture("beat") != null ? new LegacyBeat() : null;
+                    return Skin.GetTexture("beat") != null ? new LegacyBeat() : null;
 
                 case TauSkinComponents.HardBeat:
-                    return Source.GetTexture("hard-beat") != null ? new LegacyHardBeat() : null;
+                    return Skin.GetTexture("hard-beat") != null ? new LegacyHardBeat() : null;
 
                 case TauSkinComponents.Handle:
-                    return Source.GetTexture("handle") != null ? new LegacyHandle() : null;
+                    return Skin.GetTexture("handle") != null ? new LegacyHandle() : null;
 
                 case TauSkinComponents.Ring:
-                    return Source.GetTexture("ring-overlay") != null ? new LegacyPlayfield() : null;
+                    return Skin.GetTexture("ring-overlay") != null ? new LegacyPlayfield() : null;
             }
 
             return null;
@@ -39,10 +39,10 @@ public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             switch (lookup)
             {
                 case TauSkinColour colour:
-                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    return Skin.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
             }
 
-            return Source.GetConfig<TLookup, TValue>(lookup);
+            return Skin.GetConfig<TLookup, TValue>(lookup);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Tau/TauRuleset.cs b/osu.Game.Rulesets.Tau/TauRuleset.cs
@@ -146,7 +146,7 @@ public override StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatma
 
         public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new BeatmapProcessor(beatmap);
 
-        public override ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => new TauLegacySkinTransformer(source);
+        public override ISkin CreateLegacySkinProvider(ISkin source, IBeatmap beatmap) => new TauLegacySkinTransformer(source);
 
         protected override IEnumerable<HitResult> GetValidHitResults()
         {

diff --git a/osu.Game.Rulesets.Tau/UI/TauSettingsSubsection.cs b/osu.Game.Rulesets.Tau/UI/TauSettingsSubsection.cs
@@ -1,13 +1,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Tau.Configuration;
 
 namespace osu.Game.Rulesets.Tau.UI
 {
     public class TauSettingsSubsection : RulesetSettingsSubsection
     {
-        protected override string Header => "tau";
+        protected override LocalisableString Header => "tau";
 
         public TauSettingsSubsection(Ruleset ruleset)
             : base(ruleset)

diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
@@ -14,7 +14,7 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.619.1" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.720.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay" />