remove IG1Dat

LeftofZen · LeftofZen · commit 59971d83902a · 2023-11-07T17:00:05.000+11:00
diff --git a/OpenLocoTool/DatFileParsing/LocoObject.cs b/OpenLocoTool/DatFileParsing/LocoObject.cs
@@ -81,14 +81,7 @@ public interface ILocoObject
 	}
 
 	[TypeConverter(typeof(ExpandableObjectConverter))]
-	public interface IG1Dat
-	{
-		G1Header G1Header { get; set; }
-		List<G1Element32> G1Elements { get; set; }
-	}
-
-	[TypeConverter(typeof(ExpandableObjectConverter))]
-	public class G1Dat : IG1Dat
+	public class G1Dat
 	{
 		public G1Dat(G1Header g1Header, List<G1Element32> g1Elements)
 		{
diff --git a/OpenLocoTool/DatFileParsing/SawyerStreamReader.cs b/OpenLocoTool/DatFileParsing/SawyerStreamReader.cs
@@ -37,7 +37,7 @@ static uint32_t ComputeChecksum(ReadOnlySpan<byte> data, uint32_t seed)
 			return checksum;
 		}
 
-		public IG1Dat LoadG1(string filename)
+		public G1Dat LoadG1(string filename)
 		{
 			ReadOnlySpan<byte> fullData = LoadBytesFromFile(filename);
 			var (g1Header, imageTable, imageTableBytesRead) = LoadImageTable(fullData);
diff --git a/OpenLocoToolGui/MainFormModel.cs b/OpenLocoToolGui/MainFormModel.cs
@@ -62,7 +62,7 @@ private void LoadPalette()
 
 		public Color[] Palette { get; private set; }
 
-		public IG1Dat G1 { get; set; }
+		public G1Dat G1 { get; set; }
 
 		public MainFormModel(ILogger logger, string settingsFile)
 		{

Original file line number	Diff line number	Diff line change
`@@ -81,14 +81,7 @@ public interface ILocoObject`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`[TypeConverter(typeof(ExpandableObjectConverter))]`
`84`		`- public interface IG1Dat`
`85`		`- {`
`86`		`- G1Header G1Header { get; set; }`
`87`		`- List<G1Element32> G1Elements { get; set; }`
`88`		`- }`
`89`		`-`
`90`		`- [TypeConverter(typeof(ExpandableObjectConverter))]`
`91`		`- public class G1Dat : IG1Dat`
	`84`	`+ public class G1Dat`
`92`	`85`	`{`
`93`	`86`	`public G1Dat(G1Header g1Header, List<G1Element32> g1Elements)`
`94`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static uint32_t ComputeChecksum(ReadOnlySpan<byte> data, uint32_t seed)`
`37`	`37`	`return checksum;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public IG1Dat LoadG1(string filename)`
	`40`	`+ public G1Dat LoadG1(string filename)`
`41`	`41`	`{`
`42`	`42`	`ReadOnlySpan<byte> fullData = LoadBytesFromFile(filename);`
`43`	`43`	`var (g1Header, imageTable, imageTableBytesRead) = LoadImageTable(fullData);`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private void LoadPalette()`
`62`	`62`
`63`	`63`	`public Color[] Palette { get; private set; }`
`64`	`64`
`65`		`- public IG1Dat G1 { get; set; }`
	`65`	`+ public G1Dat G1 { get; set; }`
`66`	`66`
`67`	`67`	`public MainFormModel(ILogger logger, string settingsFile)`
`68`	`68`	`{`