From 238983f164c0ca7ddac9be7e74f05be692e4460a Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Thu, 10 Sep 2020 00:23:44 -0400
Subject: [PATCH] Items

---
 entities/brian.json   |  6 +++---
 entities/shroud.json  | 12 ++++++------
 regions/frozen.json   | 18 ------------------
 regions/hot.json      |  6 +++---
 regions/mushroom.json |  4 ++--
 regions/swamp.json    |  2 +-
 6 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/entities/brian.json b/entities/brian.json
index dd448ba0..09ab3670 100644
--- a/entities/brian.json
+++ b/entities/brian.json
@@ -18,15 +18,15 @@
         }
     ],
     "helmet": {
-        "type": "DAMAGED_ANVIL",
+        "type": "damaged_anvil",
         "displayName": "&dCracked Mind"
     },
     "mainHand": {
-        "type": "BLAZE_ROD",
+        "type": "blaze_rod",
         "displayName": "&dStrange Wand"
     },
     "offHand": {
-        "type": "BLAZE_ROD",
+        "type": "blaze_rod",
         "displayName": "&dStrange Wand"
     }
 }
\ No newline at end of file
diff --git a/entities/shroud.json b/entities/shroud.json
index 4a3ed842..c437ad8e 100644
--- a/entities/shroud.json
+++ b/entities/shroud.json
@@ -6,7 +6,7 @@
     "removable": true,
     "mainHand": {
         "displayName": "&7Shroud's Bow",
-        "type": "BOW",
+        "type": "bow",
         "enchantments": [
             {
                 "enchantment": "ARROW_DAMAGE",
@@ -21,7 +21,7 @@
         ]
     },
     "offHand": {
-        "type": "SOUL_LANTERN",
+        "type": "soul_lantern",
         "displayName": "&7Shoud's Light"
     },
     "attributes": [
@@ -42,7 +42,7 @@
         }
     ],
     "helmet": {
-        "type": "LEATHER_HELMET",
+        "type": "leather_helmet",
         "leatherColor": "#1f2063",
         "displayName": "&7Shroud's Hood",
         "enchantments": [
@@ -55,7 +55,7 @@
         ]
     },
     "chestplate": {
-        "type": "LEATHER_CHESTPLATE",
+        "type": "leather_chestplate",
         "displayName": "&7Shroud's Robes",
         "leatherColor": "#363457",
         "enchantments": [
@@ -68,7 +68,7 @@
         ]
     },
     "leggings": {
-        "type": "LEATHER_LEGGINGS",
+        "type": "leather_leggings",
         "displayName": "&7Shroud's Leggings",
         "leatherColor": "#363042",
         "enchantments": [
@@ -81,7 +81,7 @@
         ]
     },
     "boots": {
-        "type": "LEATHER_BOOTS",
+        "type": "leather_boots",
         "leatherColor": "#2a2730",
         "displayName": "&7Shroud's Boots",
         "enchantments": [
diff --git a/regions/frozen.json b/regions/frozen.json
index 5c8cac8e..ad94bb6f 100644
--- a/regions/frozen.json
+++ b/regions/frozen.json
@@ -2,24 +2,6 @@
     "riverBiomes": [
         "frozen-river"
     ],
-    "blockDrops": [
-        {
-            "drops": [
-                {
-                    "minAmount": 1,
-                    "type": "ICE",
-                    "maxAmount": 1,
-                    "rarity": 7
-                }
-            ],
-            "blocks": [
-                {
-                    "block": "blue_stained_glass_pane"
-                }
-            ],
-            "replaceVanillaDrops": true
-        }
-    ],
     "structures": [
         {
             "tileset": "soul-temple",
diff --git a/regions/hot.json b/regions/hot.json
index f8919776..24c99399 100644
--- a/regions/hot.json
+++ b/regions/hot.json
@@ -4,16 +4,16 @@
             "drops": [
                 {
                     "minAmount": 1,
-                    "type": "ACACIA_PLANKS",
+                    "type": "acacia_planks",
                     "maxAmount": 3
                 },
                 {
-                    "type": "STRIPPED_ACACIA_LOG",
+                    "type": "stripped_acacia_log",
                     "rarity": 12
                 },
                 {
                     "minAmount": 3,
-                    "type": "STICK",
+                    "type": "stick",
                     "maxAmount": 5,
                     "rarity": 7
                 }
diff --git a/regions/mushroom.json b/regions/mushroom.json
index 5dffc350..94b12155 100644
--- a/regions/mushroom.json
+++ b/regions/mushroom.json
@@ -3,11 +3,11 @@
         {
             "drops": [
                 {
-                    "type": "RED_MUSHROOM",
+                    "type": "red_mushroom",
                     "rarity": 8
                 },
                 {
-                    "type": "BROWN_MUSHROOM",
+                    "type": "brown_mushroom",
                     "rarity": 8
                 }
             ],
diff --git a/regions/swamp.json b/regions/swamp.json
index e935d396..f95e9840 100644
--- a/regions/swamp.json
+++ b/regions/swamp.json
@@ -3,7 +3,7 @@
         {
             "drops": [
                 {
-                    "type": "SLIME_BALL",
+                    "type": "slime_ball",
                     "rarity": 24
                 }
             ],