Small Fixes (#794)

* Small Fixes

* More fixes

7 files changed, 60 insertions, 21 deletions

diff --git a/constants/enchants.json b/constants/enchants.json
index 14a99e0e..e46b642b 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -40,7 +40,8 @@
       "smoldering",
       "ultimate_inferno",
       "ultimate_fatal_tempo",
-      "tabasco"
+      "tabasco",
+      "champion"
     ],
     "BOW": [
       "aiming",
@@ -164,7 +165,8 @@
       "ultimate_inferno",
       "ultimate_fatal_tempo",
       "ultimate_flash",
-      "tabasco"
+      "tabasco",
+      "champion"
     ],
     "SHOVEL": [
       "efficiency",
@@ -313,7 +315,8 @@
       "smoldering",
       "ultimate_inferno",
       "ultimate_fatal_tempo",
-      "tabasco"
+      "tabasco",
+      "champion"
     ],
     "GAUNTLET": [
       "bane_of_arthropods",
@@ -362,7 +365,8 @@
       "smoldering",
       "ultimate_inferno",
       "ultimate_fatal_tempo",
-      "tabasco"
+      "tabasco",
+      "champion"
     ],
     "GLOVES": [
       "cayenne"
diff --git a/items/CAYENNE;4.json b/items/CAYENNE;4.json
index a7d0b93e..1abd1d5e 100644
--- a/items/CAYENNE;4.json
+++ b/items/CAYENNE;4.json
@@ -28,7 +28,7 @@
     "A2": "ENCHANTED_IRON_BLOCK:1",
     "A3": "CHILI_PEPPER:8",
     "B1": "ENCHANTED_IRON_BLOCK:1",
-    "B2": "WOOD_SINGULARITY:4",
+    "B2": "WOOD_SINGULARITY:1",
     "B3": "ENCHANTED_IRON_BLOCK:1",
     "C1": "CHILI_PEPPER:8",
     "C2": "ENCHANTED_IRON_BLOCK:1",
diff --git a/items/CHAMPION;1.json b/items/CHAMPION;1.json
index e058dc38..ccf6c439 100644
--- a/items/CHAMPION;1.json
+++ b/items/CHAMPION;1.json
@@ -1,16 +1,23 @@
 {
   "itemid": "minecraft:enchanted_book",
   "displayname": "§fEnchanted Book",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Champion I\",1:\"§7Gain §a3% §7extra Combat XP. The\",2:\"§72nd hit on a mob grants §6+1.4\",3:\"§6coins §7\u0026 §3+7 §7exp orbs.\",4:\"§850k Combat XP to tier up!\",5:\"\",6:\"§7§7Apply Cost: §323 Exp Levels\",7:\"\",8:\"§e▲ §7Champion cannot be combined!\",9:\"§7Use this on an item in an Anvil\",10:\"§7to apply it!\",11:\"\",12:\"§f§lCOMMON\",13:\"\",14:\"§7Cost\",15:\"§b4,000 Bits\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"CHAMPION;1\",enchantments:{champion:1}}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Champion I\",1:\"§7Gain §a3% §7extra Combat XP. The\",2:\"§72nd hit on a mob grants §6+1.4\",3:\"§6coins §7\u0026 §3+7 §7exp orbs.\",4:\"\",5:\"§8Gain 50k Combat XP for Tier II\",6:\"§8Gain 100k Combat XP for Tier III\",7:\"§8Gain 250k Combat XP for Tier IV\",8:\"§8Gain 500k Combat XP for Tier V\",9:\"§8Gain 1m Combat XP for Tier VI\",10:\"§8Gain 1,5m Combat XP for Tier VII\",11:\"§8Gain 2m Combat XP for Tier VIII\",12:\"§8Gain 2,5m Combat XP for Tier IX\",13:\"§8Gain 3m Combat XP for Tier X\",14:\"\",15:\"§e▲ §7Champion cannot be combined!\",16:\"§7Use this on an item in an Anvil\",17:\"§7to apply it!\",18:\"\",19:\"§f§lCOMMON\",20:\"\",21:\"§7Cost\",22:\"§b4,000 Bits\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"CHAMPION;1\",enchantments:{champion:1}}}",
   "damage": 0,
   "lore": [
     "§9Champion I",
     "§7Gain §a3% §7extra Combat XP. The",
     "§72nd hit on a mob grants §6+1.4",
     "§6coins §7\u0026 §3+7 §7exp orbs.",
-    "§850k Combat XP to tier up!",
     "",
-    "§7§7Apply Cost: §323 Exp Levels",
+    "§8Gain 50k Combat XP for Tier II",
+    "§8Gain 100k Combat XP for Tier III",
+    "§8Gain 250k Combat XP for Tier IV",
+    "§8Gain 500k Combat XP for Tier V",
+    "§8Gain 1m Combat XP for Tier VI",
+    "§8Gain 1,5m Combat XP for Tier VII",
+    "§8Gain 2m Combat XP for Tier VIII",
+    "§8Gain 2,5m Combat XP for Tier IX",
+    "§8Gain 3m Combat XP for Tier X",
     "",
     "§e▲ §7Champion cannot be combined!",
     "§7Use this on an item in an Anvil",
diff --git a/items/DIAMOND_THE_FISH.json b/items/DIAMOND_THE_FISH.json
new file mode 100644
index 00000000..b5852319
--- /dev/null
+++ b/items/DIAMOND_THE_FISH.json
@@ -0,0 +1,16 @@
+{
+  "itemid": "minecraft:cooked_fish",
+  "displayname": "§f§f§cDiamond the Fish",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§7§7§oShines bright like a fish\",1:\"\",2:\"§c§lSPECIAL\"],Name:\"§f§f§cDiamond the Fish\"},ExtraAttributes:{id:\"DIAMOND_THE_FISH\"}}",
+  "damage": 1,
+  "lore": [
+    "§7§7§oShines bright like a fish",
+    "",
+    "§c§lSPECIAL"
+  ],
+  "internalname": "DIAMOND_THE_FISH",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.1.0-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/HECATOMB;1.json b/items/HECATOMB;1.json
index 9bb800f2..aaf7df59 100644
--- a/items/HECATOMB;1.json
+++ b/items/HECATOMB;1.json
@@ -1,16 +1,23 @@
 {
   "itemid": "minecraft:enchanted_book",
   "displayname": "§fEnchanted Book",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Hecatomb I\",1:\"§7Gain §a+0.28% §cCatacombs §7XP \u0026 §a+0.56%\",2:\"§a§3Class §7XP, doubled §7on §b§lS+ §7runs.\",3:\"§7Grants §c+2.6❤ §7per 10 §cCatacombs §7levels.\",4:\"§82 S runs to tier up!\",5:\"\",6:\"§7§7Apply Cost: §323 Exp Levels\",7:\"\",8:\"§e▲ §7Hecatomb cannot be combined!\",9:\"§7Use this on an item in an Anvil\",10:\"§7to apply it!\",11:\"\",12:\"§f§lCOMMON\",13:\"\",14:\"§7Cost\",15:\"§b6,000 Bits\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"HECATOMB;1\",enchantments:{hecatomb:1}}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Hecatomb I\",1:\"§7Gain §a+0.28% §cCatacombs §7XP \u0026 §a+0.56%\",2:\"§a§3Class §7XP, doubled §7on §b§lS+ §7runs.\",3:\"§7Grants §c+2.6❤ §7per 10 §cCatacombs §7levels.\",4:\"\",5:\"§8Complete 2 S runs for Tier II\",6:\"§8Complete 3 S runs for Tier III\",7:\"§8Complete 5 S runs for Tier IV\",8:\"§8Complete 10 S runs for Tier V\",9:\"§8Complete 10 S runs for Tier VI\",10:\"§8Complete 10 S runs for Tier VII\",11:\"§8Complete 20 S runs for Tier VIII\",12:\"§8Complete 20 S runs for Tier IX\",13:\"§8Complete 20 S runs for Tier X\",14:\"\",15:\"§e▲ §7Hecatomb cannot be combined!\",16:\"§7Use this on an item in an Anvil\",17:\"§7to apply it!\",18:\"\",19:\"§f§lCOMMON\",20:\"\",21:\"§7Cost\",22:\"§b6,000 Bits\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"HECATOMB;1\",enchantments:{hecatomb:1}}}",
   "damage": 0,
   "lore": [
     "§9Hecatomb I",
     "§7Gain §a+0.28% §cCatacombs §7XP \u0026 §a+0.56%",
     "§a§3Class §7XP, doubled §7on §b§lS+ §7runs.",
     "§7Grants §c+2.6❤ §7per 10 §cCatacombs §7levels.",
-    "§82 S runs to tier up!",
     "",
-    "§7§7Apply Cost: §323 Exp Levels",
+    "§8Complete 2 S runs for Tier II",
+    "§8Complete 3 S runs for Tier III",
+    "§8Complete 5 S runs for Tier IV",
+    "§8Complete 10 S runs for Tier V",
+    "§8Complete 10 S runs for Tier VI",
+    "§8Complete 10 S runs for Tier VII",
+    "§8Complete 20 S runs for Tier VIII",
+    "§8Complete 20 S runs for Tier IX",
+    "§8Complete 20 S runs for Tier X",
     "",
     "§e▲ §7Hecatomb cannot be combined!",
     "§7Use this on an item in an Anvil",
diff --git a/items/MUTTON.json b/items/MUTTON.json
index ceb96ffe..5cccb492 100644
--- a/items/MUTTON.json
+++ b/items/MUTTON.json
@@ -1,13 +1,16 @@
 {
   "itemid": "minecraft:mutton",
-  "displayname": "§fRaw Mutton",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fRaw Mutton\"},ExtraAttributes:{id:\"MUTTON\"}}",
+  "displayname": "§fMutton",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§8Brewing Ingredient\",1:\"§f§lCOMMON\"],Name:\"§fMutton\"},ExtraAttributes:{id:\"MUTTON\"}}",
   "damage": 0,
   "lore": [
+    "§8Brewing Ingredient",
     "§f§lCOMMON"
   ],
   "internalname": "MUTTON",
-  "modver": "1.3-REL",
+  "modver": "2.1.0-REL",
   "vanilla": true,
-  "clickcommand": ""
-}
+  "clickcommand": "",
+  "crafttext": "",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/SUGAR_CANE.json b/items/SUGAR_CANE.json
index 3bebea77..d01544fe 100644
--- a/items/SUGAR_CANE.json
+++ b/items/SUGAR_CANE.json
@@ -1,13 +1,15 @@
 {
   "itemid": "minecraft:reeds",
-  "displayname": "§fSugar Canes",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fSugar Canes\"},ExtraAttributes:{id:\"SUGAR_CANE\"}}",
+  "displayname": "§fSugar Cane",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§f§lCOMMON\"],Name:\"§fSugar Cane\"},ExtraAttributes:{id:\"SUGAR_CANE\"}}",
   "damage": 0,
   "lore": [
     "§f§lCOMMON"
   ],
   "internalname": "SUGAR_CANE",
-  "modver": "1.3-REL",
+  "modver": "2.1.0-REL",
   "vanilla": true,
-  "clickcommand": ""
-}
+  "clickcommand": "",
+  "crafttext": "",
+  "infoType": ""
+}
\ No newline at end of file