From bc99438d704ead1fcb6d3cc0c892a4b21482a97d Mon Sep 17 00:00:00 2001
From: Misode <Misoloo64@gmail.com>
Date: Tue, 15 Oct 2019 20:35:17 +0200
Subject: [PATCH] Fix namespaced this + fix slots -> slot

---
 locales/en.json    |  2 +-
 locales/ru.json    |  2 +-
 locales/zh-CN.json |  2 +-
 schemas/1.13.json  |  4 ++--
 schemas/1.14.json  | 22 +++++++++++-----------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index 8895e6bd..9b188d64 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -173,7 +173,7 @@
 			"multiply_base": "Multiply Base",
 			"multiply_total": "Multiply Total"
 		},
-		"slots": "Slots"
+		"slot": "Slots"
 	},
 	"$slot": {
 		"mainhand": "Mainhand",
diff --git a/locales/ru.json b/locales/ru.json
index 8999af85..9493f4fb 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -165,7 +165,7 @@
 			"multiply_base": "Умножение базового",
 			"multiply_total": "Умножение общего"
 		},
-		"slots": "Ячейки",
+		"slot": "Ячейки",
 		"$slot": {
 			"mainhand": "Ведущая рука",
 			"offhand": "Вторая рука",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 9699652f..623b7f01 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -170,7 +170,7 @@
 			"multiply_base": "乘以数额",
 			"multiply_total": "乘以（数额 + 1）"
 		},
-		"slots": "栏位",
+		"slot": "栏位",
 		"$slot": {
 			"mainhand": "主手",
 			"offhand": "副手",
diff --git a/schemas/1.13.json b/schemas/1.13.json
index e5aaf88c..9b2e13ff 100644
--- a/schemas/1.13.json
+++ b/schemas/1.13.json
@@ -338,9 +338,9 @@
           ]
         },
         {
-          "id": "slots",
+          "id": "slot",
           "type": "set",
-          "translate": "$attribute_modifier.slots",
+          "translate": "$attribute_modifier.slot",
           "translateValue": "$attribute_modifier.$slot",
           "values": [
             "mainhand",
diff --git a/schemas/1.14.json b/schemas/1.14.json
index b35b1e23..5fd8d800 100644
--- a/schemas/1.14.json
+++ b/schemas/1.14.json
@@ -311,11 +311,11 @@
           "type": "enum",
           "translate": "$function.entity",
           "translateValue": "$source",
-          "default": "minecraft:this",
+          "default": "this",
           "values": [
-            "minecraft:this",
-            "minecraft:killer",
-            "minecraft:killer_player"
+            "this",
+            "killer",
+            "killer_player"
           ],
           "require": [
             "minecraft:set_name",
@@ -328,12 +328,12 @@
           "type": "enum",
           "translate": "$function.source",
           "translateValue": "$source",
-          "default": "minecraft:this",
+          "default": "this",
           "values": [
-            "minecraft:block_entity",
-            "minecraft:this",
-            "minecraft:killer",
-            "minecraft:killer_player"
+            "block_entity",
+            "this",
+            "killer",
+            "killer_player"
           ],
           "require": [
             "minecraft:copy_name",
@@ -714,9 +714,9 @@
           ]
         },
         {
-          "id": "slots",
+          "id": "slot",
           "type": "set",
-          "translate": "$attribute_modifier.slots",
+          "translate": "$attribute_modifier.slot",
           "translateValue": "$slot",
           "values": [
             "mainhand",