Decompile UnityScript assemblies in hybrid script export

AssetRipper · Feb 4, 2024 · eac83c0 · eac83c0
1 parent 3216c77
commit eac83c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/Source/AssetRipper.Export.UnityProjects/Scripts/ReferenceAssemblies.cs b/Source/AssetRipper.Export.UnityProjects/Scripts/ReferenceAssemblies.cs
@@ -26,25 +26,22 @@ public static class ReferenceAssemblies
 			"Assembly-CSharp.dll",
 			"Assembly-CSharp",
 			"Assembly-CSharp-firstpass.dll",
-			"Assembly-CSharp-firstpass"
+			"Assembly-CSharp-firstpass",
+			"Assembly-UnityScript.dll",
+			"Assembly-UnityScript",
+			"Assembly-UnityScript-firstpass.dll",
+			"Assembly-UnityScript-firstpass"
 		};
 
 		public static bool IsPredefinedAssembly(string assemblyName)
 		{
-			if (assemblyName is null)
-			{
-				throw new ArgumentNullException(assemblyName);
-			}
-
+			ArgumentNullException.ThrowIfNull(assemblyName);
 			return predefinedAssemblies.Contains(assemblyName);
 		}
 
 		public static bool IsReferenceAssembly(string assemblyName)
 		{
-			if (assemblyName is null)
-			{
-				throw new ArgumentNullException(assemblyName);
-			}
+			ArgumentNullException.ThrowIfNull(assemblyName);
 
 			if (IsWhiteListAssembly(assemblyName))
 			{

diff --git a/Source/AssetRipper.Export.UnityProjects/Scripts/ScriptExportCollectionBase.cs b/Source/AssetRipper.Export.UnityProjects/Scripts/ScriptExportCollectionBase.cs
@@ -64,7 +64,13 @@ private void ThrowIfNotAsset(IUnityObjectBase asset)
 
 	protected static string GetScriptsFolderName(string assemblyName)
 	{
-		return assemblyName is "Assembly-CSharp-firstpass" or "Assembly - CSharp - firstpass" ? "Plugins" : "Scripts";
+		return assemblyName
+			is "Assembly-CSharp-firstpass"
+			or "Assembly - CSharp - firstpass"
+			or "Assembly-UnityScript-firstpass"
+			or "Assembly - UnityScript - firstpass"
+			? "Plugins"
+			: "Scripts";
 	}
 
 	protected static void GetExportSubPath(string assembly, string @namespace, string @class, out string folderPath, out string fileName)