Merge pull request #296 from TomEngMaster/master

Diamond armor rarity fix

5 files changed, 46 insertions, 24 deletions

diff --git a/items/DIAMOND_AXE.json b/items/DIAMOND_AXE.json
index b93dd2f2..e30cf501 100644
--- a/items/DIAMOND_AXE.json
+++ b/items/DIAMOND_AXE.json
@@ -1,15 +1,20 @@
 {
   "itemid": "minecraft:diamond_axe",
-  "displayname": "§fDiamond Axe",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fDiamond Axe\"},ExtraAttributes:{id:\"DIAMOND_AXE\"}}",
+  "displayname": "§aDiamond Axe",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+30\",1:\"\",2:\"§7§8This item can be reforged!\",3:\"§a§lUNCOMMON AXE\"],Name:\"§aDiamond Axe\"},ExtraAttributes:{originTag:\"CRAFTING_GRID_COLLECT\",id:\"DIAMOND_AXE\",uuid:\"e6e44f89-8e17-4a46-913c-2a336be1b3e0\",timestamp:\"10/28/20 10:29 AM\"}}",
   "damage": 0,
   "lore": [
-    "§f§lCOMMON"
+    "§7Damage: §c+30",
+    "",
+    "§7§8This item can be reforged!",
+    "§a§lUNCOMMON AXE"
   ],
   "internalname": "DIAMOND_AXE",
-  "modver": "1.3-REL",
   "vanilla": true,
+  "crafttext": "",
   "clickcommand": "viewrecipe",
+  "modver": "1.4-REL",
+  "infoType": "",
   "recipe": {
     "A1": "DIAMOND:1",
     "A2": "DIAMOND:1",
diff --git a/items/DIAMOND_HOE.json b/items/DIAMOND_HOE.json
index 71d12188..5a83c0d4 100644
--- a/items/DIAMOND_HOE.json
+++ b/items/DIAMOND_HOE.json
@@ -1,16 +1,19 @@
 {
   "itemid": "minecraft:diamond_hoe",
-  "displayname": "§fDiamond Hoe",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fDiamond Hoe\"},ExtraAttributes:{id:\"DIAMOND_HOE\"}}",
+  "displayname": "§aDiamond Hoe",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7§8This item can be reforged!\",1:\"§a§lUNCOMMON HOE\"],Name:\"§aDiamond Hoe\"},ExtraAttributes:{id:\"DIAMOND_HOE\"}}",
   "damage": 0,
   "lore": [
-    "§f§lCOMMON"
+    "§7§8This item can be reforged!",
+    "§a§lUNCOMMON HOE"
   ],
   "internalname": "DIAMOND_HOE",
-  "modver": "1.3-REL",
   "vanilla": true,
+  "crafttext": "",
   "clickcommand": "viewrecipe",
-  "recipe": {
+  "modver": "1.4-REL",
+  "infoType": "",
+   "recipe": {
     "A1": "DIAMOND:1",
     "A2": "DIAMOND:1",
     "A3": "",
diff --git a/items/DIAMOND_PICKAXE.json b/items/DIAMOND_PICKAXE.json
index 1727a701..39e5adc0 100644
--- a/items/DIAMOND_PICKAXE.json
+++ b/items/DIAMOND_PICKAXE.json
@@ -1,16 +1,21 @@
 {
   "itemid": "minecraft:diamond_pickaxe",
-  "displayname": "§fDiamond Pickaxe",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fDiamond Pickaxe\"},ExtraAttributes:{id:\"DIAMOND_PICKAXE\"}}",
+  "displayname": "§aDiamond Pickaxe",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+30\",1:\"\",2:\"§7§8This item can be reforged!\",3:\"§a§lUNCOMMON PICKAXE\"],Name:\"§aDiamond Pickaxe\"},ExtraAttributes:{originTag:\"CRAFTING_GRID_COLLECT\",id:\"DIAMOND_PICKAXE\",uuid:\"14ba3509-8a1c-4aba-a43d-e7dde87c74de\",timestamp:\"10/28/20 10:29 AM\"}}",
   "damage": 0,
   "lore": [
-    "§f§lCOMMON"
+    "§7Damage: §c+30",
+    "",
+    "§7§8This item can be reforged!",
+    "§a§lUNCOMMON PICKAXE"
   ],
   "internalname": "DIAMOND_PICKAXE",
-  "modver": "1.3-REL",
   "vanilla": true,
+  "crafttext": "",
   "clickcommand": "viewrecipe",
-  "recipe": {
+  "modver": "1.4-REL",
+  "infoType": "",
+   "recipe": {
     "A1": "DIAMOND:1",
     "A2": "DIAMOND:1",
     "A3": "DIAMOND:1",
diff --git a/items/DIAMOND_SPADE.json b/items/DIAMOND_SPADE.json
index feca572c..b267e43d 100644
--- a/items/DIAMOND_SPADE.json
+++ b/items/DIAMOND_SPADE.json
@@ -1,16 +1,20 @@
 {
   "itemid": "minecraft:diamond_shovel",
-  "displayname": "§fDiamond Shovel",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fDiamond Shovel\"},ExtraAttributes:{id:\"DIAMOND_SPADE\"}}",
+  "displayname": "§aDiamond Shovel",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+30\",1:\"\",2:\"§a§lUNCOMMON SHOVEL\"],Name:\"§aDiamond Shovel\"},ExtraAttributes:{originTag:\"QUICK_CRAFTING\",id:\"DIAMOND_SPADE\",uuid:\"3d691cfd-1e59-4fa0-8de2-20e72f00be56\",timestamp:\"10/28/20 10:39 AM\"}}",
   "damage": 0,
   "lore": [
-    "§f§lCOMMON"
+    "§7Damage: §c+30",
+    "",
+    "§a§lUNCOMMON SHOVEL"
   ],
   "internalname": "DIAMOND_SPADE",
-  "modver": "1.3-REL",
   "vanilla": true,
+  "crafttext": "",
   "clickcommand": "viewrecipe",
-  "recipe": {
+  "modver": "1.4-REL",
+  "infoType": "",
+   "recipe": {
     "A1": "DIAMOND:1",
     "A2": "",
     "A3": "",
diff --git a/items/DIAMOND_SWORD.json b/items/DIAMOND_SWORD.json
index 864b4c79..c07b2154 100644
--- a/items/DIAMOND_SWORD.json
+++ b/items/DIAMOND_SWORD.json
@@ -1,16 +1,21 @@
 {
   "itemid": "minecraft:diamond_sword",
-  "displayname": "§fDiamond Sword",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fDiamond Sword\"},ExtraAttributes:{id:\"DIAMOND_SWORD\"}}",
+  "displayname": "§aDiamond Sword",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+35\",1:\"\",2:\"§7§8This item can be reforged!\",3:\"§a§lUNCOMMON SWORD\"],Name:\"§aDiamond Sword\"},ExtraAttributes:{originTag:\"CRAFTING_GRID_COLLECT\",id:\"DIAMOND_SWORD\",uuid:\"0f44920f-6ad3-4c5f-8be8-c46c15af6fb5\",timestamp:\"10/28/20 10:29 AM\"}}",
   "damage": 0,
   "lore": [
-    "§f§lCOMMON"
+    "§7Damage: §c+35",
+    "",
+    "§7§8This item can be reforged!",
+    "§a§lUNCOMMON SWORD"
   ],
   "internalname": "DIAMOND_SWORD",
-  "modver": "1.3-REL",
   "vanilla": true,
+  "crafttext": "",
   "clickcommand": "viewrecipe",
-  "recipe": {
+  "modver": "1.4-REL",
+  "infoType": "",
+   "recipe": {
     "A1": "DIAMOND:1",
     "A2": "",
     "A3": "",