From 9203f3f169439d459c50c1ad06ad19d09ee1b949 Mon Sep 17 00:00:00 2001 From: Misode Date: Sun, 17 May 2020 00:01:10 +0200 Subject: [PATCH] Add 20w20a triggers and add player field --- locales/en.json | 5 +++++ schemas/1.16.json | 25 +++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/locales/en.json b/locales/en.json index cc8e0492..56a27e15 100644 --- a/locales/en.json +++ b/locales/en.json @@ -116,6 +116,8 @@ "criteria.location": "Location", "criteria.recipe": "Recipe", "criteria.entity": "Entity", + "criteria.loot_table": "Loot Table", + "criteria.player": "Player", "criteria_add": "Add Criterion", "criteria_remove": "Remove Criterion", "damage.blocked": "Blocked", @@ -451,11 +453,13 @@ "trigger.impossible": "Impossible", "trigger.inventory_changed": "Inventory Changed", "trigger.item_durability_changed": "Item Durability Changed", + "trigger.item_used_on_block": "Item Used On Block", "trigger.killed_by_crossbow": "Killed By Crossbow", "trigger.levitation": "Levitation", "trigger.location": "Location", "trigger.nether_travel": "Nether Travel", "trigger.placed_block": "Placed Block", + "trigger.player_generates_container_loot": "Player Generates Container Loot", "trigger.player_hurt_entity": "Player Hurt Entity", "trigger.player_killed_entity": "Player Killed Entity", "trigger.recipe_unlocked": "Recipe Unlocked", @@ -466,6 +470,7 @@ "trigger.summoned_entity": "Summoned Entity", "trigger.tame_animal": "Tame Animal", "trigger.tick": "Tick", + "trigger.thrown_item_picked_up_by_entity": "Thrown Item Picked Up By Entity", "trigger.used_ender_eye": "Used Ender Eye", "trigger.used_totem": "Used Totem", "trigger.villager_trade": "Villager Trade", diff --git a/schemas/1.16.json b/schemas/1.16.json index 90ae1d61..48e59ea6 100644 --- a/schemas/1.16.json +++ b/schemas/1.16.json @@ -1651,21 +1651,23 @@ "minecraft:impossible", "minecraft:inventory_changed", "minecraft:item_durability_changed", + "minecraft:item_used_on_block", "minecraft:killed_by_crossbow", "minecraft:levitation", "minecraft:location", "minecraft:nether_travel", "minecraft:placed_block", + "minecraft:player_generates_container_loot", "minecraft:player_hurt_entity", "minecraft:player_killed_entity", "minecraft:recipe_unlocked", - "minecraft:safely_harvest_honey", "minecraft:shot_crossbow", "minecraft:slept_in_bed", "minecraft:slide_down_block", "minecraft:summoned_entity", "minecraft:tame_animal", "minecraft:tick", + "minecraft:thrown_item_picked_up_by_entity", "minecraft:used_ender_eye", "minecraft:used_totem", "minecraft:villager_trade", @@ -1678,6 +1680,13 @@ "type": "object", "card": false, "fields": [ + { + "id": "player", + "translate": "criteria.player", + "type": "object", + "collapse": true, + "value": "entity" + }, { "id": "block", "translate": "criteria.block", @@ -1950,8 +1959,10 @@ "minecraft:filled_bucket", "minecraft:fishing_rod_hooked", "minecraft:item_durability_changed", + "minecraft:item_used_on_block", "minecraft:placed_block", "minecraft:shot_crossbow", + "minecraft:thrown_item_picked_up_by_entity", "minecraft:used_totem", "minecraft:villager_trade" ] @@ -2002,6 +2013,7 @@ "collapse": true, "value": "location", "require": [ + "minecraft:item_used_on_block", "minecraft:placed_block", "minecraft:slept_in_bed" ] @@ -2014,6 +2026,14 @@ "minecraft:recipe_unlocked" ] }, + { + "id": "loot_table", + "translate": "criteria.loot_table", + "type": "string", + "require": [ + "minecraft:player_generates_container_loot" + ] + }, { "id": "entity", "translate": "criteria.entity", @@ -2022,7 +2042,8 @@ "value": "entity", "require": [ "minecraft:summoned_entity", - "minecraft:tame_animal" + "minecraft:tame_animal", + "minecraft:thrown_item_picked_up_by_entity" ] } ]