-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[v1.1.30] Merge pull request #34 from bridge-core/dev
- Loading branch information
Showing
13 changed files
with
482 additions
and
305 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| { | ||
| "trailingComma": "es5", | ||
| "useTabs": true, | ||
| "tabWidth": 4, | ||
| "semi": false, | ||
| "singleQuote": true, | ||
| "printWidth": 80 | ||
| } | ||
| "trailingComma": "es5", | ||
| "useTabs": true, | ||
| "tabWidth": 4, | ||
| "semi": false, | ||
| "singleQuote": true, | ||
| "printWidth": 80 | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,139 +1,121 @@ | ||
| { | ||
| "@meta": { "validate": "entity/filterStructure.js" }, | ||
|
|
||
| "all_of": { | ||
| "$dynamic.list.next_index": "$entity.filters" | ||
| }, | ||
| "any_of": { | ||
| "$dynamic.list.next_index": "$entity.filters" | ||
| }, | ||
| "none_of": { | ||
| "$dynamic.list.next_index": "$entity.filters" | ||
| }, | ||
| "$versioned_template": [ | ||
| { | ||
| "$if": "$format_version >= 1.16.0", | ||
| "$data": { | ||
| "test": "$entity.general.filters and $entity.general.filters_beta" | ||
| } | ||
| }, | ||
| { | ||
| "$data": { | ||
| "test": "$entity.general.filters" | ||
| } | ||
| } | ||
| ], | ||
| "subject": "$entity.general.filter_targets", | ||
| "operator": "$entity.general.filter_operators", | ||
| "$dynamic_template.domain": { | ||
| "$key": "$dynamic.siblings.test", | ||
| "has_equipment": "$general.has_equipment_slot", | ||
| "is_game_rule": "$general.gamerule" | ||
| }, | ||
| "$dynamic_template.value": { | ||
| "$key": "$dynamic.siblings.test", | ||
| "$fallback": { | ||
| "@meta": { | ||
| "is_value": true | ||
| } | ||
| }, | ||
| "$default": { | ||
| "@meta": { | ||
| "is_value": true | ||
| } | ||
| }, | ||
| "is_daytime": "$general.boolean", | ||
| "is_game_rule": "$general.boolean", | ||
| "is_underwater": "$general.boolean", | ||
| "in_nether": "$general.boolean", | ||
| "in_water": "$general.boolean", | ||
| "in_water_or_rain": "$general.boolean", | ||
| "is_humid": "$general.boolean", | ||
| "in_lava": "$general.boolean", | ||
| "in_clouds": "$general.boolean", | ||
| "in_caravan": "$general.boolean", | ||
| "is_underground": "$general.boolean", | ||
| "is_in_village": "$general.boolean", | ||
| "on_ground": "$general.boolean", | ||
| "on_ladder": "$general.boolean", | ||
| "is_climbing": "$general.boolean", | ||
| "is_sneaking": "$general.boolean", | ||
| "is_moving": "$general.boolean", | ||
| "is_riding": "$general.boolean", | ||
| "is_owner": "$general.boolean", | ||
| "is_target": "$general.boolean", | ||
| "is_leashed_to": "$general.boolean", | ||
| "is_leashed": "$general.boolean", | ||
| "is_immobile": "$general.boolean", | ||
| "is_avoiding_mobs": "$general.boolean", | ||
| "is_visible": "$general.boolean", | ||
| "is_snow_covered": "$general.boolean", | ||
| "is_persistent": "$general.boolean", | ||
| "has_trade_supply": "$general.boolean", | ||
| "trusts": "$general.boolean", | ||
| "has_container_open": "$general.boolean", | ||
| "has_ranged_weapon": "$general.boolean", | ||
| "has_target": "$general.boolean", | ||
| "surface_mob": "$general.boolean", | ||
| "has_equipment": "$general.item_identifier and $general.block_identifier", | ||
| "has_component": "('minecraft:effect.' + $general.effect_name) and asValue($entity.general.components)", | ||
| "has_ability": "$general.ability", | ||
| "is_family": "$entity.general.family", | ||
| "has_mob_effect": "$general.effect_name", | ||
| "has_biome_tag": "$general.biome_tag and $dynamic.cache.biome.tags", | ||
| "has_damage": "$general.damage_type", | ||
| "is_color": "$general.color_palette", | ||
| "is_biome": "$general.biome_name", | ||
| "is_block": "$general.block_identifier", | ||
| "is_difficulty": "$general.game_difficulty", | ||
| "is_temperature_type": [ | ||
| "ocean", | ||
| "cold", | ||
| "mild", | ||
| "warm" | ||
| ], | ||
| "moon_phase": [ | ||
| 0, | ||
| 1, | ||
| 2, | ||
| 3, | ||
| 4, | ||
| 5, | ||
| 6, | ||
| 7 | ||
| ], | ||
| "weather": [ | ||
| "clear", | ||
| "rain", | ||
| "thunderstorm", | ||
| "precipitation" | ||
| ], | ||
| "weather_at_position": [ | ||
| "clear", | ||
| "rain", | ||
| "thunderstorm", | ||
| "precipitation" | ||
| ], | ||
| "hourly_clock_time": "$general.hourly_clock_time", | ||
| "clock_time": "$general.decimal", | ||
| "moon_intensity": "$general.decimal", | ||
| "distance_to_nearest_player": "$general.number", | ||
| "is_mark_variant": "$general.number", | ||
| "is_variant": "$general.number", | ||
| "is_skin_id": "$general.number", | ||
| "is_altitude": "$general.number", | ||
| "is_brightness": "$general.decimal", | ||
| "is_temperature_value": "$general.decimal", | ||
| "rider_count": "$general.number", | ||
| "inactivity_timer": "$general.number", | ||
| "random_chance": "$general.number", | ||
| "light_level": "$general.number0_15", | ||
| "is_sleeping": "$general.boolean", | ||
| "has_tag": { | ||
| "@meta": { | ||
| "is_value": true | ||
| }, | ||
| "@import.value.tag": "$dynamic.cache.function.tags" | ||
| } | ||
| } | ||
| } | ||
| "@meta": { "validate": "entity/filterStructure.js" }, | ||
|
|
||
| "all_of": { | ||
| "$dynamic.list.next_index": "$entity.filters" | ||
| }, | ||
| "any_of": { | ||
| "$dynamic.list.next_index": "$entity.filters" | ||
| }, | ||
| "none_of": { | ||
| "$dynamic.list.next_index": "$entity.filters" | ||
| }, | ||
| "$versioned_template": [ | ||
| { | ||
| "$if": "$format_version >= 1.17.0", | ||
| "$data": { | ||
| "test": "$entity.general.filters and $entity.general.filters_beta" | ||
| } | ||
| }, | ||
| { | ||
| "$data": { | ||
| "test": "$entity.general.filters" | ||
| } | ||
| } | ||
| ], | ||
| "subject": "$entity.general.filter_targets", | ||
| "operator": "$entity.general.filter_operators", | ||
| "$dynamic_template.domain": { | ||
| "$key": "$dynamic.siblings.test", | ||
| "has_equipment": "$general.has_equipment_slot", | ||
| "is_game_rule": "$general.gamerule" | ||
| }, | ||
| "$dynamic_template.value": { | ||
| "$key": "$dynamic.siblings.test", | ||
| "$fallback": { | ||
| "@meta": { | ||
| "is_value": true | ||
| } | ||
| }, | ||
| "$default": { | ||
| "@meta": { | ||
| "is_value": true | ||
| } | ||
| }, | ||
| "is_daytime": "$general.boolean", | ||
| "is_game_rule": "$general.boolean", | ||
| "is_underwater": "$general.boolean", | ||
| "in_nether": "$general.boolean", | ||
| "in_water": "$general.boolean", | ||
| "in_water_or_rain": "$general.boolean", | ||
| "is_humid": "$general.boolean", | ||
| "in_lava": "$general.boolean", | ||
| "in_clouds": "$general.boolean", | ||
| "in_caravan": "$general.boolean", | ||
| "is_underground": "$general.boolean", | ||
| "is_in_village": "$general.boolean", | ||
| "on_ground": "$general.boolean", | ||
| "on_ladder": "$general.boolean", | ||
| "is_climbing": "$general.boolean", | ||
| "is_sneaking": "$general.boolean", | ||
| "is_moving": "$general.boolean", | ||
| "is_riding": "$general.boolean", | ||
| "is_owner": "$general.boolean", | ||
| "is_target": "$general.boolean", | ||
| "is_leashed_to": "$general.boolean", | ||
| "is_leashed": "$general.boolean", | ||
| "is_immobile": "$general.boolean", | ||
| "is_avoiding_mobs": "$general.boolean", | ||
| "is_visible": "$general.boolean", | ||
| "is_snow_covered": "$general.boolean", | ||
| "is_persistent": "$general.boolean", | ||
| "has_trade_supply": "$general.boolean", | ||
| "trusts": "$general.boolean", | ||
| "has_container_open": "$general.boolean", | ||
| "has_ranged_weapon": "$general.boolean", | ||
| "has_target": "$general.boolean", | ||
| "surface_mob": "$general.boolean", | ||
| "has_equipment": "$general.item_identifier and $general.block_identifier", | ||
| "has_component": "('minecraft:effect.' + $general.effect_name) and asValue($entity.general.components)", | ||
| "has_ability": "$general.ability", | ||
| "is_family": "$entity.general.family", | ||
| "has_mob_effect": "$general.effect_name", | ||
| "has_biome_tag": "$general.biome_tag and $dynamic.cache.biome.tags", | ||
| "has_damage": "$general.damage_type", | ||
| "is_color": "$general.color_palette", | ||
| "is_biome": "$general.biome_name", | ||
| "is_block": "$general.block_identifier", | ||
| "is_difficulty": "$general.game_difficulty", | ||
| "is_temperature_type": ["ocean", "cold", "mild", "warm"], | ||
| "moon_phase": [0, 1, 2, 3, 4, 5, 6, 7], | ||
| "weather": ["clear", "rain", "thunderstorm", "precipitation"], | ||
| "weather_at_position": [ | ||
| "clear", | ||
| "rain", | ||
| "thunderstorm", | ||
| "precipitation" | ||
| ], | ||
| "hourly_clock_time": "$general.hourly_clock_time", | ||
| "clock_time": "$general.decimal", | ||
| "moon_intensity": "$general.decimal", | ||
| "distance_to_nearest_player": "$general.number", | ||
| "is_mark_variant": "$general.number", | ||
| "is_variant": "$general.number", | ||
| "is_skin_id": "$general.number", | ||
| "is_altitude": "$general.number", | ||
| "is_brightness": "$general.decimal", | ||
| "is_temperature_value": "$general.decimal", | ||
| "rider_count": "$general.number", | ||
| "inactivity_timer": "$general.number", | ||
| "random_chance": "$general.number", | ||
| "light_level": "$general.number0_15", | ||
| "is_sleeping": "$general.boolean", | ||
| "has_tag": { | ||
| "@meta": { | ||
| "is_value": true | ||
| }, | ||
| "@import.value.tag": "$dynamic.cache.function.tags" | ||
| }, | ||
| "in_contact_with_water": "$general.boolean" | ||
| } | ||
| } |
Oops, something went wrong.