Fix skin vs store lookup

goodtrailer · Feb 1, 2024 · ba20bdf · ba20bdf
1 parent d0df1da
commit ba20bdf
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultApproachCircle.cs b/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultApproachCircle.cs
@@ -21,12 +21,12 @@ public DefaultApproachCircle()
  [BackgroundDependencyLoader]
  private void load(TextureStore textures, ISkinSource skin)
  {
- var textureName = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.ApproachCircle).LookupName;
+ var lookup = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.ApproachCircle);
  AddInternal(new Sprite
  {
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
- Texture = skin.GetTexture(textureName) ?? textures.Get(textureName),
+ Texture = skin.GetTexture(lookup.LookupName) ?? textures.Get(lookup.StoreName),
  });
  }
  }

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultHitCircle.cs b/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultHitCircle.cs
@@ -21,12 +21,12 @@ public DefaultHitCircle()
  [BackgroundDependencyLoader]
  private void load(TextureStore textures, ISkinSource skin)
  {
- var textureName = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.HitCircle).LookupName;
+ var lookup = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.HitCircle);
  AddInternal(new Sprite
  {
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
- Texture = skin.GetTexture(textureName) ?? textures.Get(textureName),
+ Texture = skin.GetTexture(lookup.LookupName) ?? textures.Get(lookup.StoreName),
  });
  }
  }

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultHitCircleOverlay.cs b/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultHitCircleOverlay.cs
@@ -21,12 +21,12 @@ public DefaultHitCircleOverlay()
  [BackgroundDependencyLoader]
  private void load(TextureStore textures, ISkinSource skin)
  {
- var textureName = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.HitCircleOverlay).LookupName;
+ var lookup = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.HitCircleOverlay);
  AddInternal(new Sprite
  {
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
- Texture = skin.GetTexture(textureName) ?? textures.Get(textureName),
+ Texture = skin.GetTexture(lookup.LookupName) ?? textures.Get(lookup.StoreName),
  });
  }
  }

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultHoldOverlay.cs b/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultHoldOverlay.cs
@@ -21,12 +21,12 @@ public DefaultHoldOverlay()
  [BackgroundDependencyLoader]
  private void load(TextureStore textures, ISkinSource skin)
  {
- var textureName = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.HoldOverlay).LookupName;
+ var lookup = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.HoldOverlay);
  AddInternal(new Sprite
  {
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
- Texture = skin.GetTexture(textureName) ?? textures.Get(textureName),
+ Texture = skin.GetTexture(lookup.LookupName) ?? textures.Get(lookup.StoreName),
  });
  }
  }

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultInputOverlayBackground.cs b/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultInputOverlayBackground.cs
@@ -21,12 +21,12 @@ public DefaultInputOverlayBackground()
  [BackgroundDependencyLoader]
  private void load(TextureStore textures, ISkinSource skin)
  {
- var textureName = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.InputOverlayBackground).LookupName;
+ var lookup = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.InputOverlayBackground);
  AddInternal(new Sprite
  {
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
- Texture = skin.GetTexture(textureName) ?? textures.Get(textureName),
+ Texture = skin.GetTexture(lookup.LookupName) ?? textures.Get(lookup.StoreName),
  });
  }
  }

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultInputOverlayKey.cs b/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultInputOverlayKey.cs
@@ -21,12 +21,12 @@ public DefaultInputOverlayKey()
  [BackgroundDependencyLoader]
  private void load(TextureStore textures, ISkinSource skin)
  {
- var textureName = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.InputOverlayKey).LookupName;
+ var lookup = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.InputOverlayKey);
  AddInternal(new Sprite
  {
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
- Texture = skin.GetTexture(textureName) ?? textures.Get(textureName),
+ Texture = skin.GetTexture(lookup.LookupName) ?? textures.Get(lookup.StoreName),
  });
  }
  }

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultKiaiVisualizerSquare.cs b/osu.Game.Rulesets.Soyokaze/Skinning/Defaults/DefaultKiaiVisualizerSquare.cs
@@ -21,12 +21,12 @@ public DefaultKiaiVisualizerSquare()
  [BackgroundDependencyLoader]
  private void load(TextureStore textures, ISkinSource skin)
  {
- var textureName = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.KiaiVisualizerSquare).LookupName;
+ var lookup = new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.KiaiVisualizerSquare);
  AddInternal(new Sprite
  {
  Anchor = Anchor.Centre,
  Origin = Anchor.Centre,
- Texture = skin.GetTexture(textureName) ?? textures.Get(textureName),
+ Texture = skin.GetTexture(lookup.LookupName) ?? textures.Get(lookup.StoreName),
  });
  }
  }

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/SoyokazeSkinComponentLookup.cs b/osu.Game.Rulesets.Soyokaze/Skinning/SoyokazeSkinComponentLookup.cs
@@ -13,7 +13,10 @@ public SoyokazeSkinComponentLookup(SoyokazeSkinComponents component)
  {
  }
 
- public string LookupName => string.Join('/', new[] { "Gameplay", RulesetPrefix, ComponentName }.Where(s => !string.IsNullOrEmpty(s)));
+ // TODO: THIS IS A HORROR
+ public string LookupName => ComponentName;
+
+ public string StoreName => string.Join('/', new[] { "Gameplay", RulesetPrefix, ComponentName }.Where(s => !string.IsNullOrEmpty(s)));
 
  protected override string RulesetPrefix => SoyokazeRuleset.SHORT_NAME;