v0.11.2 pt.2

src/renderer/scripts/TabSystem.js

@@ -63,6 +63,8 @@ class TabSystem {
         EventBus.trigger("updateTabUI");
     }
     closeById(id, project=this.project) {
+        if(this.projects[project] === undefined || this.projects[project][id] === undefined)
+            return;
         if(this.projects[project][id].is_unsaved) {
             new ConfirmWindow(() => {
                 this.internalCloseId(id, project);

src/renderer/scripts/editor/JsonCacheUtils.js

@@ -34,6 +34,17 @@ export default class JsonCacheUtils {
         return res;
     }
 
+    static get animation_references() {
+        let res = [];
+        this.CACHE_ITEMS.forEach(c => {
+            let refs = c.get("minecraft:entity/description/animations");
+            if(refs !== undefined) {
+                res = res.concat(Object.keys(refs.toJSON()));
+            }
+        });
+        return res;
+    }
+
     static get animation_ids() {
         let res = [];
         this.CACHE_ITEMS.forEach(c => {

src/renderer/scripts/editor/autoCompletions.js

@@ -74,11 +74,7 @@ let LIB = {
                 return JsonCacheUtils.events.map(e => "@s " + e);
             },
             animation_references() {
-                try {
-                    return Object.keys(TabSystem.getSelected().content.get("minecraft:entity/description/animations").toJSON());
-                } catch(e) {
-                    return [];
-                }
+                return JsonCacheUtils.animation_references;
             }
         },
         animation_controller: {

src/renderer/scripts/editor/problems/components/NeedsThreeIfBoth.js

@@ -9,7 +9,8 @@ export default class NeedsThreeIfBoth extends CommonProblem {
         if(Array.isArray(first)) this.first = first;
         else this.first = [first];
         this.second = second;
-        this.third = third;
+        if(Array.isArray(third)) this.third = third;
+        else this.third = [third];
 
         this.first_found = false;
         this.second_found = false;
@@ -19,7 +20,7 @@ export default class NeedsThreeIfBoth extends CommonProblem {
     peek(node) {
         if(this.first.includes(node.key)) this.first_found = true;
         else if(node.key === this.second) this.second_found = true;
-        else if(node.key === this.third) this.third_found = true;
+        else if(this.third.includes(node.key)) this.third_found = true;
         else return false;
         return true;
     }
@@ -33,7 +34,7 @@ export default class NeedsThreeIfBoth extends CommonProblem {
         if(!this.found()) return super.report();
 
         let old = this.error_message;
-        this.error_message = this.error_message.replace(/\$failure_name/g, this.third);
+        this.error_message = this.error_message.replace(/\$failure_name/g, this.third.join(" or "));
         let res = super.report();   
         this.error_message = old;
 

static/auto_completions/animation/general.json

@@ -1,6 +1,6 @@
 {
     "events": "$dynamic.entity.@events",
     "queries": [
-        "query.all_animations_finished", "query.anim_time", "query.any_animation_finished", "query.armor_color_slot", "query.armor_material_slot", "query.armor_texture_slot", "query.blocking", "query.can_climb", "query.can_fly", "query.can_power_jump", "query.can_swim", "query.can_walk", "query.current_squish_value", "query.delta_time", "query.frame_alpha", "query.ground_speed", "query.has_armor_slot", "query.has_collision", "query.has_gravity", "query.has_rider", "query.has_target", "query.head_x_rotation", "query.head_y_rotation", "query.invulnerable_ticks", "query.is_angry", "query.is_baby", "query.is_breathing", "query.is_bribed", "query.is_carrying_block", "query.is_casting", "query.is_charged", "query.is_charging", "query.is_chested", "query.is_critical", "query.is_dancing", "query.is_eating", "query.is_elder", "query.is_enchanted", "query.is_fire_immune", "query.is_gliding", "query.is_grazing", "query.is_idling", "query.is_ignited", "query.is_in_love", "query.is_in_water", "query.is_in_water_or_rain", "query.is_interested", "query.is_invisible", "query.is_jumping", "query.is_laying_down", "query.is_laying_egg", "query.is_leashed", "query.is_lingering", "query.is_moving", "query.is_on_ground", "query.is_onfire", "query.is_orphaned", "query.is_powered", "query.is_pregnant", "query.is_resting", "query.is_riding", "query.is_rolling", "query.is_saddled", "query.is_scared", "query.is_shaking", "query.is_sheared", "query.is_shield_powered", "query.is_silent", "query.is_sitting", "query.is_sleeping", "query.is_sneaking", "query.is_sneezing", "query.is_sprinting", "query.is_standing", "query.is_swimming", "query.is_tamed", "query.is_transforming", "query.is_using_item", "query.is_wall_climbing", "query.key_frame_lerp_time", "query.lie_amount", "query.life_time", "query.mark_variant", "query.max_trade_tier", "query.model_scale", "query.modified_distance_moved", "query.modified_move_speed", "query.previous_squish_value", "query.roll_counter", "query.sit_amount", "query.sneeze_counter", "query.spellcolor.b", "query.spellcolor.g", "query.spellcolor.r", "query.standing_scale", "query.swell_amount", "query.swelling_dir", "query.target_x_rotation", "query.target_y_rotation", "query.time_stamp", "query.trade_tier", "query.unhappy_counter", "query.variant", "query.wing_flap_position", "query.wing_flap_speed", "query.yaw_speed"
+        "(0.0)", "(1.0)", "query.all_animations_finished", "query.anim_time", "query.any_animation_finished", "query.armor_color_slot", "query.armor_material_slot", "query.armor_texture_slot", "query.blocking", "query.can_climb", "query.can_fly", "query.can_power_jump", "query.can_swim", "query.can_walk", "query.current_squish_value", "query.delta_time", "query.frame_alpha", "query.ground_speed", "query.has_armor_slot", "query.has_collision", "query.has_gravity", "query.has_rider", "query.has_target", "query.head_x_rotation", "query.head_y_rotation", "query.invulnerable_ticks", "query.is_angry", "query.is_baby", "query.is_breathing", "query.is_bribed", "query.is_carrying_block", "query.is_casting", "query.is_charged", "query.is_charging", "query.is_chested", "query.is_critical", "query.is_dancing", "query.is_eating", "query.is_elder", "query.is_enchanted", "query.is_fire_immune", "query.is_gliding", "query.is_grazing", "query.is_idling", "query.is_ignited", "query.is_in_love", "query.is_in_water", "query.is_in_water_or_rain", "query.is_interested", "query.is_invisible", "query.is_jumping", "query.is_laying_down", "query.is_laying_egg", "query.is_leashed", "query.is_lingering", "query.is_moving", "query.is_on_ground", "query.is_onfire", "query.is_orphaned", "query.is_powered", "query.is_pregnant", "query.is_resting", "query.is_riding", "query.is_rolling", "query.is_saddled", "query.is_scared", "query.is_shaking", "query.is_sheared", "query.is_shield_powered", "query.is_silent", "query.is_sitting", "query.is_sleeping", "query.is_sneaking", "query.is_sneezing", "query.is_sprinting", "query.is_standing", "query.is_swimming", "query.is_tamed", "query.is_transforming", "query.is_using_item", "query.is_wall_climbing", "query.key_frame_lerp_time", "query.lie_amount", "query.life_time", "query.mark_variant", "query.max_trade_tier", "query.model_scale", "query.modified_distance_moved", "query.modified_move_speed", "query.previous_squish_value", "query.roll_counter", "query.sit_amount", "query.sneeze_counter", "query.spellcolor.b", "query.spellcolor.g", "query.spellcolor.r", "query.standing_scale", "query.swell_amount", "query.swelling_dir", "query.target_x_rotation", "query.target_y_rotation", "query.time_stamp", "query.trade_tier", "query.unhappy_counter", "query.variant", "query.wing_flap_position", "query.wing_flap_speed", "query.yaw_speed"
     ]
 }

static/auto_completions/animation/main.json

@@ -6,7 +6,7 @@
             "loop": "$general.boolean",
             "timeline": {
                 "$placeholder": {
-                    "$dynamic.list.next_index": "$animation.general.main"
+                    "$dynamic.list.next_index": "$animation.general.events"
                 }
             }
         }

static/auto_completions/animation_controller/main.json

@@ -6,9 +6,7 @@
                 "default": {
                     "animations": {
                         "$dynamic.list.next_index": {
-                            "$placeholder": {
-                                "$dynamic.list.next_index": {}
-                            }
+                            "$dynamic.entity.animation_references": "$animation.general.queries"
                         }
                     },
                     "transitions": {

static/auto_completions/entity/v1_11.json

@@ -30,6 +30,10 @@
         "poi_type": "$general.poi_type",
         "duration": "$general.number"
     },
+    "minecraft:behavior.mingle": {
+        "mingle_partner_type": "$general.entity_identifier",
+        "mingle_distance": "$general.number"
+    },
     "minecraft.behavior.move_to_poi": {
         "priority": "$general.number",
         "speed_multiplier": "$general.decimal",
@@ -82,7 +86,8 @@
         "update_interval_variant": "$general.number",
         "can_find_poi": "$general.boolean",
         "can_migrate": "$general.boolean",
-        "first_founding_reward": "$general.number"
+        "first_founding_reward": "$general.number",
+        "preferred_profession": ["weaponsmith"]
     },
     "minecraft:economy_trade_table": {
         "display_name": {},

static/data/problems.json

@@ -123,6 +123,27 @@
             }
         },
 
+        {
+            "bridge:needs_both": {
+                "first": "minecraft:can_power_jump",
+                "second": "minecraft:horse.jump_strength",
+                "error_message": "$failure_name missing"
+            }
+        },
+        {
+            "bridge:needs_three_if_both": {
+                "first": "minecraft:can_power_jump",
+                "second": "minecraft:horse.jump_strength",
+                "third": [ "minecraft:jump.dynamic", "minecraft:jump.static" ],
+                "error_message": "$failure_name missing",
+                "fix": {
+                    "type": "script",
+                    "run": "self.parent.buildFromObject({ 'minecraft:jump.static': {} }, undefined, true); Unsaved();",
+                    "display_text": "Insert minecraft:jump.static"
+                }
+            }
+        },
+
         {
             "bridge:format_version_check": {
                 "error_message": "\"format_version\" is required",