bump osu version and adjust mods to use userplayable and remove the…

… obsolete member `ranked`
Flutterish · Jul 7, 2021 · af45c77 · af45c77
1 parent 92e2df9
commit af45c77
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/Hitokori/Mods/HitokoriModAuto.cs b/Hitokori/Mods/HitokoriModAuto.cs
@@ -16,8 +16,9 @@ public class HitokoriModAuto : ModAutoplay {
 		public override string Acronym => "AT";
 		public override string Description => "Let the cute bot do all the hard work";
 
+		public override bool UserPlayable => false;
+
 		public override double ScoreMultiplier => 1;
-		public override bool Ranked => false;
 
 		public override IconUsage? Icon => OsuIcon.ModAuto;
 

diff --git a/Hitokori/Mods/HitokoriModHoldTiles.cs b/Hitokori/Mods/HitokoriModHoldTiles.cs
@@ -12,8 +12,6 @@ public class HitokoriModHoldTiles : AutoImplementedMod {
 
 		public override IconUsage? Icon => FontAwesome.Solid.HandHolding;
 
-		public override bool Ranked => false;
-
 		public override ModType Type => ModType.Conversion;
 
 		public override bool HasImplementation => true;

diff --git a/Hitokori/Mods/HitokoriModSpinTiles.cs b/Hitokori/Mods/HitokoriModSpinTiles.cs
@@ -12,8 +12,6 @@ public class HitokoriModSpinTiles : AutoImplementedMod {
 
 		public override IconUsage? Icon => FontAwesome.Solid.Spinner;
 
-		public override bool Ranked => false;
-
 		public override ModType Type => ModType.Conversion;
 
 		public override bool HasImplementation => true;

diff --git a/Hitokori/Mods/HitokoriModTriplets.cs b/Hitokori/Mods/HitokoriModTriplets.cs
@@ -12,8 +12,6 @@ public class HitokoriModTriplets : AutoImplementedMod {
 
 		public override IconUsage? Icon => new IconUsage( '∴' );
 
-		public override bool Ranked => false;
-
 		public override ModType Type => ModType.Fun;
 
 		public override bool HasImplementation => true;

diff --git a/Hitokori/UI/HitokoriSettingsSubsection.cs b/Hitokori/UI/HitokoriSettingsSubsection.cs
@@ -1,6 +1,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Hitokori.Settings;
@@ -58,9 +59,9 @@ private void load () {
 	}
 
 	public class SpeedSlider : OsuSliderBar<double> {
-		public override string TooltipText => $"{Current.Value:N1}x";
+		public override LocalisableString TooltipText => $"{Current.Value:N1}x";
 	}
 	public class PercentageSlider : OsuSliderBar<double> {
-		public override string TooltipText => $"{Current.Value:##0%}";
+		public override LocalisableString TooltipText => $"{Current.Value:##0%}";
 	}
 }
diff --git a/Hitokori/osu - Backup.Game.Rulesets.Hitokori.csproj b/Hitokori/osu - Backup.Game.Rulesets.Hitokori.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.608.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+
+</Project>
diff --git a/Hitokori/osu.Game.Rulesets.Hitokori.csproj b/Hitokori/osu.Game.Rulesets.Hitokori.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.608.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.707.0" />
   </ItemGroup>
 
   <ItemGroup>