h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 04:07:24 +08:00
Code Issues Releases Wiki Activity

Merge pull request #3341 from peppy/rip-async

Browse Source 
Remove async logic in line with framework
This commit is contained in:
Dean Herbert 2018-08-31 23:49:12 +09:00 committed by GitHub
commit 174c52decf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 121 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Desktop/Overlays/VersionManager.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -32,7 +31,7 @@ namespace osu.Desktop.Overlays
public override bool HandleMouseInput => false;
[BackgroundDependencyLoader]
private async Task load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config, GameHost host)
private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config, GameHost host)
{
notificationOverlay = notification;
this.config = config;
@ -87,7 +86,7 @@ namespace osu.Desktop.Overlays
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Texture = await textures.GetAsync(@"Menu/dev-build-footer"),
Texture = textures.Get(@"Menu/dev-build-footer"),
},
}
}

5
osu.Game.Rulesets.Catch/UI/CatcherArea.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -449,9 +448,9 @@ namespace osu.Game.Rulesets.Catch.UI
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
Texture = await textures.GetAsync(@"Play/Catch/fruit-catcher-idle");
Texture = textures.Get(@"Play/Catch/fruit-catcher-idle");
}
}
}

5
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/DefaultCirclePiece.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -13,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public class DefaultCirclePiece : Container
{
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
RelativeSizeAxes = Axes.Both;
Children = new Drawable[]
@ -22,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Texture = await textures.GetAsync(@"Play/osu/disc"),
Texture = textures.Get(@"Play/osu/disc"),
},
new TrianglesPiece
{

5
osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
View File

@ -4,7 +4,6 @@
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.OpenGL.Buffers;
@ -80,10 +79,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
[BackgroundDependencyLoader]
private async Task load(ShaderManager shaders, TextureStore textures)
private void load(ShaderManager shaders, TextureStore textures)
{
shader = shaders?.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE);
texture = await textures.GetAsync(@"Cursor/cursortrail");
texture = textures.Get(@"Cursor/cursortrail");
Scale = new Vector2(1 / texture.ScaleAdjust);
}

11
osu.Game.Rulesets.Taiko/UI/InputDrum.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using OpenTK;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
@ -131,12 +130,12 @@ namespace osu.Game.Rulesets.Taiko.UI
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures, OsuColour colours)
private void load(TextureStore textures, OsuColour colours)
{
rim.Texture = await textures.GetAsync(@"Play/Taiko/taiko-drum-outer");
rimHit.Texture = await textures.GetAsync(@"Play/Taiko/taiko-drum-outer-hit");
centre.Texture = await textures.GetAsync(@"Play/Taiko/taiko-drum-inner");
centreHit.Texture = await textures.GetAsync(@"Play/Taiko/taiko-drum-inner-hit");
rim.Texture = textures.Get(@"Play/Taiko/taiko-drum-outer");
rimHit.Texture = textures.Get(@"Play/Taiko/taiko-drum-outer-hit");
centre.Texture = textures.Get(@"Play/Taiko/taiko-drum-inner");
centreHit.Texture = textures.Get(@"Play/Taiko/taiko-drum-inner-hit");
rimHit.Colour = colours.Blue;
centreHit.Colour = colours.Pink;

5
osu.Game/Beatmaps/Drawables/BeatmapSetCover.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
@ -24,7 +23,7 @@ namespace osu.Game.Beatmaps.Drawables
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
string resource = null;
@ -42,7 +41,7 @@ namespace osu.Game.Beatmaps.Drawables
}
if (resource != null)
Texture = await textures.GetAsync(resource);
Texture = textures.Get(resource);
}
}

5
osu.Game/Graphics/Backgrounds/Background.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -35,10 +34,10 @@ namespace osu.Game.Graphics.Backgrounds
}
[BackgroundDependencyLoader]
private async Task load(LargeTextureStore textures)
private void load(LargeTextureStore textures)
{
if (!string.IsNullOrEmpty(textureName))
Sprite.Texture = await textures.GetAsync(textureName);
Sprite.Texture = textures.Get(textureName);
}
}
}

7
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -38,15 +37,15 @@ namespace osu.Game.Graphics.Containers
}
[BackgroundDependencyLoader(true)]
private async Task load(OsuGame osuGame, AudioManager audio, PreviewTrackManager previewTrackManager)
private void load(OsuGame osuGame, AudioManager audio, PreviewTrackManager previewTrackManager)
{
this.previewTrackManager = previewTrackManager;
if (osuGame != null)
OverlayActivationMode.BindTo(osuGame.OverlayActivationMode);
samplePopIn = await audio.Sample.GetAsync(@"UI/overlay-pop-in");
samplePopOut = await audio.Sample.GetAsync(@"UI/overlay-pop-out");
samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in");
samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out");
StateChanged += onStateChanged;
}

7
osu.Game/Graphics/Cursor/MenuCursor.cs
View File

@ -10,7 +10,6 @@ using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using osu.Game.Configuration;
using System;
using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Graphics.Textures;
using osu.Framework.Input.EventArgs;
@ -133,7 +132,7 @@ namespace osu.Game.Graphics.Cursor
}
[BackgroundDependencyLoader]
private async Task load(OsuConfigManager config, TextureStore textures, OsuColour colour)
private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
{
Children = new Drawable[]
{
@ -144,14 +143,14 @@ namespace osu.Game.Graphics.Cursor
{
new Sprite
{
Texture = await textures.GetAsync(@"Cursor/menu-cursor"),
Texture = textures.Get(@"Cursor/menu-cursor"),
},
AdditiveLayer = new Sprite
{
Blending = BlendingMode.Additive,
Colour = colour.Pink,
Alpha = 0,
Texture = await textures.GetAsync(@"Cursor/menu-cursor-additive"),
Texture = textures.Get(@"Cursor/menu-cursor-additive"),
},
}
}

4
osu.Game/Graphics/ScreenshotManager.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Graphics
private SampleChannel shutter;
[BackgroundDependencyLoader]
private async Task load(GameHost host, OsuConfigManager config, Storage storage, NotificationOverlay notificationOverlay, AudioManager audio)
private void load(GameHost host, OsuConfigManager config, Storage storage, NotificationOverlay notificationOverlay, AudioManager audio)
{
this.host = host;
this.storage = storage.GetStorageForDirectory(@"screenshots");
@ -51,7 +51,7 @@ namespace osu.Game.Graphics
screenshotFormat = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat);
captureMenuCursor = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor);
shutter = await audio.Sample.GetAsync("UI/shutter");
shutter = audio.Sample.Get("UI/shutter");
}
public bool OnPressed(GlobalAction action)

13
osu.Game/Graphics/SpriteIcon.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
@ -25,7 +24,7 @@ namespace osu.Game.Graphics
private FontStore store;
[BackgroundDependencyLoader]
private async Task load(FontStore store)
private void load(FontStore store)
{
this.store = store;
@ -56,23 +55,23 @@ namespace osu.Game.Graphics
},
};
await updateTexture();
updateTexture();
}
protected override void LoadComplete()
{
base.LoadComplete();
updateTexture().Wait();
updateTexture();
}
private FontAwesome loadedIcon;
private async Task updateTexture()
private void updateTexture()
{
var loadableIcon = icon;
if (loadableIcon == loadedIcon) return;
var texture = await store.GetAsync(((char)loadableIcon).ToString());
var texture = store.Get(((char)loadableIcon).ToString());
spriteMain.Texture = texture;
spriteShadow.Texture = texture;
@ -131,7 +130,7 @@ namespace osu.Game.Graphics
icon = value;
if (LoadState == LoadState.Loaded)
updateTexture().Wait();
updateTexture();
}
}
}

2
osu.Game/Graphics/Sprites/OsuSpriteText.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Graphics.Sprites
protected override Drawable CreateFallbackCharacterDrawable()
{
var tex = GetTextureForCharacter('?').Result;
var tex = GetTextureForCharacter('?');
if (tex != null)
{

5
osu.Game/Graphics/UserInterface/HoverClickSounds.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -29,9 +28,9 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
private async Task load(AudioManager audio)
private void load(AudioManager audio)
{
sampleClick = await audio.Sample.GetAsync($@"UI/generic-select{SampleSet.GetDescription()}");
sampleClick = audio.Sample.Get($@"UI/generic-select{SampleSet.GetDescription()}");
}
}
}

5
osu.Game/Graphics/UserInterface/HoverSounds.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.ComponentModel;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -36,9 +35,9 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
private async Task load(AudioManager audio)
private void load(AudioManager audio)
{
sampleHover = await audio.Sample.GetAsync($@"UI/generic-hover{SampleSet.GetDescription()}");
sampleHover = audio.Sample.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
}
}

7
osu.Game/Graphics/UserInterface/OsuCheckbox.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -111,10 +110,10 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
private async Task load(AudioManager audio)
private void load(AudioManager audio)
{
sampleChecked = await audio.Sample.GetAsync(@"UI/check-on");
sampleUnchecked = await audio.Sample.GetAsync(@"UI/check-off");
sampleChecked = audio.Sample.Get(@"UI/check-on");
sampleUnchecked = audio.Sample.Get(@"UI/check-off");
}
}
}

7
osu.Game/Graphics/UserInterface/OsuMenu.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -70,10 +69,10 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
private async Task load(AudioManager audio)
private void load(AudioManager audio)
{
sampleHover = await audio.Sample.GetAsync(@"UI/generic-hover");
sampleClick = await audio.Sample.GetAsync(@"UI/generic-select");
sampleHover = audio.Sample.Get(@"UI/generic-hover");
sampleClick = audio.Sample.Get(@"UI/generic-select");
BackgroundColour = Color4.Transparent;
BackgroundColourHover = OsuColour.FromHex(@"172023");

5
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Globalization;
using System.Threading.Tasks;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
@ -120,9 +119,9 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
private async Task load(AudioManager audio, OsuColour colours)
private void load(AudioManager audio, OsuColour colours)
{
sample = await audio.Sample.GetAsync(@"UI/sliderbar-notch");
sample = audio.Sample.Get(@"UI/sliderbar-notch");
AccentColour = colours.Pink;
}

7
osu.Game/Overlays/MedalOverlay.cs
View File

@ -20,7 +20,6 @@ using OpenTK.Input;
using osu.Framework.Graphics.Shapes;
using System;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Input.States;
using osu.Framework.MathUtils;
@ -144,10 +143,10 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private async Task load(OsuColour colours, TextureStore textures, AudioManager audio)
private void load(OsuColour colours, TextureStore textures, AudioManager audio)
{
getSample = await audio.Sample.GetAsync(@"MedalSplash/medal-get");
innerSpin.Texture = outerSpin.Texture = await textures.GetAsync(@"MedalSplash/disc-spin");
getSample = audio.Sample.Get(@"MedalSplash/medal-get");
innerSpin.Texture = outerSpin.Texture = textures.Get(@"MedalSplash/disc-spin");
disc.EdgeEffect = leftStrip.EdgeEffect = rightStrip.EdgeEffect = new EdgeEffectParameters
{

7
osu.Game/Overlays/MedalSplash/DrawableMedal.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework;
using OpenTK;
using osu.Framework.Allocation;
@ -119,10 +118,10 @@ namespace osu.Game.Overlays.MedalSplash
}
[BackgroundDependencyLoader]
private async Task load(OsuColour colours, TextureStore textures)
private void load(OsuColour colours, TextureStore textures)
{
medalSprite.Texture = await textures.GetAsync(medal.ImageUrl);
medalGlow.Texture = await textures.GetAsync(@"MedalSplash/medal-glow");
medalSprite.Texture = textures.Get(medal.ImageUrl);
medalGlow.Texture = textures.Get(@"MedalSplash/medal-glow");
description.Colour = colours.BlueLight;
}

7
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -15,7 +15,6 @@ using osu.Game.Rulesets.Mods;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Shapes;
@ -50,7 +49,7 @@ namespace osu.Game.Overlays.Mods
protected readonly IBindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
[BackgroundDependencyLoader(true)]
private async Task load(OsuColour colours, IBindable<RulesetInfo> ruleset, AudioManager audio, Bindable<IEnumerable<Mod>> selectedMods)
private void load(OsuColour colours, IBindable<RulesetInfo> ruleset, AudioManager audio, Bindable<IEnumerable<Mod>> selectedMods)
{
LowMultiplierColour = colours.Red;
HighMultiplierColour = colours.Green;
@ -59,8 +58,8 @@ namespace osu.Game.Overlays.Mods
Ruleset.BindTo(ruleset);
if (selectedMods != null) SelectedMods.BindTo(selectedMods);
sampleOn = await audio.Sample.GetAsync(@"UI/check-on");
sampleOff = await audio.Sample.GetAsync(@"UI/check-off");
sampleOn = audio.Sample.Get(@"UI/check-on");
sampleOff = audio.Sample.Get(@"UI/check-off");
}
protected override void LoadComplete()

4
osu.Game/Overlays/MusicController.cs
View File

@ -454,9 +454,9 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
sprite.Texture = beatmap?.Background ?? await textures.GetAsync(@"Backgrounds/bg4");
sprite.Texture = beatmap?.Background ?? textures.Get(@"Backgrounds/bg4");
}
}

5
osu.Game/Overlays/Profile/Components/GradeBadge.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -43,9 +42,9 @@ namespace osu.Game.Overlays.Profile.Components
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
badge.Texture = await textures.GetAsync($"Grades/{grade}");
badge.Texture = textures.Get($"Grades/{grade}");
}
}
}

5
osu.Game/Overlays/Profile/Header/BadgeContainer.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -177,13 +176,13 @@ namespace osu.Game.Overlays.Profile.Header
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
Child = new Sprite
{
FillMode = FillMode.Fit,
RelativeSizeAxes = Axes.Both,
Texture = await textures.GetAsync(badge.ImageUrl),
Texture = textures.Get(badge.ImageUrl),
};
}

5
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
@ -312,9 +311,9 @@ namespace osu.Game.Overlays.Profile
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
levelBadge.Texture = await textures.GetAsync(@"Profile/levelbadge");
levelBadge.Texture = textures.Get(@"Profile/levelbadge");
}
private User user;

5
osu.Game/Overlays/Profile/Sections/Recent/MedalIcon.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics;
@ -31,9 +30,9 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
sprite.Texture = await textures.GetAsync(url);
sprite.Texture = textures.Get(url);
}
}
}

5
osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Textures;
@ -76,9 +75,9 @@ namespace osu.Game.Screens.Backgrounds
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
Sprite.Texture = beatmap?.Background ?? await textures.GetAsync(@"Backgrounds/bg1");
Sprite.Texture = beatmap?.Background ?? textures.Get(@"Backgrounds/bg1");
}
}
}

7
osu.Game/Screens/Menu/Button.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -180,11 +179,11 @@ namespace osu.Game.Screens.Menu
}
[BackgroundDependencyLoader]
private async Task load(AudioManager audio)
private void load(AudioManager audio)
{
sampleHover = await audio.Sample.GetAsync(@"Menu/button-hover");
sampleHover = audio.Sample.Get(@"Menu/button-hover");
if (!string.IsNullOrEmpty(sampleName))
sampleClick = await audio.Sample.GetAsync($@"Menu/{sampleName}");
sampleClick = audio.Sample.Get($@"Menu/{sampleName}");
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)

5
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -103,10 +102,10 @@ namespace osu.Game.Screens.Menu
private OsuGame game;
[BackgroundDependencyLoader(true)]
private async Task load(AudioManager audio, OsuGame game)
private void load(AudioManager audio, OsuGame game)
{
this.game = game;
sampleBack = await audio.Sample.GetAsync(@"Menu/button-back-select");
sampleBack = audio.Sample.Get(@"Menu/button-back-select");
}
public bool OnPressed(GlobalAction action)

7
osu.Game/Screens/Menu/Intro.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -48,7 +47,7 @@ namespace osu.Game.Screens.Menu
private WorkingBeatmap introBeatmap;
[BackgroundDependencyLoader]
private async Task load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, BindableBeatmap beatmap)
private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, BindableBeatmap beatmap)
{
this.beatmap.BindTo(beatmap);
@ -81,8 +80,8 @@ namespace osu.Game.Screens.Menu
introBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
track = introBeatmap.Track;
welcome = await audio.Sample.GetAsync(@"welcome");
seeya = await audio.Sample.GetAsync(@"seeya");
welcome = audio.Sample.Get(@"welcome");
seeya = audio.Sample.Get(@"seeya");
}
private const double delay_step_one = 2300;

11
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -254,13 +253,13 @@ namespace osu.Game.Screens.Menu
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures, AudioManager audio)
private void load(TextureStore textures, AudioManager audio)
{
sampleClick = await audio.Sample.GetAsync(@"Menu/osu-logo-select");
sampleBeat = await audio.Sample.GetAsync(@"Menu/osu-logo-heartbeat");
sampleClick = audio.Sample.Get(@"Menu/osu-logo-select");
sampleBeat = audio.Sample.Get(@"Menu/osu-logo-heartbeat");
logo.Texture = await textures.GetAsync(@"Menu/logo");
ripple.Texture = await textures.GetAsync(@"Menu/logo");
logo.Texture = textures.Get(@"Menu/logo");
ripple.Texture = textures.Get(@"Menu/logo");
}
private int lastBeatIndex;

5
osu.Game/Screens/OsuScreen.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore.Internal;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -81,7 +80,7 @@ namespace osu.Game.Screens
private SampleChannel sampleExit;
[BackgroundDependencyLoader(true)]
private async Task load(BindableBeatmap beatmap, OsuGame osu, AudioManager audio, Bindable<RulesetInfo> ruleset)
private void load(BindableBeatmap beatmap, OsuGame osu, AudioManager audio, Bindable<RulesetInfo> ruleset)
{
Beatmap.BindTo(beatmap);
Ruleset.BindTo(ruleset);
@ -99,7 +98,7 @@ namespace osu.Game.Screens
};
}
sampleExit = await audio.Sample.GetAsync(@"UI/screen-back");
sampleExit = audio.Sample.Get(@"UI/screen-back");
}
public virtual bool OnPressed(GlobalAction action)

7
osu.Game/Screens/Play/KeyCounter.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -62,19 +61,19 @@ namespace osu.Game.Screens.Play
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
Children = new Drawable[]
{
buttonSprite = new Sprite
{
Texture = await textures.GetAsync(@"KeyCounter/key-up"),
Texture = textures.Get(@"KeyCounter/key-up"),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
glowSprite = new Sprite
{
Texture = await textures.GetAsync(@"KeyCounter/key-glow"),
Texture = textures.Get(@"KeyCounter/key-glow"),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Alpha = 0

4
osu.Game/Screens/Play/Player.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Screens.Play
public bool LoadedBeatmapSuccessfully => RulesetContainer?.Objects.Any() == true;
[BackgroundDependencyLoader]
private async Task load(AudioManager audio, APIAccess api, OsuConfigManager config)
private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
{
this.api = api;
@ -92,7 +92,7 @@ namespace osu.Game.Screens.Play
if (working is DummyWorkingBeatmap)
return;
sampleRestart = await audio.Sample.GetAsync(@"Gameplay/restart");
sampleRestart = audio.Sample.Get(@"Gameplay/restart");
mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);

5
osu.Game/Screens/Play/SkipOverlay.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -225,12 +224,12 @@ namespace osu.Game.Screens.Play
}
[BackgroundDependencyLoader]
private async Task load(OsuColour colours, AudioManager audio)
private void load(OsuColour colours, AudioManager audio)
{
colourNormal = colours.Yellow;
colourHover = colours.YellowDark;
sampleConfirm = await audio.Sample.GetAsync(@"SongSelect/confirm-selection");
sampleConfirm = audio.Sample.Get(@"SongSelect/confirm-selection");
Children = new Drawable[]
{

5
osu.Game/Screens/Ranking/ResultsPageScore.cs
View File

@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
@ -369,10 +368,10 @@ namespace osu.Game.Screens.Ranking
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
if (!string.IsNullOrEmpty(user.CoverUrl))
cover.Texture = await textures.GetAsync(user.CoverUrl);
cover.Texture = textures.Get(user.CoverUrl);
}
}

5
osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
@ -46,7 +45,7 @@ namespace osu.Game.Screens.Select.Carousel
private SampleChannel sampleHover;
[BackgroundDependencyLoader]
private async Task load(AudioManager audio, OsuColour colours)
private void load(AudioManager audio, OsuColour colours)
{
InternalChild = borderContainer = new Container
{
@ -69,7 +68,7 @@ namespace osu.Game.Screens.Select.Carousel
}
};
sampleHover = await audio.Sample.GetAsync($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
sampleHover = audio.Sample.Get($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
hoverLayer.Colour = colours.Blue.Opacity(0.1f);
}

12
osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -36,20 +35,23 @@ namespace osu.Game.Screens.Select.Leaderboards
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
this.textures = textures;
await updateTexture();
updateTexture();
}
private async Task updateTexture() => rankSprite.Texture = await textures.GetAsync($@"Grades/{Rank.GetDescription()}");
private void updateTexture()
{
rankSprite.Texture = textures.Get($@"Grades/{Rank.GetDescription()}");
}
public void UpdateRank(ScoreRank newRank)
{
Rank = newRank;
if (LoadState >= LoadState.Ready)
updateTexture().Wait();
updateTexture();
}
}
}

4
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -55,11 +55,11 @@ namespace osu.Game.Screens.Select
private readonly Bindable<IEnumerable<Mod>> selectedMods = new Bindable<IEnumerable<Mod>>(new Mod[] { });
[BackgroundDependencyLoader(true)]
private async Task load(OsuColour colours, AudioManager audio, BeatmapManager beatmaps, DialogOverlay dialogOverlay, Bindable<IEnumerable<Mod>> selectedMods)
private void load(OsuColour colours, AudioManager audio, BeatmapManager beatmaps, DialogOverlay dialogOverlay, Bindable<IEnumerable<Mod>> selectedMods)
{
if (selectedMods != null) this.selectedMods.BindTo(selectedMods);
sampleConfirm = await audio.Sample.GetAsync(@"SongSelect/confirm-selection");
sampleConfirm = audio.Sample.Get(@"SongSelect/confirm-selection");
Footer.AddButton(@"mods", colours.Yellow, modSelect, Key.F1, float.MaxValue);

7
osu.Game/Screens/Select/SongSelect.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using OpenTK;
using OpenTK.Input;
using osu.Framework.Allocation;
@ -199,7 +198,7 @@ namespace osu.Game.Screens.Select
}
[BackgroundDependencyLoader(true)]
private async Task load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours)
private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours)
{
if (Footer != null)
{
@ -219,8 +218,8 @@ namespace osu.Game.Screens.Select
dialogOverlay = dialog;
sampleChangeDifficulty = await audio.Sample.GetAsync(@"SongSelect/select-difficulty");
sampleChangeBeatmap = await audio.Sample.GetAsync(@"SongSelect/select-expand");
sampleChangeDifficulty = audio.Sample.Get(@"SongSelect/select-difficulty");
sampleChangeBeatmap = audio.Sample.Get(@"SongSelect/select-expand");
Carousel.LoadBeatmapSetsFromManager(this.beatmaps);
}

5
osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.MathUtils;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace osu.Game.Screens.Tournament.Components
{
@ -76,9 +75,9 @@ namespace osu.Game.Screens.Tournament.Components
private int expiredCount;
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
texture = await textures.GetAsync("Drawings/visualiser-line");
texture = textures.Get("Drawings/visualiser-line");
}
protected override void UpdateAfterChildren()

4
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Screens.Tournament
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
[BackgroundDependencyLoader]
private async Task load(TextureStore textures, Storage storage)
private void load(TextureStore textures, Storage storage)
{
this.storage = storage;
@ -87,7 +87,7 @@ namespace osu.Game.Screens.Tournament
{
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill,
Texture = await textures.GetAsync(@"Backgrounds/Drawings/background.png")
Texture = textures.Get(@"Backgrounds/Drawings/background.png")
},
new FillFlowContainer
{

5
osu.Game/Screens/Tournament/Group.cs
View File

@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -179,9 +178,9 @@ namespace osu.Game.Screens.Tournament
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
flagSprite.Texture = await textures.GetAsync($@"Flags/{Team.FlagName}");
flagSprite.Texture = textures.Get($@"Flags/{Team.FlagName}");
}
}
}

5
osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
View File

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
@ -373,9 +372,9 @@ namespace osu.Game.Screens.Tournament
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
flagSprite.Texture = await textures.GetAsync($@"Flags/{Team.FlagName}");
flagSprite.Texture = textures.Get($@"Flags/{Team.FlagName}");
}
}
}

7
osu.Game/Users/Avatar.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -25,14 +24,14 @@ namespace osu.Game.Users
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
if (textures == null)
throw new ArgumentNullException(nameof(textures));
Texture texture = null;
if (user != null && user.Id > 1) texture = await textures.GetAsync($@"https://a.ppy.sh/{user.Id}");
if (texture == null) texture = await textures.GetAsync(@"Online/avatar-guest");
if (user != null && user.Id > 1) texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
if (texture == null) texture = textures.Get(@"Online/avatar-guest");
Add(new Sprite
{

9
osu.Game/Users/Country.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using Newtonsoft.Json;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
@ -45,7 +44,7 @@ namespace osu.Game.Users
country = value;
if (LoadState >= LoadState.Ready)
sprite.Texture = getFlagTexture().Result;
sprite.Texture = getFlagTexture();
}
}
@ -65,15 +64,15 @@ namespace osu.Game.Users
}
[BackgroundDependencyLoader]
private async Task load(TextureStore ts)
private void load(TextureStore ts)
{
if (ts == null)
throw new ArgumentNullException(nameof(ts));
textures = ts;
sprite.Texture = await getFlagTexture();
sprite.Texture = getFlagTexture();
}
private async Task<Texture> getFlagTexture() => await textures.GetAsync($@"Flags/{country?.FlagName ?? @"__"}");
private Texture getFlagTexture() => textures.Get($@"Flags/{country?.FlagName ?? @"__"}");
}
}

5
osu.Game/Users/UserCoverBackground.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
@ -19,13 +18,13 @@ namespace osu.Game.Users
}
[BackgroundDependencyLoader]
private async Task load(TextureStore textures)
private void load(TextureStore textures)
{
if (textures == null)
throw new ArgumentNullException(nameof(textures));
if (!string.IsNullOrEmpty(user.CoverUrl))
Texture = await textures.GetAsync(user.CoverUrl);
Texture = textures.Get(user.CoverUrl);
}
}
}

2
osu.Game/osu.Game.csproj
View File

@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="ppy.osu.Framework" Version="2018.830.0" />
<PackageReference Include="ppy.osu.Framework" Version="2018.831.0" />
<PackageReference Include="SharpCompress" Version="0.22.0" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="SharpRaven" Version="2.4.0" />