fix: ambiguity between Extended.BitmapFont and Content.BitmapFont

blish-hud · Sep 22, 2023 · 054a9c9 · 054a9c9
1 parent c9114ac
commit 054a9c9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 263 deletions.
diff --git a/Blish HUD/Controls/Book.cs b/Blish HUD/Controls/Book.cs
diff --git a/Blish HUD/Controls/Page.cs b/Blish HUD/Controls/Page.cs
diff --git a/Blish HUD/Controls/_Types/CachedStringRender.cs b/Blish HUD/Controls/_Types/CachedStringRender.cs
@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.ServiceModel;
-using Blish_HUD;
-using Blish_HUD.Content;
+using Blish_HUD.Content;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using MonoGame.Extended.BitmapFonts;
+using System;
+using System.Collections.Concurrent;
+using BitmapFont = MonoGame.Extended.BitmapFonts.BitmapFont;
 
 namespace Blish_HUD.Controls {
     public class CachedStringRender : IDisposable {

diff --git a/Blish HUD/Controls/_Types/FormattedLabelPart.cs b/Blish HUD/Controls/_Types/FormattedLabelPart.cs
@@ -1,8 +1,7 @@
-using System;
-using Blish_HUD.Content;
+using Blish_HUD.Content;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using MonoGame.Extended.BitmapFonts;
+using System;
+using BitmapFont = MonoGame.Extended.BitmapFonts.BitmapFont;
 
 namespace Blish_HUD.Controls {
     internal class FormattedLabelPart : IDisposable {

diff --git a/Blish HUD/GameServices/ContentService.cs b/Blish HUD/GameServices/ContentService.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Concurrent;
-using System.IO;
-using System.IO.Compression;
-using System.Text.RegularExpressions;
-using Blish_HUD.Content;
+using Blish_HUD.Content;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Audio;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
-using MonoGame.Extended.BitmapFonts;
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.IO.Compression;
+using System.Text.RegularExpressions;
+using BitmapFont = MonoGame.Extended.BitmapFonts.BitmapFont;
 
 namespace Blish_HUD {