Slip in an extra safety for model parent while we wait for PR to be a…

…pproved
JannisX11 · Oct 6, 2024 · cdc4a2e · cdc4a2e
1 parent dc10e29
commit cdc4a2e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/plugins/animation_utils/animation_utils.js b/plugins/animation_utils/animation_utils.js
@@ -6902,6 +6902,8 @@ function createProjectSettingsDialog(Project, form) {
             }
             const modelType = _constants__WEBPACK_IMPORTED_MODULE_0__.GeckoModelType[formResult[_constants__WEBPACK_IMPORTED_MODULE_0__.PROPERTY_MODEL_TYPE]];
             Project[_constants__WEBPACK_IMPORTED_MODULE_0__.PROPERTY_MODEL_TYPE] = modelType;
+            if (modelType == _constants__WEBPACK_IMPORTED_MODULE_0__.GeckoModelType.ITEM)
+                Project.parent = 'builtin/entity';
             if (Project.name === Format.name || Project.name === '')
                 Project.name = "GeckoLib " + Project[_constants__WEBPACK_IMPORTED_MODULE_0__.PROPERTY_MODEL_TYPE];
             switch (modelType) {
@@ -7465,8 +7467,10 @@ function onProjectSave(e) {
 function onSettingsChanged() {
     Modes.selected.select();
     Format.display_mode = (0,_utils__WEBPACK_IMPORTED_MODULE_0__.hasModelDisplaySettings)();
-    if (Project instanceof ModelProject && Project[_constants__WEBPACK_IMPORTED_MODULE_1__.PROPERTY_MODEL_TYPE] === _constants__WEBPACK_IMPORTED_MODULE_1__.GeckoModelType.ITEM)
+    if (Project instanceof ModelProject && Project[_constants__WEBPACK_IMPORTED_MODULE_1__.PROPERTY_MODEL_TYPE] === _constants__WEBPACK_IMPORTED_MODULE_1__.GeckoModelType.ITEM && (!Project.parent || Project.parent !== 'builtin/entity')) {
         Project.parent = 'builtin/entity';
+        Project.saved = false;
+    }
 }
 /**
  * When opening a project tab, whether from an existing project, creating a new one, or swapping open tabs

diff --git a/plugins/animation_utils/src/package-lock.json b/plugins/animation_utils/src/package-lock.json
diff --git a/plugins/animation_utils/src/ts/codec.ts b/plugins/animation_utils/src/ts/codec.ts
@@ -257,6 +257,9 @@ function createProjectSettingsDialog(Project: ModelProject, form: {[formElement:
             const modelType = GeckoModelType[formResult[PROPERTY_MODEL_TYPE]]
             Project[PROPERTY_MODEL_TYPE] = modelType;
 
+            if (modelType == GeckoModelType.ITEM)
+                Project.parent = 'builtin/entity';
+
             if (Project.name === Format.name || Project.name === '')
                 Project.name = "GeckoLib " + Project[PROPERTY_MODEL_TYPE];
 

diff --git a/plugins/animation_utils/src/ts/events.ts b/plugins/animation_utils/src/ts/events.ts
@@ -67,8 +67,10 @@ function onSettingsChanged() {
 
     Format.display_mode = hasModelDisplaySettings();
 
-    if (Project instanceof ModelProject && Project[PROPERTY_MODEL_TYPE] === GeckoModelType.ITEM)
+    if (Project instanceof ModelProject && Project[PROPERTY_MODEL_TYPE] === GeckoModelType.ITEM && (!Project.parent || Project.parent !== 'builtin/entity')) {
         Project.parent = 'builtin/entity';
+        Project.saved = false;
+    }
 }
 
 /**