From 42a97956bba8d1b38f85829eb63f607f84df4d0a Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Wed, 27 Jan 2021 01:39:00 +0100 Subject: [PATCH] Processing 1.16.200 entities --- .../components/types/base_priority.json | 9 +++ .../types/base_speed_multiplier.json | 9 +++ .../1.13.0/filters/types/base_priority.json | 9 +++ .../filters/types/base_speed_multiplier.json | 9 +++ .../1.16.0/components/minecraft.home.json | 11 ++++ .../minecraft.behavior.explore_outskirts.json | 50 +++++++++++++++ ...minecraft.behavior.harvest_farm_block.json | 19 ++++-- .../minecraft.behavior.trade_interest.json | 14 ++-- .../minecraft.economy_trade_table.json | 64 ++++++++++++++++--- 9 files changed, 173 insertions(+), 21 deletions(-) create mode 100644 behaviour/entities/1.13.0/components/types/base_priority.json create mode 100644 behaviour/entities/1.13.0/components/types/base_speed_multiplier.json create mode 100644 behaviour/entities/1.13.0/filters/types/base_priority.json create mode 100644 behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json diff --git a/behaviour/entities/1.13.0/components/types/base_priority.json b/behaviour/entities/1.13.0/components/types/base_priority.json new file mode 100644 index 00000000..2f78a934 --- /dev/null +++ b/behaviour/entities/1.13.0/components/types/base_priority.json @@ -0,0 +1,9 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "blockception.minecraft.behaviour.entities.1.13.0.base_priority", + "additionalProperties": false, + "type": "integer", + "title": "Priority", + "minimum": 0, + "description": "Allows the mob to drink potions based on specified environment conditions." +} diff --git a/behaviour/entities/1.13.0/components/types/base_speed_multiplier.json b/behaviour/entities/1.13.0/components/types/base_speed_multiplier.json new file mode 100644 index 00000000..d91ebdf3 --- /dev/null +++ b/behaviour/entities/1.13.0/components/types/base_speed_multiplier.json @@ -0,0 +1,9 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "blockception.minecraft.behaviour.entities.1.13.0.speed_multiplier", + "additionalProperties": false, + "default": 1.0, + "description": "Movement speed multiplier of the mob when using this AI Goal.", + "type": "number", + "title": "Speed multiplier" +} diff --git a/behaviour/entities/1.13.0/filters/types/base_priority.json b/behaviour/entities/1.13.0/filters/types/base_priority.json new file mode 100644 index 00000000..2f78a934 --- /dev/null +++ b/behaviour/entities/1.13.0/filters/types/base_priority.json @@ -0,0 +1,9 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "blockception.minecraft.behaviour.entities.1.13.0.base_priority", + "additionalProperties": false, + "type": "integer", + "title": "Priority", + "minimum": 0, + "description": "Allows the mob to drink potions based on specified environment conditions." +} diff --git a/behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json b/behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json new file mode 100644 index 00000000..d91ebdf3 --- /dev/null +++ b/behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json @@ -0,0 +1,9 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "blockception.minecraft.behaviour.entities.1.13.0.speed_multiplier", + "additionalProperties": false, + "default": 1.0, + "description": "Movement speed multiplier of the mob when using this AI Goal.", + "type": "number", + "title": "Speed multiplier" +} diff --git a/behaviour/entities/1.16.0/components/minecraft.home.json b/behaviour/entities/1.16.0/components/minecraft.home.json index c8364ee6..288b8609 100644 --- a/behaviour/entities/1.16.0/components/minecraft.home.json +++ b/behaviour/entities/1.16.0/components/minecraft.home.json @@ -11,6 +11,17 @@ "description": "The radius that the entity will be restricted to in relation to its home", "type": "integer", "default": -1 + }, + "home_block_list": { + "title": "Home block list", + "description": "Optional block list that the home position will be associated with. If any of the blocks no longer exist at that position, the home restriction is removed. Example syntax: minecraft:sand. Not supported: minecraft:sand:1", + "type": "array", + "items": { + "title": "Home block", + "description": "Optional block that the home position will be associated with. If any of the blocks no longer exist at that position, the home restriction is removed. Example syntax: minecraft:sand. Not supported: minecraft:sand:1", + "type": "string", + "$ref": "../../../../general/item/identifier.json" + } } } } diff --git a/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json b/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json index e0aaa107..d3bd7ed2 100644 --- a/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json +++ b/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json @@ -20,6 +20,56 @@ "default": 0, "description": "The time the mob will stand around 'searching' for POIs", "title": "Wait time" + }, + "next_xz": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "integer" + }, + "next_y": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "integer" + }, + "min_wait_time": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" + }, + "max_wait_time": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" + }, + "max_travel_time": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" + }, + "min_perimeter": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" + }, + "min_dist_from_target": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" + }, + "timer_ratio": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" + }, + "dist_from_boundary": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "array", + "items": [ + { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" }, + { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" }, + { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" } + ] } } } diff --git a/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json b/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json index 2cb8348b..18f287c1 100644 --- a/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json +++ b/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json @@ -7,11 +7,22 @@ "additionalProperties": false, "required": [], "properties": { - "priority": { - "$ref": "types/base_priority.json" + "priority": { "$ref": "types/base_priority.json" }, + "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" }, + "max_seconds_before_search": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" }, - "speed_multiplier": { - "$ref": "types/base_speed_multiplier.json" + "search_cooldown_max_seconds": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" + }, + "seconds_until_new_task": { + "title": "UNDOCUMENTATED", + "description": "UNDOCUMENATED", + "type": "number" } } } diff --git a/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json b/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json index 5248a49b..05e5a296 100644 --- a/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json +++ b/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json @@ -1,9 +1,9 @@ { "$schema": "http://json-schema.org/draft-07/schema", - "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.swim_idle", + "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.trade_interest", "description": "Allows the mob to look at a player that is holding a tradable item.", "type": "object", - "title": "Swim idle 1.8.0", + "title": "Trade interest 1.8.0", "additionalProperties": false, "required": [], "properties": { @@ -12,31 +12,31 @@ "type": "number", "default": 2, "description": "The max time in seconds that the trader will hold an item before attempting to switch for a different item that takes the same trade", - "title": "TODO title" + "title": "Carried item switch time" }, "cooldown": { "type": "number", "default": 2, "description": "The time in seconds before the trader can use this goal again", - "title": "TODO title" + "title": "Cooldown" }, "interest_time": { "type": "number", "default": 45, "description": "The max time in seconds that the trader will be interested with showing it's trade items", - "title": "TODO title" + "title": "Interest_time" }, "remove_item_time": { "type": "number", "default": 1, "description": "The max time in seconds that the trader will wait when you no longer have items to trade", - "title": "TODO title" + "title": "Remove item time" }, "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks this mob can be interested by a player holding an item they like", - "title": "TODO title" + "title": "Within radius" } } } diff --git a/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json b/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json index d3c71af3..f1dcbe33 100644 --- a/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json +++ b/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json @@ -4,44 +4,88 @@ "type": "object", "title": "Economy trade table 1.8.0", "additionalProperties": false, - "description": "Allows the entity to power jump like the horse does in vanilla.", + "description": "Defines this entity's ability to trade with players.", "required": [], "properties": { "convert_trades_economy": { "type": "boolean", "default": false, "description": "Determines when the mob transforms, if the trades should be converted when the new mob has a economy_trade_table. When the trades are converted, the mob will generate a new trade list with their new trade table, but then it will try to convert any of the same trades over to have the same enchantments and user data. For example, if the original has a Emerald to Enchanted Iron Sword (Sharpness 1), and the new trade also has an Emerald for Enchanted Iron Sword, then the enchantment will be Sharpness 1.", - "title": "Convert Trades Economy" + "title": "convert trades economy" + }, + "cured_discount": { + "type": "array", + "default": [-5, -20], + "description": "How much should the discount be modified by when the player has cured the Zombie Villager. Can be specified as a pair of numbers (low-tier trade discount and high-tier trade discount)", + "title": "cured discount", + "items": [ + { "type": "integer", "title": "A", "description": "" }, + { "type": "integer", "title": "B", "description": "" } + ] }, "display_name": { "type": "string", - "default": 0, + "default": "", "description": "Name to be displayed while trading with this entity", - "title": "Display Name" + "title": "display name" }, "hero_demand_discount": { "type": "integer", "default": -4, - "description": "How much should Demand be modified by when the player has the Hero of the Village mob effect", - "title": "Hero Demand Discount" + "description": "Used in legacy prices to determine how much should Demand be modified by when the player has the Hero of the Village mob effect", + "title": "hero demand discount" + }, + "max_cured_discount": { + "type": "array", + "default": [-25, -63], + "description": "The max the discount can be modified by when the player has cured the Zombie Villager. Can be specified as a pair of numbers (low-tier trade discount and high-tier trade discount)", + "title": "max cured discount", + "items": [ + { "type": "integer", "title": "A", "description": "" }, + { "type": "integer", "title": "B", "description": "" } + ] + }, + "max_nearby_cured_discount": { + "type": "integer", + "default": -200, + "description": "The max the discount can be modified by when the player has cured a nearby Zombie Villager", + "title": "max nearby cured discount" + }, + "nearby_cured_discount": { + "type": "integer", + "default": -25, + "description": "How much should the discount be modified by when the player has cured a nearby Zombie Villager", + "title": "nearby cured discount" }, "new_screen": { "type": "boolean", "default": false, "description": "Used to determine if trading with entity opens the new trade screen", - "title": "New Screen" + "title": "new screen" }, "persist_trades": { "type": "boolean", "default": false, "description": "Determines if the trades should persist when the mob transforms. This makes it so that the next time the mob is transformed to something with a trade_table or economy_trade_table, then it keeps their trades.", - "title": "Persist Trades" + "title": "persist trades" + }, + "show_trade_screen": { + "type": "boolean", + "default": true, + "description": "Show an in game trade screen when interacting with the mob.", + "title": "show trade screen" }, "table": { "type": "string", - "default": 0, + "default": "", "description": "File path relative to the resource pack root for this entity's trades", - "title": "Table" + "title": "table" + }, + "use_legacy_price_formula": { + "type": "boolean", + "default": false, + "description": "Determines whether the legacy formula is used to determines the trade prices.", + "title": "use legacy price formula" } } }