From 5cda3707463a441f08b1deb27e349375d4a8e5a7 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Thu, 11 Jun 2020 01:37:30 +0200
Subject: [PATCH] Fix advancements (or try to) and fix translations

---
 .../assets/appliedenergistics2/lang/cs_cz.json    |  6 +++---
 .../assets/appliedenergistics2/lang/de_de.json    |  6 +++---
 .../assets/appliedenergistics2/lang/en_us.json    |  6 +++---
 .../assets/appliedenergistics2/lang/fr_fr.json    |  6 +++---
 .../assets/appliedenergistics2/lang/hu_hu.json    |  6 +++---
 .../assets/appliedenergistics2/lang/it_it.json    |  6 +++---
 .../assets/appliedenergistics2/lang/ko_kr.json    |  6 +++---
 .../assets/appliedenergistics2/lang/pt_br.json    |  6 +++---
 .../assets/appliedenergistics2/lang/ru_ru.json    |  6 +++---
 .../assets/appliedenergistics2/lang/zh_cn.json    |  6 +++---
 .../assets/appliedenergistics2/lang/zh_tw.json    |  6 +++---
 .../advancements/main/charged_quartz.json         |  6 ++----
 .../advancements/main/crafting_terminal.json      |  3 +--
 .../advancements/main/facade.json                 |  2 +-
 .../advancements/main/fluix.json                  |  6 ++----
 .../main/{cable_glass.json => glass_cable.json}   |  3 +--
 .../advancements/main/interface.json              |  2 +-
 .../advancements/main/network1.json               |  5 ++---
 .../advancements/main/network2.json               |  3 +--
 .../advancements/main/network3.json               |  3 +--
 .../advancements/main/p2p.json                    |  5 ++---
 .../advancements/main/pattern_terminal.json       |  3 +--
 .../advancements/main/presses.json                | 15 +++++----------
 .../advancements/main/root.json                   |  6 ++----
 .../advancements/main/storage_bus.json            |  3 +--
 25 files changed, 56 insertions(+), 75 deletions(-)
 rename src/main/resources/data/appliedenergistics2/advancements/main/{cable_glass.json => glass_cable.json} (88%)

diff --git a/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json b/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json
index 0965156cb..6ed167941 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json
@@ -564,9 +564,9 @@
   "item.appliedenergistics2.yellow_smart_dense_cable": "Žlutá ME silný kabel",
   "itemGroup.appliedenergistics2": "Applied Energistics 2",
   "itemGroup.appliedenergistics2.facades": "Applied Energistics 2 - Fasády",
-  "stat.ae2.ItemsExtracted": "Předměty odebrány z ME úložiště",
-  "stat.ae2.ItemsInserted": "Předměty přidány do ME úložiště",
-  "stat.ae2.TurnedCranks": "Otočené kliky",
+  "stat.appliedenergistics2.items_extracted": "Předměty odebrány z ME úložiště",
+  "stat.appliedenergistics2.items_inserted": "Předměty přidány do ME úložiště",
+  "stat.appliedenergistics2.turned_cranks": "Otočené kliky",
   "waila.appliedenergistics2.Channels": "%1$d of %2$d Kanály",
   "waila.appliedenergistics2.Contains": "Obsahuje",
   "waila.appliedenergistics2.DeviceMissingChannel": "Zařízení postrádá kanál",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/de_de.json b/src/main/resources/assets/appliedenergistics2/lang/de_de.json
index c08de1c03..4a59e3e30 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/de_de.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/de_de.json
@@ -602,9 +602,9 @@
   "item.appliedenergistics2.yellow_smart_dense_cable": "Gelb Dichtes ME-Kabel",
   "itemGroup.appliedenergistics2": "Applied Energistics 2",
   "itemGroup.appliedenergistics2.facades": "Applied Energistics 2 - Fassaden",
-  "stat.ae2.ItemsExtracted": "Items aus ME Speicher entfernt",
-  "stat.ae2.ItemsInserted": "Items zu ME Speicher hinzugefügt",
-  "stat.ae2.TurnedCranks": "Runden gekurbelt",
+  "stat.appliedenergistics2.items_extracted": "Items aus ME Speicher entfernt",
+  "stat.appliedenergistics2.items_inserted": "Items zu ME Speicher hinzugefügt",
+  "stat.appliedenergistics2.turned_cranks": "Runden gekurbelt",
   "waila.appliedenergistics2.Channels": "%1$d von %2$d Kanälen",
   "waila.appliedenergistics2.Contains": "Enthält",
   "waila.appliedenergistics2.Crafting": "Fertigung",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.json b/src/main/resources/assets/appliedenergistics2/lang/en_us.json
index d5122ddf9..6801af3f8 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/en_us.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.json
@@ -674,9 +674,9 @@
   "itemGroup.appliedenergistics2.facades": "Applied Energistics 2 - Facades",
   "key.appliedenergistics2.category": "Applied Energistics 2",
   "key.toggle_focus.desc": "Toggle search box focus",
-  "stat.ae2.ItemsExtracted": "Items extracted from ME Storage",
-  "stat.ae2.ItemsInserted": "Items added to ME Storage",
-  "stat.ae2.TurnedCranks": "Turned Cranks",
+  "stat.appliedenergistics2.items_extracted": "Items extracted from ME Storage",
+  "stat.appliedenergistics2.items_inserted": "Items added to ME Storage",
+  "stat.appliedenergistics2.turned_cranks": "Turned Cranks",
   "theoneprobe.appliedenergistics2.channels": "%1$d of %2$d Channels",
   "theoneprobe.appliedenergistics2.contains": "Contains",
   "theoneprobe.appliedenergistics2.crafting": "Crafting: %1$s",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json b/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json
index 13ac13d21..b041f5653 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json
@@ -599,9 +599,9 @@
   "item.appliedenergistics2.yellow_smart_dense_cable": "Jaune Câble dense ME",
   "itemGroup.appliedenergistics2": "Applied Energistics 2",
   "itemGroup.appliedenergistics2.facades": "Façades Applied Energistics 2",
-  "stat.ae2.ItemsExtracted": "Eléments extraits des disques ME",
-  "stat.ae2.ItemsInserted": "Eléments ajoutés aux disques ME",
-  "stat.ae2.TurnedCranks": "Tours de manivelle",
+  "stat.appliedenergistics2.items_extracted": "Eléments extraits des disques ME",
+  "stat.appliedenergistics2.items_inserted": "Eléments ajoutés aux disques ME",
+  "stat.appliedenergistics2.turned_cranks": "Tours de manivelle",
   "waila.appliedenergistics2.Channels": "%1$d of %2$d Canaux",
   "waila.appliedenergistics2.Contains": "Contient",
   "waila.appliedenergistics2.Crafting": "Fabrication",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/hu_hu.json b/src/main/resources/assets/appliedenergistics2/lang/hu_hu.json
index a6ae62ae7..99be99141 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/hu_hu.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/hu_hu.json
@@ -510,9 +510,9 @@
   "item.appliedenergistics2.ToolWirelessTerminal": "Vezetéknélküli Terminál",
   "itemGroup.appliedenergistics2": "Applied Energistics 2",
   "itemGroup.appliedenergistics2.facades": "Applied Energistics 2 - Látszatok",
-  "stat.ae2.ItemsExtracted": "Tárgyak eltávolítva ME tárolókból",
-  "stat.ae2.ItemsInserted": "Tárgyak hozzáadva ME tárolókhoz",
-  "stat.ae2.TurnedCranks": "Kurblik forgatva",
+  "stat.appliedenergistics2.items_extracted": "Tárgyak eltávolítva ME tárolókból",
+  "stat.appliedenergistics2.items_inserted": "Tárgyak hozzáadva ME tárolókhoz",
+  "stat.appliedenergistics2.turned_cranks": "Kurblik forgatva",
   "waila.appliedenergistics2.Channels": "%2$d Csatornából %1$d használatban",
   "waila.appliedenergistics2.Contains": "Energiaszint",
   "waila.appliedenergistics2.Crafting": "Barkácsol",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/it_it.json b/src/main/resources/assets/appliedenergistics2/lang/it_it.json
index 6fa7042d9..fcf904429 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/it_it.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/it_it.json
@@ -583,9 +583,9 @@
   "item.appliedenergistics2.yellow_smart_dense_cable": "Giallo Cavo denso ME",
   "itemGroup.appliedenergistics2": "Applied Energistics 2",
   "itemGroup.appliedenergistics2.facades": "Applied Energistics 2 - Facciate",
-  "stat.ae2.ItemsExtracted": "Oggetti estratti dal Deposito ME",
-  "stat.ae2.ItemsInserted": "Oggetti aggiunti al Deposito ME",
-  "stat.ae2.TurnedCranks": "Manovelle girate",
+  "stat.appliedenergistics2.items_extracted": "Oggetti estratti dal Deposito ME",
+  "stat.appliedenergistics2.items_inserted": "Oggetti aggiunti al Deposito ME",
+  "stat.appliedenergistics2.turned_cranks": "Manovelle girate",
   "waila.appliedenergistics2.Channels": "Canali %1$d di %2$d",
   "waila.appliedenergistics2.Contains": "Contiene",
   "waila.appliedenergistics2.Crafting": "Fabbricazione",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json b/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json
index 939402390..024bfaa21 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json
@@ -643,9 +643,9 @@
   "itemGroup.appliedenergistics2.facades": "응용 에너지학(덮개)",
   "key.appliedenergistics2.category": "응용 에너지학",
   "key.toggle_focus.desc": "상자를 집중적으로 토글하면서 검색하세요.",
-  "stat.ae2.ItemsExtracted": "아이템이 ME 저장고로부터 추출되었습니다.",
-  "stat.ae2.ItemsInserted": "아이템이 ME 저장고에 추가되었습니다.",
-  "stat.ae2.TurnedCranks": "전환된 크랭크",
+  "stat.appliedenergistics2.items_extracted": "아이템이 ME 저장고로부터 추출되었습니다.",
+  "stat.appliedenergistics2.items_inserted": "아이템이 ME 저장고에 추가되었습니다.",
+  "stat.appliedenergistics2.turned_cranks": "전환된 크랭크",
   "theoneprobe.appliedenergistics2.channels": "%1$d의 %2$d 채널",
   "theoneprobe.appliedenergistics2.contains": "포함",
   "theoneprobe.appliedenergistics2.crafting": "조합: %1$s",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/pt_br.json b/src/main/resources/assets/appliedenergistics2/lang/pt_br.json
index 84c9b1c98..9bbd46507 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/pt_br.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/pt_br.json
@@ -648,9 +648,9 @@
   "itemGroup.appliedenergistics2.facades": "Applied Energistics 2 - Fachadas",
   "key.appliedenergistics2.category": "Applied Energistics 2",
   "key.toggle_focus.desc": "Alterar foco da caixa de procura",
-  "stat.ae2.ItemsExtracted": "Itens extraídos do Armazenamento ME",
-  "stat.ae2.ItemsInserted": "Itens adicionados ao Armazenamento ME",
-  "stat.ae2.TurnedCranks": "Manivelas Giradas",
+  "stat.appliedenergistics2.items_extracted": "Itens extraídos do Armazenamento ME",
+  "stat.appliedenergistics2.items_inserted": "Itens adicionados ao Armazenamento ME",
+  "stat.appliedenergistics2.turned_cranks": "Manivelas Giradas",
   "waila.appliedenergistics2.Channels": "%1$d de %2$d Canais",
   "waila.appliedenergistics2.Contains": "Contém",
   "waila.appliedenergistics2.Crafting": "Fabricando",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json
index cdd268b1f..d856dc3c1 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json
@@ -633,9 +633,9 @@
   "item.appliedenergistics2.yellow_smart_dense_cable": "Жёлтый МЭ плотный умный кабель",
   "itemGroup.appliedenergistics2": "Applied Energistics 2",
   "itemGroup.appliedenergistics2.facades": "Applied Energistics 2: Фасады",
-  "stat.ae2.ItemsExtracted": "Предметов извлечено из МЭ хранилища",
-  "stat.ae2.ItemsInserted": "Предметов добавлено в МЭ хранилище",
-  "stat.ae2.TurnedCranks": "Сломано рукояток",
+  "stat.appliedenergistics2.items_extracted": "Предметов извлечено из МЭ хранилища",
+  "stat.appliedenergistics2.items_inserted": "Предметов добавлено в МЭ хранилище",
+  "stat.appliedenergistics2.turned_cranks": "Сломано рукояток",
   "theoneprobe.appliedenergistics2.channels": "Каналы: %1$d из %2$d",
   "theoneprobe.appliedenergistics2.contains": "Содержит",
   "theoneprobe.appliedenergistics2.crafting": "Создается: %1$s",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json
index 594baf7f1..dea8211f1 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json
@@ -665,9 +665,9 @@
   "itemGroup.appliedenergistics2.facades": "应用能源2-伪装板",
   "key.appliedenergistics2.category": "Applied Energistics 2",
   "key.toggle_focus.desc": "打开/关闭搜索框聚焦",
-  "stat.ae2.ItemsExtracted": "物品已取出ME存储",
-  "stat.ae2.ItemsInserted": "物品已加入ME存储",
-  "stat.ae2.TurnedCranks": "转动曲柄",
+  "stat.appliedenergistics2.items_extracted": "物品已取出ME存储",
+  "stat.appliedenergistics2.items_inserted": "物品已加入ME存储",
+  "stat.appliedenergistics2.turned_cranks": "转动曲柄",
   "theoneprobe.appliedenergistics2.channels": "%1$d / %2$d 频道",
   "theoneprobe.appliedenergistics2.contains": "容纳",
   "theoneprobe.appliedenergistics2.crafting": "合成中: %1$s",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json b/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json
index c0448f620..4a871c278 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json
@@ -633,9 +633,9 @@
   "item.appliedenergistics2.yellow_smart_dense_cable": "黃色 ME緻密智能線纜",
   "itemGroup.appliedenergistics2": "應用能源2",
   "itemGroup.appliedenergistics2.facades": "應用能源2-偽裝板",
-  "stat.ae2.ItemsExtracted": "從ME存儲中提取的物品",
-  "stat.ae2.ItemsInserted": "添加到ME存儲的物品",
-  "stat.ae2.TurnedCranks": "轉動曲柄",
+  "stat.appliedenergistics2.items_extracted": "從ME存儲中提取的物品",
+  "stat.appliedenergistics2.items_inserted": "添加到ME存儲的物品",
+  "stat.appliedenergistics2.turned_cranks": "轉動曲柄",
   "theoneprobe.appliedenergistics2.channels": "%1$d/%2$d頻道",
   "theoneprobe.appliedenergistics2.contains": "容納",
   "theoneprobe.appliedenergistics2.crafting": "合成中：%1$s",
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json b/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json
index 2bee88611..879061635 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:material",
-      "data": 1
+      "item": "appliedenergistics2:charged_certus_quartz_crystal"
     },
     "title": {
       "translate": "achievement.ae2.ChargedQuartz"
@@ -18,8 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:material",
-            "data": 1
+            "item": "appliedenergistics2:charged_certus_quartz_crystal"
           }
         ]
       }
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json
index 207b61830..686547fae 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 360
+      "item": "appliedenergistics2:crafting_terminal"
     },
     "title": {
       "translate": "achievement.ae2.CraftingTerminal"
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/facade.json b/src/main/resources/data/appliedenergistics2/advancements/main/facade.json
index 9476c6158..96e625c9f 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/facade.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/facade.json
@@ -10,7 +10,7 @@
       "translate": "achievement.ae2.Facade.desc"
     }
   },
-  "parent": "appliedenergistics2:main/cable_glass",
+  "parent": "appliedenergistics2:main/glass_cable",
   "criteria": {
     "facade": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json b/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json
index 37e60dd4b..b6e02cdc5 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:material",
-      "data": 7
+      "item": "appliedenergistics2:fluix_crystal"
     },
     "title": {
       "translate": "achievement.ae2.Fluix"
@@ -18,8 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:material",
-            "data": 7
+            "item": "appliedenergistics2:fluix_crystal"
           }
         ]
       }
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json b/src/main/resources/data/appliedenergistics2/advancements/main/glass_cable.json
similarity index 88%
rename from src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json
rename to src/main/resources/data/appliedenergistics2/advancements/main/glass_cable.json
index a185853c1..da8bd9ccf 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/glass_cable.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 16
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "title": {
       "translate": "achievement.ae2.GlassCable"
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/interface.json b/src/main/resources/data/appliedenergistics2/advancements/main/interface.json
index f2adc8aa4..a267e3623 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/interface.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/interface.json
@@ -10,7 +10,7 @@
       "translate": "achievement.ae2.Recursive.desc"
     }
   },
-  "parent": "appliedenergistics2:main/cable_glass",
+  "parent": "appliedenergistics2:main/glass_cable",
   "criteria": {
     "certus": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/network1.json b/src/main/resources/data/appliedenergistics2/advancements/main/network1.json
index 4ab0eeab4..6c4fe13b0 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/network1.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/network1.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 36
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "title": {
       "translate": "achievement.ae2.Networking1"
@@ -11,7 +10,7 @@
       "translate": "achievement.ae2.Networking1.desc"
     }
   },
-  "parent": "appliedenergistics2:main/cable_glass",
+  "parent": "appliedenergistics2:main/glass_cable",
   "criteria": {
     "cable": {
       "trigger": "appliedenergistics2:network_apprentice"
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/network2.json b/src/main/resources/data/appliedenergistics2/advancements/main/network2.json
index 4fc871073..0ac5564ca 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/network2.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/network2.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 56
+      "item": "appliedenergistics2:fluix_smart_cable"
     },
     "title": {
       "translate": "achievement.ae2.Networking2"
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/network3.json b/src/main/resources/data/appliedenergistics2/advancements/main/network3.json
index 748eed459..62c9721b8 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/network3.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/network3.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 76
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "title": {
       "translate": "achievement.ae2.Networking3"
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json b/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json
index 4b3f60e07..55df1d070 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 460
+      "item": "appliedenergistics2:me_p2p_tunnel"
     },
     "title": {
       "translate": "achievement.ae2.P2P"
@@ -11,7 +10,7 @@
       "translate": "achievement.ae2.P2P.desc"
     }
   },
-  "parent": "appliedenergistics2:main/cable_glass",
+  "parent": "appliedenergistics2:main/glass_cable",
   "criteria": {
     "certus": {
       "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json b/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json
index 255458804..159f5adee 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 340
+      "item": "appliedenergistics2:pattern_terminal"
     },
     "title": {
       "translate": "achievement.ae2.PatternTerminal"
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/presses.json b/src/main/resources/data/appliedenergistics2/advancements/main/presses.json
index fe8e8e6e9..a0c6bec51 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/presses.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/presses.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:material",
-      "data": 15
+      "item": "appliedenergistics2:logic_processor_press"
     },
     "title": {
       "translate": "achievement.ae2.Presses"
@@ -18,8 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:material",
-            "data": 13
+            "item": "appliedenergistics2:calculation_processor_press"
           }
         ]
       }
@@ -29,8 +27,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:material",
-            "data": 14
+            "item": "appliedenergistics2:engineering_processor_press"
           }
         ]
       }
@@ -40,8 +37,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:material",
-            "data": 15
+            "item": "appliedenergistics2:logic_processor_press"
           }
         ]
       }
@@ -51,8 +47,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:material",
-            "data": 19
+            "item": "appliedenergistics2:silicon_press"
           }
         ]
       }
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/root.json b/src/main/resources/data/appliedenergistics2/advancements/main/root.json
index 5e50d2bb8..dfe366e89 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/root.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/root.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:material",
-      "data": 0
+      "item": "appliedenergistics2:certus_quartz_crystal"
     },
     "title": {
       "translate": "achievement.ae2.Root"
@@ -20,8 +19,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:material",
-            "data": 0
+            "item": "appliedenergistics2:certus_quartz_crystal"
           }
         ]
       }
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json b/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json
index e64fcf15e..b114ce407 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json
@@ -1,8 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:part",
-      "data": 220
+      "item": "appliedenergistics2:storage_bus"
     },
     "title": {
       "translate": "achievement.ae2.StorageBus"