From faeeb5bf34194e564485e1624f558074ba320a96 Mon Sep 17 00:00:00 2001 From: Misode Date: Sat, 5 Oct 2019 17:37:02 +0200 Subject: [PATCH] Add entity equipment object --- locales/en.json | 19 +++++++-------- schemas/1.14.json | 59 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 10 deletions(-) diff --git a/locales/en.json b/locales/en.json index d39f8d55..8895e6bd 100644 --- a/locales/en.json +++ b/locales/en.json @@ -173,15 +173,15 @@ "multiply_base": "Multiply Base", "multiply_total": "Multiply Total" }, - "slots": "Slots", - "$slot": { - "mainhand": "Mainhand", - "offhand": "Offhand", - "head": "Head", - "chest": "Chest", - "legs": "Legs", - "feet": "Feet" - } + "slots": "Slots" + }, + "$slot": { + "mainhand": "Mainhand", + "offhand": "Offhand", + "head": "Head", + "chest": "Chest", + "legs": "Legs", + "feet": "Feet" }, "$attribute": { "generic_maxHealth": "Max Health", @@ -249,6 +249,7 @@ "isSprinting": "Sprinting", "isSwimming": "Swimming", "isBaby": "Baby", + "equipment": "Equipment", "status_effect": "Effects", "status_effect_add": "Add Effect", "status_effect_remove": "Remove Effect" diff --git a/schemas/1.14.json b/schemas/1.14.json index 8a388ea6..6c05a73b 100644 --- a/schemas/1.14.json +++ b/schemas/1.14.json @@ -705,7 +705,7 @@ "id": "slots", "type": "set", "translate": "$attribute_modifier.slots", - "translateValue": "$attribute_modifier.$slot", + "translateValue": "$slot", "values": [ "mainhand", "offhand", @@ -814,6 +814,63 @@ } ] }, + { + "id": "equipment", + "type": "object", + "translate": "$entity.equipment", + "color": "dark", + "collapse": true, + "fields": [ + { + "id": "mainhand", + "type": "object", + "translate": "$slot.mainhand", + "color": "dark", + "collapse": true, + "value": "item" + }, + { + "id": "offhand", + "type": "object", + "translate": "$slot.offhand", + "color": "dark", + "collapse": true, + "value": "item" + }, + { + "id": "head", + "type": "object", + "translate": "$slot.head", + "color": "dark", + "collapse": true, + "value": "item" + }, + { + "id": "chest", + "type": "object", + "translate": "$slot.chest", + "color": "dark", + "collapse": true, + "value": "item" + }, + { + "id": "legs", + "type": "object", + "translate": "$slot.legs", + "color": "dark", + "collapse": true, + "value": "item" + }, + { + "id": "feet", + "type": "object", + "translate": "$slot.feet", + "color": "dark", + "collapse": true, + "value": "item" + } + ] + }, { "id": "effects", "type": "map",