Skip to content

fix: resolve InstanceID deprecation in Unity 6.4+ #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chikacc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve InstanceID deprecation in Unity 6.4+ #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Packages/Ink/Editor/Core/InkEditorUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@
namespace Ink.UnityIntegration {
[InitializeOnLoad]
public static class InkEditorUtils {
#if UNITY_6000_4_OR_NEWER
class CreateInkAssetAction : AssetCreationEndAction {
public override void Action(EntityId entityId, string pathName, string resourceFile) {
#else
class CreateInkAssetAction : EndNameEditAction {
public override void Action(int instanceId, string pathName, string resourceFile) {
#endif
var text = "";
if(File.Exists(resourceFile)) {
StreamReader streamReader = new StreamReader(resourceFile);
Expand Down Expand Up @@ -83,7 +88,11 @@ public static void CreateNewInkFileAtSelectedPathWithTemplateAndStartNameEditing

public static void CreateNewInkFileAtPathWithTemplateAndStartNameEditing (string filePath, string templateFileLocation) {
if(Path.GetExtension(filePath) != inkFileExtension) filePath += inkFileExtension;
#if UNITY_6000_4_OR_NEWER
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance<CreateInkAssetAction>(), filePath, InkBrowserIcons.inkFileIcon, templateFileLocation);
#else
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<CreateInkAssetAction>(), filePath, InkBrowserIcons.inkFileIcon, templateFileLocation);
#endif
}

public static DefaultAsset CreateNewInkFileAtPath (string filePath, string text) {
Expand Down Expand Up @@ -386,4 +395,4 @@ public static string FindAbsolutePluginDirectory() {
return null; // If no folder is found
}
}
}
}