Rename IColorBase to IColor

ds5678 · ds5678 · commit bed45ee60e37 · 2023-11-17T11:01:39.000-05:00
diff --git a/AssetRipper.TextureDecoder.ColorGenerator/AssetRipper.TextureDecoder.ColorGenerator.csproj b/AssetRipper.TextureDecoder.ColorGenerator/AssetRipper.TextureDecoder.ColorGenerator.csproj
@@ -1,5 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="AssetRipper.Text.SourceGeneration" Version="1.1.0" />
 	</ItemGroup>
diff --git a/AssetRipper.TextureDecoder.ColorGenerator/Program.cs b/AssetRipper.TextureDecoder.ColorGenerator/Program.cs
@@ -76,7 +76,7 @@ private static void WriteCustomColor(IndentedTextWriter writer, string name, Typ
 			writer.WriteLine($"public partial struct {name} : IColor<{typeName}>");
 			using (new CurlyBrackets(writer))
 			{
-				WriteColorBaseStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, fullyUtilized, typeName);
+				WriteNonGenericStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, fullyUtilized, typeName);
 				writer.WriteLineNoTabs();
 				WriteToString(writer, hasRed, hasGreen, hasBlue, hasAlpha);
 			}
@@ -127,14 +127,14 @@ private static void WriteToString(IndentedTextWriter writer, bool hasRed, bool h
 		}
 	}
 
-	private static void WriteColorBaseStaticProperties(IndentedTextWriter writer, bool hasRed, bool hasGreen, bool hasBlue, bool hasAlpha, bool fullyUtilized, string typeName)
+	private static void WriteNonGenericStaticProperties(IndentedTextWriter writer, bool hasRed, bool hasGreen, bool hasBlue, bool hasAlpha, bool fullyUtilized, string typeName)
 	{
-		writer.WriteLine($"static bool IColorBase.HasRedChannel => {hasRed.ToLowerString()};");
-		writer.WriteLine($"static bool IColorBase.HasGreenChannel => {hasGreen.ToLowerString()};");
-		writer.WriteLine($"static bool IColorBase.HasBlueChannel => {hasBlue.ToLowerString()};");
-		writer.WriteLine($"static bool IColorBase.HasAlphaChannel => {hasAlpha.ToLowerString()};");
-		writer.WriteLine($"static bool IColorBase.ChannelsAreFullyUtilized => {fullyUtilized.ToLowerString()};");
-		writer.WriteLine($"static Type IColorBase.ChannelType => typeof({typeName});");
+		writer.WriteLine($"static bool IColor.HasRedChannel => {hasRed.ToLowerString()};");
+		writer.WriteLine($"static bool IColor.HasGreenChannel => {hasGreen.ToLowerString()};");
+		writer.WriteLine($"static bool IColor.HasBlueChannel => {hasBlue.ToLowerString()};");
+		writer.WriteLine($"static bool IColor.HasAlphaChannel => {hasAlpha.ToLowerString()};");
+		writer.WriteLine($"static bool IColor.ChannelsAreFullyUtilized => {fullyUtilized.ToLowerString()};");
+		writer.WriteLine($"static Type IColor.ChannelType => typeof({typeName});");
 	}
 
 	private static void WriteGenericColor(IndentedTextWriter writer, string name, bool hasRed, bool hasGreen, bool hasBlue, bool hasAlpha)
@@ -170,7 +170,7 @@ private static void WriteGenericColor(IndentedTextWriter writer, string name, bo
 			writer.WriteLineNoTabs();
 			WriteSetChannels(writer, typeName, hasRed, hasGreen, hasBlue, hasAlpha);
 			writer.WriteLineNoTabs();
-			WriteColorBaseStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, true, typeName);
+			WriteNonGenericStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, true, typeName);
 			writer.WriteLineNoTabs();
 			WriteToString(writer, hasRed, hasGreen, hasBlue, hasAlpha);
 		}
diff --git a/AssetRipper.TextureDecoder.TestGenerator/GenerationData.cs b/AssetRipper.TextureDecoder.TestGenerator/GenerationData.cs
@@ -21,7 +21,7 @@ internal readonly struct GenerationData
 
 		public string ChannelTypeName => CSharpPrimitives.Dictionary[ChannelType].LangName;
 
-		public static GenerationData Create<T>(int colorSize) where T : IColorBase
+		public static GenerationData Create<T>(int colorSize) where T : IColor
 		{
 			return new GenerationData()
 			{
diff --git a/AssetRipper.TextureDecoder/Rgb/Color.cs b/AssetRipper.TextureDecoder/Rgb/Color.cs
@@ -68,7 +68,7 @@ internal static void SetConvertedChannels<TThis, TThisChannel, TSourceChannel>(t
 	}
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-	public static int GetChannelCount<T>() where T : IColorBase
+	public static int GetChannelCount<T>() where T : IColor
 	{
 		return (T.HasRedChannel ? 1 : 0) + (T.HasGreenChannel ? 1 : 0) + (T.HasBlueChannel ? 1 : 0) + (T.HasAlphaChannel ? 1 : 0);
 	}
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorA.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorA.g.cs
@@ -42,12 +42,12 @@ public void SetChannels(T r, T g, T b, T a)
 		A = a;
 	}
 
-	static bool IColorBase.HasRedChannel => false;
-	static bool IColorBase.HasGreenChannel => false;
-	static bool IColorBase.HasBlueChannel => false;
-	static bool IColorBase.HasAlphaChannel => true;
-	static bool IColorBase.ChannelsAreFullyUtilized => true;
-	static Type IColorBase.ChannelType => typeof(T);
+	static bool IColor.HasRedChannel => false;
+	static bool IColor.HasGreenChannel => false;
+	static bool IColor.HasBlueChannel => false;
+	static bool IColor.HasAlphaChannel => true;
+	static bool IColor.ChannelsAreFullyUtilized => true;
+	static Type IColor.ChannelType => typeof(T);
 
 	public override string ToString()
 	{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorARGB16.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorARGB16.g.cs
@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats
 {
 	public partial struct ColorARGB16 : IColor<byte>
 	{
-		static bool IColorBase.HasRedChannel => true;
-		static bool IColorBase.HasGreenChannel => true;
-		static bool IColorBase.HasBlueChannel => true;
-		static bool IColorBase.HasAlphaChannel => true;
-		static bool IColorBase.ChannelsAreFullyUtilized => false;
-		static Type IColorBase.ChannelType => typeof(byte);
+		static bool IColor.HasRedChannel => true;
+		static bool IColor.HasGreenChannel => true;
+		static bool IColor.HasBlueChannel => true;
+		static bool IColor.HasAlphaChannel => true;
+		static bool IColor.ChannelsAreFullyUtilized => false;
+		static Type IColor.ChannelType => typeof(byte);
 
 		public override string ToString()
 		{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorARGB32.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorARGB32.g.cs
@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats
 {
 	public partial struct ColorARGB32 : IColor<byte>
 	{
-		static bool IColorBase.HasRedChannel => true;
-		static bool IColorBase.HasGreenChannel => true;
-		static bool IColorBase.HasBlueChannel => true;
-		static bool IColorBase.HasAlphaChannel => true;
-		static bool IColorBase.ChannelsAreFullyUtilized => true;
-		static Type IColorBase.ChannelType => typeof(byte);
+		static bool IColor.HasRedChannel => true;
+		static bool IColor.HasGreenChannel => true;
+		static bool IColor.HasBlueChannel => true;
+		static bool IColor.HasAlphaChannel => true;
+		static bool IColor.ChannelsAreFullyUtilized => true;
+		static Type IColor.ChannelType => typeof(byte);
 
 		public override string ToString()
 		{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorBGRA32.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorBGRA32.g.cs
@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats
 {
 	public partial struct ColorBGRA32 : IColor<byte>
 	{
-		static bool IColorBase.HasRedChannel => true;
-		static bool IColorBase.HasGreenChannel => true;
-		static bool IColorBase.HasBlueChannel => true;
-		static bool IColorBase.HasAlphaChannel => true;
-		static bool IColorBase.ChannelsAreFullyUtilized => true;
-		static Type IColorBase.ChannelType => typeof(byte);
+		static bool IColor.HasRedChannel => true;
+		static bool IColor.HasGreenChannel => true;
+		static bool IColor.HasBlueChannel => true;
+		static bool IColor.HasAlphaChannel => true;
+		static bool IColor.ChannelsAreFullyUtilized => true;
+		static Type IColor.ChannelType => typeof(byte);
 
 		public override string ToString()
 		{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorR.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorR.g.cs
@@ -42,12 +42,12 @@ public void SetChannels(T r, T g, T b, T a)
 		R = r;
 	}
 
-	static bool IColorBase.HasRedChannel => true;
-	static bool IColorBase.HasGreenChannel => false;
-	static bool IColorBase.HasBlueChannel => false;
-	static bool IColorBase.HasAlphaChannel => false;
-	static bool IColorBase.ChannelsAreFullyUtilized => true;
-	static Type IColorBase.ChannelType => typeof(T);
+	static bool IColor.HasRedChannel => true;
+	static bool IColor.HasGreenChannel => false;
+	static bool IColor.HasBlueChannel => false;
+	static bool IColor.HasAlphaChannel => false;
+	static bool IColor.ChannelsAreFullyUtilized => true;
+	static Type IColor.ChannelType => typeof(T);
 
 	public override string ToString()
 	{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG.g.cs
@@ -40,12 +40,12 @@ public void SetChannels(T r, T g, T b, T a)
 		G = g;
 	}
 
-	static bool IColorBase.HasRedChannel => true;
-	static bool IColorBase.HasGreenChannel => true;
-	static bool IColorBase.HasBlueChannel => false;
-	static bool IColorBase.HasAlphaChannel => false;
-	static bool IColorBase.ChannelsAreFullyUtilized => true;
-	static Type IColorBase.ChannelType => typeof(T);
+	static bool IColor.HasRedChannel => true;
+	static bool IColor.HasGreenChannel => true;
+	static bool IColor.HasBlueChannel => false;
+	static bool IColor.HasAlphaChannel => false;
+	static bool IColor.ChannelsAreFullyUtilized => true;
+	static Type IColor.ChannelType => typeof(T);
 
 	public override string ToString()
 	{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB.g.cs
@@ -38,12 +38,12 @@ public void SetChannels(T r, T g, T b, T a)
 		B = b;
 	}
 
-	static bool IColorBase.HasRedChannel => true;
-	static bool IColorBase.HasGreenChannel => true;
-	static bool IColorBase.HasBlueChannel => true;
-	static bool IColorBase.HasAlphaChannel => false;
-	static bool IColorBase.ChannelsAreFullyUtilized => true;
-	static Type IColorBase.ChannelType => typeof(T);
+	static bool IColor.HasRedChannel => true;
+	static bool IColor.HasGreenChannel => true;
+	static bool IColor.HasBlueChannel => true;
+	static bool IColor.HasAlphaChannel => false;
+	static bool IColor.ChannelsAreFullyUtilized => true;
+	static Type IColor.ChannelType => typeof(T);
 
 	public override string ToString()
 	{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB16.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB16.g.cs
@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats
 {
 	public partial struct ColorRGB16 : IColor<byte>
 	{
-		static bool IColorBase.HasRedChannel => true;
-		static bool IColorBase.HasGreenChannel => true;
-		static bool IColorBase.HasBlueChannel => true;
-		static bool IColorBase.HasAlphaChannel => false;
-		static bool IColorBase.ChannelsAreFullyUtilized => false;
-		static Type IColorBase.ChannelType => typeof(byte);
+		static bool IColor.HasRedChannel => true;
+		static bool IColor.HasGreenChannel => true;
+		static bool IColor.HasBlueChannel => true;
+		static bool IColor.HasAlphaChannel => false;
+		static bool IColor.ChannelsAreFullyUtilized => false;
+		static Type IColor.ChannelType => typeof(byte);
 
 		public override string ToString()
 		{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB9e5.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB9e5.g.cs
@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats
 {
 	public partial struct ColorRGB9e5 : IColor<double>
 	{
-		static bool IColorBase.HasRedChannel => true;
-		static bool IColorBase.HasGreenChannel => true;
-		static bool IColorBase.HasBlueChannel => true;
-		static bool IColorBase.HasAlphaChannel => false;
-		static bool IColorBase.ChannelsAreFullyUtilized => false;
-		static Type IColorBase.ChannelType => typeof(double);
+		static bool IColor.HasRedChannel => true;
+		static bool IColor.HasGreenChannel => true;
+		static bool IColor.HasBlueChannel => true;
+		static bool IColor.HasAlphaChannel => false;
+		static bool IColor.ChannelsAreFullyUtilized => false;
+		static Type IColor.ChannelType => typeof(double);
 
 		public override string ToString()
 		{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA.g.cs
@@ -36,12 +36,12 @@ public void SetChannels(T r, T g, T b, T a)
 		A = a;
 	}
 
-	static bool IColorBase.HasRedChannel => true;
-	static bool IColorBase.HasGreenChannel => true;
-	static bool IColorBase.HasBlueChannel => true;
-	static bool IColorBase.HasAlphaChannel => true;
-	static bool IColorBase.ChannelsAreFullyUtilized => true;
-	static Type IColorBase.ChannelType => typeof(T);
+	static bool IColor.HasRedChannel => true;
+	static bool IColor.HasGreenChannel => true;
+	static bool IColor.HasBlueChannel => true;
+	static bool IColor.HasAlphaChannel => true;
+	static bool IColor.ChannelsAreFullyUtilized => true;
+	static Type IColor.ChannelType => typeof(T);
 
 	public override string ToString()
 	{
diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA16.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA16.g.cs
@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats
 {
 	public partial struct ColorRGBA16 : IColor<byte>
 	{
-		static bool IColorBase.HasRedChannel => true;
-		static bool IColorBase.HasGreenChannel => true;
-		static bool IColorBase.HasBlueChannel => true;
-		static bool IColorBase.HasAlphaChannel => true;
-		static bool IColorBase.ChannelsAreFullyUtilized => false;
-		static Type IColorBase.ChannelType => typeof(byte);
+		static bool IColor.HasRedChannel => true;
+		static bool IColor.HasGreenChannel => true;
+		static bool IColor.HasBlueChannel => true;
+		static bool IColor.HasAlphaChannel => true;
+		static bool IColor.ChannelsAreFullyUtilized => false;
+		static Type IColor.ChannelType => typeof(byte);
 
 		public override string ToString()
 		{
diff --git a/AssetRipper.TextureDecoder/Rgb/IColor.cs b/AssetRipper.TextureDecoder/Rgb/IColor.cs
@@ -7,7 +7,7 @@
 /// When used as a generic type constraint, the methods and properties get devirtualized by the JIT compiler.
 /// This prevents boxing when the implementing type is a <see langword="struct"/>.
 /// </remarks>
-public interface IColorBase
+public interface IColor
 {
 	/// <summary>
 	/// Does the format have a red channel?
diff --git a/AssetRipper.TextureDecoder/Rgb/IColor`1.cs b/AssetRipper.TextureDecoder/Rgb/IColor`1.cs
@@ -1,54 +1,53 @@
-﻿namespace AssetRipper.TextureDecoder.Rgb
+﻿namespace AssetRipper.TextureDecoder.Rgb;
+
+/// <summary>
+/// An <see langword="interface"/> for handling color formats with up to 4 channels.
+/// </summary>
+/// <remarks>
+/// When used as a generic type constraint, the methods and properties get devirtualized by the JIT compiler.
+/// This prevents boxing when the implementing type is a <see langword="struct"/>.
+/// </remarks>
+/// <typeparam name="T">
+/// Supported types are:
+/// <list type="bullet">
+/// <item><see cref="sbyte"/></item>
+/// <item><see cref="byte"/></item>
+/// <item><see cref="short"/></item>
+/// <item><see cref="ushort"/></item>
+/// <item><see cref="int"/></item>
+/// <item><see cref="uint"/></item>
+/// <item><see cref="nint"/></item>
+/// <item><see cref="nuint"/></item>
+/// <item><see cref="long"/></item>
+/// <item><see cref="ulong"/></item>
+/// <item><see cref="Int128"/></item>
+/// <item><see cref="UInt128"/></item>
+/// <item><see cref="Half"/></item>
+/// <item><see cref="float"/></item>
+/// <item><see cref="NFloat"/></item>
+/// <item><see cref="double"/></item>
+/// <item><see cref="decimal"/></item>
+/// </list>
+/// </typeparam>
+public interface IColor<T> : IColor where T : unmanaged
 {
 	/// <summary>
-	/// An <see langword="interface"/> for handling color formats with up to 4 channels.
+	/// The red channel
+	/// </summary>
+	T R { get; set; }
+	/// <summary>
+	/// The green channel
+	/// </summary>
+	T G { get; set; }
+	/// <summary>
+	/// The blue channel
+	/// </summary>
+	T B { get; set; }
+	/// <summary>
+	/// The alpha channel
 	/// </summary>
-	/// <remarks>
-	/// When used as a generic type constraint, the methods and properties get devirtualized by the JIT compiler.
-	/// This prevents boxing when the implementing type is a <see langword="struct"/>.
-	/// </remarks>
-	/// <typeparam name="T">
-	/// Supported types are:
-	/// <list type="bullet">
-	/// <item><see cref="sbyte"/></item>
-	/// <item><see cref="byte"/></item>
-	/// <item><see cref="short"/></item>
-	/// <item><see cref="ushort"/></item>
-	/// <item><see cref="int"/></item>
-	/// <item><see cref="uint"/></item>
-	/// <item><see cref="nint"/></item>
-	/// <item><see cref="nuint"/></item>
-	/// <item><see cref="long"/></item>
-	/// <item><see cref="ulong"/></item>
-	/// <item><see cref="Int128"/></item>
-	/// <item><see cref="UInt128"/></item>
-	/// <item><see cref="Half"/></item>
-	/// <item><see cref="float"/></item>
-	/// <item><see cref="NFloat"/></item>
-	/// <item><see cref="double"/></item>
-	/// <item><see cref="decimal"/></item>
-	/// </list>
-	/// </typeparam>
-	public interface IColor<T> : IColorBase where T : unmanaged
-	{
-		/// <summary>
-		/// The red channel
-		/// </summary>
-		T R { get; set; }
-		/// <summary>
-		/// The green channel
-		/// </summary>
-		T G { get; set; }
-		/// <summary>
-		/// The blue channel
-		/// </summary>
-		T B { get; set; }
-		/// <summary>
-		/// The alpha channel
-		/// </summary>
-		T A { get; set; }
+	T A { get; set; }
 
-		void GetChannels(out T r, out T g, out T b, out T a);
-		void SetChannels(T r, T g, T b, T a);
-	}
+	void GetChannels(out T r, out T g, out T b, out T a);
+	void SetChannels(T r, T g, T b, T a);
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private static void WriteCustomColor(IndentedTextWriter writer, string name, Typ`
`76`	`76`	`writer.WriteLine($"public partial struct {name} : IColor<{typeName}>");`
`77`	`77`	`using (new CurlyBrackets(writer))`
`78`	`78`	`{`
`79`		`- WriteColorBaseStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, fullyUtilized, typeName);`
	`79`	`+ WriteNonGenericStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, fullyUtilized, typeName);`
`80`	`80`	`writer.WriteLineNoTabs();`
`81`	`81`	`WriteToString(writer, hasRed, hasGreen, hasBlue, hasAlpha);`
`82`	`82`	`}`
`@@ -127,14 +127,14 @@ private static void WriteToString(IndentedTextWriter writer, bool hasRed, bool h`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`130`		`- private static void WriteColorBaseStaticProperties(IndentedTextWriter writer, bool hasRed, bool hasGreen, bool hasBlue, bool hasAlpha, bool fullyUtilized, string typeName)`
	`130`	`+ private static void WriteNonGenericStaticProperties(IndentedTextWriter writer, bool hasRed, bool hasGreen, bool hasBlue, bool hasAlpha, bool fullyUtilized, string typeName)`
`131`	`131`	`{`
`132`		`- writer.WriteLine($"static bool IColorBase.HasRedChannel => {hasRed.ToLowerString()};");`
`133`		`- writer.WriteLine($"static bool IColorBase.HasGreenChannel => {hasGreen.ToLowerString()};");`
`134`		`- writer.WriteLine($"static bool IColorBase.HasBlueChannel => {hasBlue.ToLowerString()};");`
`135`		`- writer.WriteLine($"static bool IColorBase.HasAlphaChannel => {hasAlpha.ToLowerString()};");`
`136`		`- writer.WriteLine($"static bool IColorBase.ChannelsAreFullyUtilized => {fullyUtilized.ToLowerString()};");`
`137`		`- writer.WriteLine($"static Type IColorBase.ChannelType => typeof({typeName});");`
	`132`	`+ writer.WriteLine($"static bool IColor.HasRedChannel => {hasRed.ToLowerString()};");`
	`133`	`+ writer.WriteLine($"static bool IColor.HasGreenChannel => {hasGreen.ToLowerString()};");`
	`134`	`+ writer.WriteLine($"static bool IColor.HasBlueChannel => {hasBlue.ToLowerString()};");`
	`135`	`+ writer.WriteLine($"static bool IColor.HasAlphaChannel => {hasAlpha.ToLowerString()};");`
	`136`	`+ writer.WriteLine($"static bool IColor.ChannelsAreFullyUtilized => {fullyUtilized.ToLowerString()};");`
	`137`	`+ writer.WriteLine($"static Type IColor.ChannelType => typeof({typeName});");`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private static void WriteGenericColor(IndentedTextWriter writer, string name, bool hasRed, bool hasGreen, bool hasBlue, bool hasAlpha)`
`@@ -170,7 +170,7 @@ private static void WriteGenericColor(IndentedTextWriter writer, string name, bo`
`170`	`170`	`writer.WriteLineNoTabs();`
`171`	`171`	`WriteSetChannels(writer, typeName, hasRed, hasGreen, hasBlue, hasAlpha);`
`172`	`172`	`writer.WriteLineNoTabs();`
`173`		`- WriteColorBaseStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, true, typeName);`
	`173`	`+ WriteNonGenericStaticProperties(writer, hasRed, hasGreen, hasBlue, hasAlpha, true, typeName);`
`174`	`174`	`writer.WriteLineNoTabs();`
`175`	`175`	`WriteToString(writer, hasRed, hasGreen, hasBlue, hasAlpha);`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ internal readonly struct GenerationData`
`21`	`21`
`22`	`22`	`public string ChannelTypeName => CSharpPrimitives.Dictionary[ChannelType].LangName;`
`23`	`23`
`24`		`- public static GenerationData Create<T>(int colorSize) where T : IColorBase`
	`24`	`+ public static GenerationData Create<T>(int colorSize) where T : IColor`
`25`	`25`	`{`
`26`	`26`	`return new GenerationData()`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ internal static void SetConvertedChannels<TThis, TThisChannel, TSourceChannel>(t`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`[MethodImpl(MethodImplOptions.AggressiveInlining \| MethodImplOptions.AggressiveOptimization)]`
`71`		`- public static int GetChannelCount<T>() where T : IColorBase`
	`71`	`+ public static int GetChannelCount<T>() where T : IColor`
`72`	`72`	`{`
`73`	`73`	`return (T.HasRedChannel ? 1 : 0) + (T.HasGreenChannel ? 1 : 0) + (T.HasBlueChannel ? 1 : 0) + (T.HasAlphaChannel ? 1 : 0);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats`
`4`	`4`	`{`
`5`	`5`	`public partial struct ColorARGB16 : IColor<byte>`
`6`	`6`	`{`
`7`		`- static bool IColorBase.HasRedChannel => true;`
`8`		`- static bool IColorBase.HasGreenChannel => true;`
`9`		`- static bool IColorBase.HasBlueChannel => true;`
`10`		`- static bool IColorBase.HasAlphaChannel => true;`
`11`		`- static bool IColorBase.ChannelsAreFullyUtilized => false;`
`12`		`- static Type IColorBase.ChannelType => typeof(byte);`
	`7`	`+ static bool IColor.HasRedChannel => true;`
	`8`	`+ static bool IColor.HasGreenChannel => true;`
	`9`	`+ static bool IColor.HasBlueChannel => true;`
	`10`	`+ static bool IColor.HasAlphaChannel => true;`
	`11`	`+ static bool IColor.ChannelsAreFullyUtilized => false;`
	`12`	`+ static Type IColor.ChannelType => typeof(byte);`
`13`	`13`
`14`	`14`	`public override string ToString()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats`
`4`	`4`	`{`
`5`	`5`	`public partial struct ColorARGB32 : IColor<byte>`
`6`	`6`	`{`
`7`		`- static bool IColorBase.HasRedChannel => true;`
`8`		`- static bool IColorBase.HasGreenChannel => true;`
`9`		`- static bool IColorBase.HasBlueChannel => true;`
`10`		`- static bool IColorBase.HasAlphaChannel => true;`
`11`		`- static bool IColorBase.ChannelsAreFullyUtilized => true;`
`12`		`- static Type IColorBase.ChannelType => typeof(byte);`
	`7`	`+ static bool IColor.HasRedChannel => true;`
	`8`	`+ static bool IColor.HasGreenChannel => true;`
	`9`	`+ static bool IColor.HasBlueChannel => true;`
	`10`	`+ static bool IColor.HasAlphaChannel => true;`
	`11`	`+ static bool IColor.ChannelsAreFullyUtilized => true;`
	`12`	`+ static Type IColor.ChannelType => typeof(byte);`
`13`	`13`
`14`	`14`	`public override string ToString()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats`
`4`	`4`	`{`
`5`	`5`	`public partial struct ColorBGRA32 : IColor<byte>`
`6`	`6`	`{`
`7`		`- static bool IColorBase.HasRedChannel => true;`
`8`		`- static bool IColorBase.HasGreenChannel => true;`
`9`		`- static bool IColorBase.HasBlueChannel => true;`
`10`		`- static bool IColorBase.HasAlphaChannel => true;`
`11`		`- static bool IColorBase.ChannelsAreFullyUtilized => true;`
`12`		`- static Type IColorBase.ChannelType => typeof(byte);`
	`7`	`+ static bool IColor.HasRedChannel => true;`
	`8`	`+ static bool IColor.HasGreenChannel => true;`
	`9`	`+ static bool IColor.HasBlueChannel => true;`
	`10`	`+ static bool IColor.HasAlphaChannel => true;`
	`11`	`+ static bool IColor.ChannelsAreFullyUtilized => true;`
	`12`	`+ static Type IColor.ChannelType => typeof(byte);`
`13`	`13`
`14`	`14`	`public override string ToString()`
`15`	`15`	`{`