Corrected spelling of brooch

TeamMetallurgy · Jul 15, 2019 · cd17c2c · cd17c2c
1 parent 874d7d0
commit cd17c2c
Show file tree

Hide file tree

Showing 21 changed files with 79 additions and 79 deletions.
diff --git a/src/main/java/com/teammetallurgy/atum/entity/efreet/EntitySunspeaker.java b/src/main/java/com/teammetallurgy/atum/entity/efreet/EntitySunspeaker.java
@@ -231,7 +231,7 @@ public boolean processInteract(EntityPlayer player, @Nonnull EnumHand hand) {
                 double modifier = 1.0D;
                 if (type == ItemLoot.Type.NECKLACE) {
                     modifier = 2.0D;
-                } else if (type == ItemLoot.Type.BROACH) {
+                } else if (type == ItemLoot.Type.BROOCH) {
                     modifier = 2.5D;
                 } else if (type == ItemLoot.Type.SCEPTER) {
                     modifier = 3.0D;

diff --git a/src/main/java/com/teammetallurgy/atum/items/ItemLoot.java b/src/main/java/com/teammetallurgy/atum/items/ItemLoot.java
@@ -105,7 +105,7 @@ public enum Type implements IStringSerializable {
         IDOL("idol"),
         NECKLACE("necklace"),
         RING("ring"),
-        BROACH("broach"),
+        BROOCH("brooch"),
         SCEPTER("scepter");
 
         private final String unlocalizedName;

diff --git a/src/main/resources/assets/atum/advancements/core/justlikenew.json b/src/main/resources/assets/atum/advancements/core/justlikenew.json
@@ -252,62 +252,62 @@
         ]
       }
     },
-    "silver_broach": {
+    "silver_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_silver_broach"
+            "item": "atum:loot_silver_brooch"
           }
         ]
       }
     },
-    "gold_broach": {
+    "gold_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_gold_broach"
+            "item": "atum:loot_gold_brooch"
           }
         ]
       }
     },
-    "sapphire_broach": {
+    "sapphire_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_sapphire_broach"
+            "item": "atum:loot_sapphire_brooch"
           }
         ]
       }
     },
-    "emerald_broach": {
+    "emerald_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_emerald_broach"
+            "item": "atum:loot_emerald_brooch"
           }
         ]
       }
     },
-    "ruby_broach": {
+    "ruby_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_ruby_broach"
+            "item": "atum:loot_ruby_brooch"
           }
         ]
       }
     },
-    "diamond_broach": {
+    "diamond_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_diamond_broach"
+            "item": "atum:loot_diamond_brooch"
           }
         ]
       }
@@ -318,32 +318,32 @@
       "silver_ring",
       "silver_necklace",
       "silver_idol",
-      "silver_broach",
+      "silver_brooch",
       "silver_scepter",
       "gold_ring",
       "gold_necklace",
       "gold_idol",
-      "gold_broach",
+      "gold_brooch",
       "gold_scepter",
       "sapphire_ring",
       "sapphire_necklace",
       "sapphire_idol",
-      "sapphire_broach",
+      "sapphire_brooch",
       "sapphire_scepter",
       "ruby_ring",
       "ruby_necklace",
       "ruby_idol",
-      "ruby_broach",
+      "ruby_brooch",
       "ruby_scepter",
       "emerald_ring",
       "emerald_necklace",
       "emerald_idol",
-      "emerald_broach",
+      "emerald_brooch",
       "emerald_scepter",
       "diamond_ring",
       "diamond_necklace",
       "diamond_idol",
-      "diamond_broach",
+      "diamond_brooch",
       "diamond_scepter"
     ]
   ]

diff --git a/src/main/resources/assets/atum/advancements/core/powerwasher.json b/src/main/resources/assets/atum/advancements/core/powerwasher.json
@@ -255,62 +255,62 @@
         ]
       }
     },
-    "silver_broach": {
+    "silver_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_silver_broach"
+            "item": "atum:loot_silver_brooch"
           }
         ]
       }
     },
-    "gold_broach": {
+    "gold_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_gold_broach"
+            "item": "atum:loot_gold_brooch"
           }
         ]
       }
     },
-    "sapphire_broach": {
+    "sapphire_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_sapphire_broach"
+            "item": "atum:loot_sapphire_brooch"
           }
         ]
       }
     },
-    "emerald_broach": {
+    "emerald_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_emerald_broach"
+            "item": "atum:loot_emerald_brooch"
           }
         ]
       }
     },
-    "ruby_broach": {
+    "ruby_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_ruby_broach"
+            "item": "atum:loot_ruby_brooch"
           }
         ]
       }
     },
-    "diamond_broach": {
+    "diamond_brooch": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "atum:loot_diamond_broach"
+            "item": "atum:loot_diamond_brooch"
           }
         ]
       }

diff --git a/src/main/resources/assets/atum/lang/en_us.lang b/src/main/resources/assets/atum/lang/en_us.lang
@@ -676,37 +676,37 @@ tooltip.atum.usesRemaining=%d Uses Remaining
 item.atum.loot.dirty.idol.name=Dirty Idol
 item.atum.loot.dirty.necklace.name=Dirty Necklace
 item.atum.loot.dirty.ring.name=Dirty Ring
-item.atum.loot.dirty.broach.name=Dirty Broach
+item.atum.loot.dirty.brooch.name=Dirty Brooch
 item.atum.loot.dirty.scepter.name=Dirty Scepter
 item.atum.loot.silver.idol.name=Silver Idol
 item.atum.loot.silver.necklace.name=Silver Necklace
 item.atum.loot.silver.ring.name=Silver Ring
-item.atum.loot.silver.broach.name=Silver Broach
+item.atum.loot.silver.brooch.name=Silver Brooch
 item.atum.loot.silver.scepter.name=Silver Scepter
 item.atum.loot.gold.idol.name=Golden Idol
 item.atum.loot.gold.necklace.name=Gold Necklace
 item.atum.loot.gold.ring.name=Gold Ring
-item.atum.loot.gold.broach.name=Golden Broach
+item.atum.loot.gold.brooch.name=Golden Brooch
 item.atum.loot.gold.scepter.name=Golden Scepter
 item.atum.loot.sapphire.idol.name=Sapphire Idol
 item.atum.loot.sapphire.necklace.name=Sapphire Necklace
 item.atum.loot.sapphire.ring.name=Sapphire Ring
-item.atum.loot.sapphire.broach.name=Sapphire Broach
+item.atum.loot.sapphire.brooch.name=Sapphire Brooch
 item.atum.loot.sapphire.scepter.name=Sapphire Scepter
 item.atum.loot.ruby.idol.name=Ruby Idol
 item.atum.loot.ruby.necklace.name=Ruby Necklace
 item.atum.loot.ruby.ring.name=Ruby Ring
-item.atum.loot.ruby.broach.name=Ruby Broach
+item.atum.loot.ruby.brooch.name=Ruby Brooch
 item.atum.loot.ruby.scepter.name=Ruby Scepter
 item.atum.loot.emerald.idol.name=Emerald Idol
 item.atum.loot.emerald.necklace.name=Emerald Necklace
 item.atum.loot.emerald.ring.name=Emerald Ring
-item.atum.loot.emerald.broach.name=Emerald Broach
+item.atum.loot.emerald.brooch.name=Emerald Brooch
 item.atum.loot.emerald.scepter.name=Emerald Scepter
 item.atum.loot.diamond.idol.name=Diamond Idol
 item.atum.loot.diamond.necklace.name=Diamond Necklace
 item.atum.loot.diamond.ring.name=Diamond Ring
-item.atum.loot.diamond.broach.name=Diamond Broach
+item.atum.loot.diamond.brooch.name=Diamond Brooch
 item.atum.loot.diamond.scepter.name=Diamond Scepter
 
 # Entity

diff --git a/src/main/resources/assets/atum/lang/fr_fr.lang b/src/main/resources/assets/atum/lang/fr_fr.lang
@@ -676,37 +676,37 @@ tooltip.atum.usesRemaining=%d utilisations restantes
 item.atum.loot.dirty.idol.name=Idole sale
 item.atum.loot.dirty.necklace.name=Collier sale
 item.atum.loot.dirty.ring.name=Anneau sale
-item.atum.loot.dirty.broach.name=Broche sale
+item.atum.loot.dirty.brooch.name=Broche sale
 item.atum.loot.dirty.scepter.name=Sceptre sale
 item.atum.loot.silver.idol.name=Idole d'argent
 item.atum.loot.silver.necklace.name=Collier d'argent
 item.atum.loot.silver.ring.name=Anneau d'argent
-item.atum.loot.silver.broach.name=Broche d'argent
+item.atum.loot.silver.brooch.name=Broche d'argent
 item.atum.loot.silver.scepter.name=Sceptre d'argent
 item.atum.loot.gold.idol.name=Idole dorée
 item.atum.loot.gold.necklace.name=Collier doré
 item.atum.loot.gold.ring.name=Anneau doré
-item.atum.loot.gold.broach.name=Broche dorée
+item.atum.loot.gold.brooch.name=Broche dorée
 item.atum.loot.gold.scepter.name=Sceptre doré
 item.atum.loot.sapphire.idol.name=Idole de saphir
 item.atum.loot.sapphire.necklace.name=Collier de saphir
 item.atum.loot.sapphire.ring.name=Anneau de saphir
-item.atum.loot.sapphire.broach.name=Broche de saphir
+item.atum.loot.sapphire.brooch.name=Broche de saphir
 item.atum.loot.sapphire.scepter.name=Sceptre de saphir
 item.atum.loot.ruby.idol.name=Idole en rubis
 item.atum.loot.ruby.necklace.name=Collier en rubis
 item.atum.loot.ruby.ring.name=Anneau en rubis
-item.atum.loot.ruby.broach.name=Broche en rubis
+item.atum.loot.ruby.brooch.name=Broche en rubis
 item.atum.loot.ruby.scepter.name=Sceptre en rubis
 item.atum.loot.emerald.idol.name=Idole en émeraude
 item.atum.loot.emerald.necklace.name=Collier en émeraude
 item.atum.loot.emerald.ring.name=Anneau en émeraude
-item.atum.loot.emerald.broach.name=Broche en émeraude
+item.atum.loot.emerald.brooch.name=Broche en émeraude
 item.atum.loot.emerald.scepter.name=Sceptre en émeraude
 item.atum.loot.diamond.idol.name=Idole en diamant
 item.atum.loot.diamond.necklace.name=Collier en diamant
 item.atum.loot.diamond.ring.name=Anneau en diamant
-item.atum.loot.diamond.broach.name=Broche en diamant
+item.atum.loot.diamond.brooch.name=Broche en diamant
 item.atum.loot.diamond.scepter.name=Sceptre en diamant
 
 # Entity

diff --git a/src/main/resources/assets/atum/lang/ru_ru.lang b/src/main/resources/assets/atum/lang/ru_ru.lang
@@ -676,37 +676,37 @@ tooltip.atum.usesRemaining=%d использования осталось
 item.atum.loot.dirty.idol.name=Испачканный идол
 item.atum.loot.dirty.necklace.name=Испачканное ожерелье
 item.atum.loot.dirty.ring.name=Испачканное кольцо
-item.atum.loot.dirty.broach.name=Испачканная брошь
+item.atum.loot.dirty.brooch.name=Испачканная брошь
 item.atum.loot.dirty.scepter.name=Испачканный скипетр
 item.atum.loot.silver.idol.name=Серебряный идол
 item.atum.loot.silver.necklace.name=Серебряное ожерелье
 item.atum.loot.silver.ring.name=Серебряное кольцо
-item.atum.loot.silver.broach.name=Серебряная брошь
+item.atum.loot.silver.brooch.name=Серебряная брошь
 item.atum.loot.silver.scepter.name=Серебряный скипетр
 item.atum.loot.gold.idol.name=Золотой идол
 item.atum.loot.gold.necklace.name=Золотое ожерелье
 item.atum.loot.gold.ring.name=Золотое кольцо
-item.atum.loot.gold.broach.name=Золотая брошь
+item.atum.loot.gold.brooch.name=Золотая брошь
 item.atum.loot.gold.scepter.name=Золотой скипетр
 item.atum.loot.sapphire.idol.name=Сапфировый идол
 item.atum.loot.sapphire.necklace.name=Сапфировое ожерелье
 item.atum.loot.sapphire.ring.name=Сапфировое кольцо
-item.atum.loot.sapphire.broach.name=Сапфировая брошь
+item.atum.loot.sapphire.brooch.name=Сапфировая брошь
 item.atum.loot.sapphire.scepter.name=Сапфировый скипетр
 item.atum.loot.ruby.idol.name=Рубиновый идол
 item.atum.loot.ruby.necklace.name=Рубиновое ожерелье
 item.atum.loot.ruby.ring.name=Рубиновое кольцо
-item.atum.loot.ruby.broach.name=Рубиновая брошь
+item.atum.loot.ruby.brooch.name=Рубиновая брошь
 item.atum.loot.ruby.scepter.name=Рубиновый скипетр
 item.atum.loot.emerald.idol.name=Изумрудный идол
 item.atum.loot.emerald.necklace.name=Изумрудное ожерелье
 item.atum.loot.emerald.ring.name=Изумрудное кольцо
-item.atum.loot.emerald.broach.name=Изумрудная брошь
+item.atum.loot.emerald.brooch.name=Изумрудная брошь
 item.atum.loot.emerald.scepter.name=Изумрудный скипетр
 item.atum.loot.diamond.idol.name=Алмазный идол
 item.atum.loot.diamond.necklace.name=Алмазное ожерелье
 item.atum.loot.diamond.ring.name=Алмазное кольцо
-item.atum.loot.diamond.broach.name=Алмазная брошь
+item.atum.loot.diamond.brooch.name=Алмазная брошь
 item.atum.loot.diamond.scepter.name=Алмазный скипетр
 
 # Entity

diff --git a/src/main/resources/assets/atum/lang/zh_cn.lang b/src/main/resources/assets/atum/lang/zh_cn.lang
@@ -676,37 +676,37 @@ tooltip.atum.usesRemaining=剩余%d使用次数
 item.atum.loot.dirty.idol.name=肮脏的神像
 item.atum.loot.dirty.necklace.name=肮脏的项链
 item.atum.loot.dirty.ring.name=肮脏的指环
-item.atum.loot.dirty.broach.name=肮脏的胸针
+item.atum.loot.dirty.brooch.name=肮脏的胸针
 item.atum.loot.dirty.scepter.name=肮脏的权杖
 item.atum.loot.silver.idol.name=银制神像
 item.atum.loot.silver.necklace.name=银制项链
 item.atum.loot.silver.ring.name=银制指环
-item.atum.loot.silver.broach.name=银制胸针
+item.atum.loot.silver.brooch.name=银制胸针
 item.atum.loot.silver.scepter.name=银制权杖
 item.atum.loot.gold.idol.name=金制神像
 item.atum.loot.gold.necklace.name=金制项链
 item.atum.loot.gold.ring.name=金制指环
-item.atum.loot.gold.broach.name=金制胸针
+item.atum.loot.gold.brooch.name=金制胸针
 item.atum.loot.gold.scepter.name=金制权杖
 item.atum.loot.sapphire.idol.name=蓝宝石神像
 item.atum.loot.sapphire.necklace.name=蓝宝石项链
 item.atum.loot.sapphire.ring.name=蓝宝石指环
-item.atum.loot.sapphire.broach.name=蓝宝石胸针
+item.atum.loot.sapphire.brooch.name=蓝宝石胸针
 item.atum.loot.sapphire.scepter.name=蓝宝石权杖
 item.atum.loot.ruby.idol.name=红宝石神像
 item.atum.loot.ruby.necklace.name=红宝石项链
 item.atum.loot.ruby.ring.name=红宝石指环
-item.atum.loot.ruby.broach.name=红宝石胸针
+item.atum.loot.ruby.brooch.name=红宝石胸针
 item.atum.loot.ruby.scepter.name=红宝石权杖
 item.atum.loot.emerald.idol.name=绿宝石神像
 item.atum.loot.emerald.necklace.name=绿宝石项链
 item.atum.loot.emerald.ring.name=绿宝石指环
-item.atum.loot.emerald.broach.name=绿宝石胸针
+item.atum.loot.emerald.brooch.name=绿宝石胸针
 item.atum.loot.emerald.scepter.name=绿宝石权杖
 item.atum.loot.diamond.idol.name=钻石神像
 item.atum.loot.diamond.necklace.name=钻石项链
 item.atum.loot.diamond.ring.name=钻石指环
-item.atum.loot.diamond.broach.name=钻石胸针
+item.atum.loot.diamond.brooch.name=钻石胸针
 item.atum.loot.diamond.scepter.name=钻石权杖
 
 # Entity

diff --git a/src/main/resources/assets/atum/loot_tables/blocks/relic_ore.json b/src/main/resources/assets/atum/loot_tables/blocks/relic_ore.json
@@ -36,8 +36,8 @@
         },
         {
           "type": "item",
-          "name": "atum:loot_dirty_broach",
-          "entryName": "loot_dirty_broach",
+          "name": "atum:loot_dirty_brooch",
+          "entryName": "loot_dirty_brooch",
           "weight": 40
         },
         {