restructure files

Author: al2me6

Source/IconMaterialPatch.cs renamed to Source/MaterialReplacement/IconMaterialReplacement.cs

@@ -27,16 +27,21 @@ You should have received a copy of the GNU General Public License
 namespace Shabby;
 
 [HarmonyPatch(typeof(PartLoader), "SetPartIconMaterials")]
-internal class SetPartIconMaterialsPatch
+internal class PartLoader_SetPartIconMaterials_Patch
 {
-	private static MethodInfo mInfo_ShaderFind =
+	private static readonly MethodInfo mInfo_ShaderFind =
 		AccessTools.Method(typeof(Shader), nameof(Shader.Find));
 
-	private static MethodInfo mInfo_FindOverrideIconShader =
-		AccessTools.Method(typeof(SetPartIconMaterialsPatch), nameof(FindOverrideIconShader));
+	private static readonly MethodInfo mInfo_FindOverrideIconShader = AccessTools.Method(
+		typeof(PartLoader_SetPartIconMaterials_Patch), nameof(FindOverrideIconShader));
 
-	private static Shader FindOverrideIconShader(Material material) =>
-		Shabby.TryFindIconShader(material.shader.name) ?? Shabby.FindShader("KSP/ScreenSpaceMask");
+	private static Shader FindOverrideIconShader(Material material)
+	{
+		var iconShader = Shabby.TryFindIconShader(material.shader.name);
+		if (iconShader != null)
+			return iconShader;
+		return Shabby.FindShader("KSP/ScreenSpaceMask");
+	}
 
 	/// <summary>
 	/// The stock method iterates through every material in the icon prefab and replaces some
@@ -87,7 +92,7 @@ private static IEnumerable<CodeInstruction> Transpiler(
 }
 
 [HarmonyPatch(TargetType, "GetIconShader")]
-internal class KSPCFGetIconShaderPatch
+internal class KSPCF_PartParsingPerf_GetIconShader_Patch
 {
 	private const string TargetType = "KSPCommunityFixes.Performance.PartParsingPerf";
 
@@ -99,4 +104,4 @@ private static void Postfix(string materialShaderName, ref Shader __result)
 		if (Shabby.TryFindIconShader(materialShaderName) is not Shader iconShader) return;
 		__result = iconShader;
 	}
-}
+}

Source/MaterialDef.cs renamed to Source/MaterialReplacement/MaterialDef.cs

@@ -65,14 +65,10 @@ public class MaterialDef : ILogContextProvider
 
 	public readonly bool isValid = true;
 
-	internal readonly string logPrefix;
-
 	public MaterialDef(ConfigNode node)
 	{
 		ConfigNode.LoadObjectFromConfig(this, node);
 
-		logPrefix = $"[Shabby][MaterialDef {name}] ";
-
 		if (shaderName != null) {
 			shader = Shabby.FindShader(shaderName);
 			if (shader == null) {
@@ -90,7 +86,7 @@ public MaterialDef(ConfigNode node)
 		floats = LoadDictionary<float>(node, "FLOAT");
 		colors = LoadDictionary<Color>(
 			node, "COLOR",
-			value => ParseColor(value, out var color) ? (object)color : null);
+			value => ParseColor(value, out var color) ? color : null);
 		vectors = LoadDictionary<Vector4>(node, "VECTOR");
 		textures = LoadDictionary<Texture>(
 			node, "TEXTURE",
@@ -114,8 +110,7 @@ private Dictionary<string, T> LoadDictionary<T>(ConfigNode defNode, string propK
 			if (value is T parsed) {
 				items[item.name] = parsed;
 			} else {
-				this.LogError(
-					$"failed to load {propKind} property {item.name} = {item.value}");
+				this.LogError($"failed to load {propKind} property {item.name} = {item.value}");
 			}
 		}
 
@@ -130,10 +125,10 @@ public static bool ParseColor(string value, out Color color)
 		return false;
 	}
 
-	private static bool CheckProperty(Material mat, string propName)
+	private bool CheckProperty(Material mat, string propName)
 	{
 		var exists = mat.HasProperty(propName);
-		if (!exists) Log.Warning($"shader {mat.shader.name} does not have property {propName}");
+		if (!exists) this.LogWarning($"shader {mat.shader.name} does not have property {propName}");
 		return exists;
 	}
 
@@ -182,8 +177,5 @@ public Material Instantiate(Material referenceMaterial)
 		return material;
 	}
 
-	public string context()
-	{
-		return name;
-	}
-}
+	public string context() => $"MaterialDef {name}";
+}

Source/MaterialReplacement.cs renamed to Source/MaterialReplacement/MaterialReplacement.cs

@@ -23,19 +23,19 @@ You should have received a copy of the GNU General Public License
 
 namespace Shabby;
 
-[DatabaseLoaderAttrib(new string[] { "shab" })]
+[DatabaseLoaderAttrib(["shab"])]
 public class DatabaseLoaderTexture_SHAB : DatabaseLoader<GameDatabase.TextureInfo>
 {
 	public override IEnumerator Load(UrlDir.UrlFile urlFile, FileInfo file)
 	{
-		Log.Message($"loading '{urlFile.fullPath}'");
+		Log.Message($"loading `{urlFile.fullPath}`");
 		var bundle = AssetBundle.LoadFromFile(urlFile.fullPath);
 		if (!bundle) {
-			Log.Warning($"could not load {urlFile.fullPath}");
+			Log.Warning($"could not load `{urlFile.fullPath}`");
 		} else {
 			var shaders = bundle.LoadAllAssets<Shader>();
 			foreach (var shader in shaders) {
-				Log.Debug($"adding {shader.name}");
+				Log.Debug($"adding custom shader `{shader.name}`");
 				Shabby.AddShader(shader);
 			}
 		}