Updated configs

src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java

@@ -136,7 +136,7 @@ public class TreasureConfig extends ConfigLoader {
              */
             Material material;
 
-            if (materialName.contains("INK_SACK")) {
+            if (materialName.contains("INK_SAC")) {
                 material = Material.INK_SAC;
             } else if (materialName.contains("COAL")) {
                 material = Material.COAL;
@@ -234,7 +234,7 @@ public class TreasureConfig extends ConfigLoader {
                     }
                     item.setItemMeta(itemMeta);
                 }
-            } else if (materialName.contains("INK_SACK")) {
+            } else if (materialName.contains("INK_SAC")) {
                 String color = materialName.substring(9);
 
                 try {

src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java

@@ -21,7 +21,7 @@ public enum MaterialType {
                 return Material.LEATHER;
 
             case WOOD:
-                return Material.OAK_PLANKS;
+                return Material.OAK_WOOD;
 
             case STONE:
                 return Material.COBBLESTONE;

src/main/java/com/gmail/nossr50/util/ItemUtils.java

@@ -681,18 +681,6 @@ public final class ItemUtils {
             case JUNGLE_LOG:
             case OAK_LOG:
             case SPRUCE_LOG:
-            case OAK_WOOD:
-            case ACACIA_WOOD:
-            case BIRCH_WOOD:
-            case DARK_OAK_WOOD:
-            case STRIPPED_ACACIA_WOOD:
-            case JUNGLE_WOOD:
-            case SPRUCE_WOOD:
-            case STRIPPED_BIRCH_WOOD:
-            case STRIPPED_DARK_OAK_WOOD:
-            case STRIPPED_JUNGLE_WOOD:
-            case STRIPPED_OAK_WOOD:
-            case STRIPPED_SPRUCE_WOOD:
             case STRIPPED_ACACIA_LOG:
             case STRIPPED_BIRCH_LOG:
             case STRIPPED_DARK_OAK_LOG:

src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -255,7 +255,7 @@ public class SkillUtils {
             return Material.COBBLESTONE;
         }
         else if (ItemUtils.isWoodTool(inHand)) {
-            return Material.OAK_PLANKS;
+            return Material.OAK_WOOD;
         }
         else if (ItemUtils.isLeatherArmor(inHand)) {
             return Material.LEATHER;

src/main/resources/config.yml

@@ -426,7 +426,7 @@ Double_Drops:
         Sugar_Cane_Block: true
         Vine: true
         Water_Lily: true
-        Yellow_Flower: true
+        Dandelion: true
     Mining:
         Coal_Ore: true
         Diamond_Ore: true

src/main/resources/experience.yml

@@ -183,7 +183,7 @@ Experience:
         Vine: 10
         Water_Lily: 100
         White_Tulip: 150
-        Yellow_Flower: 100
+        Dandelion: 100
     Mining:
         Coal_Ore: 100
         Diamond_Ore: 750

src/main/resources/itemweights.yml

@@ -29,23 +29,23 @@ Item_Weights:
 
     # Item weights for armor and tools
     Diamond_Sword: 150
-    Diamond_Spade: 150
+    Diamond_Shovel: 150
     Diamond_Pickaxe: 150
     Diamond_Axe: 150
     Diamond_Helmet: 150
     Diamond_Chestplate: 150
     Diamond_Leggings: 150
     Diamond_Boots: 150
-    Gold_Sword: 75
+    Golden_Sword: 75
-    Gold_Spade: 75
+    Golden_Shovel: 75
-    Gold_Pickaxe: 75
+    Golden_Pickaxe: 75
-    Gold_Axe: 75
+    Golden_Axe: 75
-    Gold_Helmet: 75
+    Golden_Helmet: 75
-    Gold_Chestplate: 75
+    Golden_Chestplate: 75
-    Gold_Leggings: 75
+    Golden_Leggings: 75
-    Gold_Boots: 75
+    Golden_Boots: 75
     Iron_Sword: 60
-    Iron_Spade: 60
+    Iron_Shovel: 60
     Iron_Pickaxe: 60
     Iron_Axe: 60
     Iron_Helmet: 60
@@ -58,23 +58,23 @@ Item_Weights:
 Party_Shareables:
     Misc_Items:
         - Diamond_Sword
-        - Diamond_Spade
+        - Diamond_Shovel
         - Diamond_Pickaxe
         - Diamond_Axe
-        - Gold_Sword
+        - Golden_Sword
-        - Gold_Spade
+        - Golden_Shovel
-        - Gold_Pickaxe
+        - Golden_Pickaxe
-        - Gold_Axe
+        - Golden_Axe
         - Iron_Sword
-        - Iron_Spade
+        - Iron_Shovel
         - Iron_Pickaxe
         - Iron_Axe
         - Stone_Sword
-        - Stone_Spade
+        - Stone_Shovel
         - Stone_Pickaxe
         - Stone_Axe
         - Wood_Sword
-        - Wood_Spade
+        - Wood_Shovel
         - Wood_Pickaxe
         - Wood_Axe
         - Bow
@@ -82,10 +82,10 @@ Party_Shareables:
         - Diamond_Chestplate
         - Diamond_Leggings
         - Diamond_Boots
-        - Gold_Helmet
+        - Golden_Helmet
-        - Gold_Chestplate
+        - Golden_Chestplate
-        - Gold_Leggings
+        - Golden_Leggings
-        - Gold_Boots
+        - Golden_Boots
         - Iron_Helmet
         - Iron_Chestplate
         - Iron_Leggings

src/main/resources/repair.vanilla.yml

@@ -49,7 +49,7 @@ Repairables:
     WOOD_SWORD:
         MinimumLevel: 0
         XpMultiplier: .25
-    WOOD_SPADE:
+    WOOD_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
     WOOD_PICKAXE:
@@ -68,7 +68,7 @@ Repairables:
     STONE_SWORD:
         MinimumLevel: 0
         XpMultiplier: .25
-    STONE_SPADE:
+    STONE_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
     STONE_PICKAXE:
@@ -87,7 +87,7 @@ Repairables:
     IRON_SWORD:
         MinimumLevel: 0
         XpMultiplier: .5
-    IRON_SPADE:
+    IRON_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .3
     IRON_PICKAXE:
@@ -122,32 +122,32 @@ Repairables:
     # Gold repairables
     ###
     # Tools
-    GOLD_SWORD:
+    GOLDEN_SWORD:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_SPADE:
+    GOLDEN_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: 2.6
-    GOLD_PICKAXE:
+    GOLDEN_PICKAXE:
         MinimumLevel: 0
         XpMultiplier: 8
-    GOLD_AXE:
+    GOLDEN_AXE:
         MinimumLevel: 0
         XpMultiplier: 8
-    GOLD_HOE:
+    GOLDEN_HOE:
         MinimumLevel: 0
         XpMultiplier: 4
     # Armor
-    GOLD_HELMET:
+    GOLDEN_HELMET:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_CHESTPLATE:
+    GOLDEN_CHESTPLATE:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_LEGGINGS:
+    GOLDEN_LEGGINGS:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_BOOTS:
+    GOLDEN_BOOTS:
         MinimumLevel: 0
         XpMultiplier: 4
     #
@@ -157,7 +157,7 @@ Repairables:
     DIAMOND_SWORD:
         MinimumLevel: 50
         XpMultiplier: .5
-    DIAMOND_SPADE:
+    DIAMOND_SHOVEL:
         MinimumLevel: 50
         XpMultiplier: .3
     DIAMOND_PICKAXE:
@@ -208,6 +208,6 @@ Repairables:
     BOW:
         MinimumLevel: 0
         XpMultiplier: .5
-    CARROT_STICK:
+    CARROT_ON_A_STICK:
         MinimumLevel: 0
         XpMultiplier: .5

src/main/resources/salvage.vanilla.yml

@@ -49,7 +49,7 @@ Salvageables:
     WOOD_SWORD:
         MinimumLevel: 0
         XpMultiplier: .25
-    WOOD_SPADE:
+    WOOD_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
     WOOD_PICKAXE:
@@ -68,7 +68,7 @@ Salvageables:
     STONE_SWORD:
         MinimumLevel: 0
         XpMultiplier: .25
-    STONE_SPADE:
+    STONE_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
     STONE_PICKAXE:
@@ -87,7 +87,7 @@ Salvageables:
     IRON_SWORD:
         MinimumLevel: 0
         XpMultiplier: .5
-    IRON_SPADE:
+    IRON_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .3
     IRON_PICKAXE:
@@ -122,32 +122,32 @@ Salvageables:
     # Gold salvageables
     ###
     # Tools
-    GOLD_SWORD:
+    GOLDEN_SWORD:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_SPADE:
+    GOLDEN_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: 2.6
-    GOLD_PICKAXE:
+    GOLDEN_PICKAXE:
         MinimumLevel: 0
         XpMultiplier: 8
-    GOLD_AXE:
+    GOLDEN_AXE:
         MinimumLevel: 0
         XpMultiplier: 8
-    GOLD_HOE:
+    GOLDEN_HOE:
         MinimumLevel: 0
         XpMultiplier: 4
     # Armor
-    GOLD_HELMET:
+    GOLDEN_HELMET:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_CHESTPLATE:
+    GOLDEN_CHESTPLATE:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_LEGGINGS:
+    GOLDEN_LEGGINGS:
         MinimumLevel: 0
         XpMultiplier: 4
-    GOLD_BOOTS:
+    GOLDEN_BOOTS:
         MinimumLevel: 0
         XpMultiplier: 4
     #
@@ -157,7 +157,7 @@ Salvageables:
     DIAMOND_SWORD:
         MinimumLevel: 50
         XpMultiplier: .5
-    DIAMOND_SPADE:
+    DIAMOND_SHOVEL:
         MinimumLevel: 50
         XpMultiplier: .3
     DIAMOND_PICKAXE:
@@ -208,6 +208,6 @@ Salvageables:
     BOW:
         MinimumLevel: 0
         XpMultiplier: .5
-    CARROT_STICK:
+    CARROT_ON_A_STICK:
         MinimumLevel: 0
         XpMultiplier: .5

src/main/resources/treasures.yml

@@ -19,27 +19,28 @@ Fishing:
         Amount: 1
         XP: 200
         Rarity: COMMON
-    WOOD_SWORD:
+    WOODEN_SWORD:
         Amount: 1
         XP: 200
         Rarity: COMMON
-    WOOD_SPADE:
+    WOODEN_SHOVEL:
         Amount: 1
         XP: 200
         Rarity: COMMON
-    WOOD_PICKAXE:
+    WOODEN_PICKAXE:
         Amount: 1
         XP: 200
         Rarity: COMMON
-    WOOD_AXE:
+    WOODEN_AXE:
         Amount: 1
         XP: 200
         Rarity: COMMON
-    WOOD_HOE:
+    WOODEN_HOE:
         Amount: 1
         XP: 200
         Rarity: COMMON
-    INK_SACK_BLUE:
+      //!!
+    LAPIS_LAZULI:
         Amount: 20
         XP: 200
         Rarity: COMMON
@@ -47,7 +48,7 @@ Fishing:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    STONE_SPADE:
+    STONE_SHOVEL:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
@@ -63,39 +64,39 @@ Fishing:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_SWORD:
+    GOLDEN_SWORD:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_SPADE:
+    GOLDEN_SHOVEL:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_PICKAXE:
+    GOLDEN_PICKAXE:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_AXE:
+    GOLDEN_AXE:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_HOE:
+    GOLDEN_HOE:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_BOOTS:
+    GOLDEN_BOOTS:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_HELMET:
+    GOLDEN_HELMET:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_LEGGINGS:
+    GOLDEN_LEGGINGS:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
-    GOLD_CHESTPLATE:
+    GOLDEN_CHESTPLATE:
         Amount: 1
         XP: 200
         Rarity: UNCOMMON
@@ -111,7 +112,7 @@ Fishing:
         Amount: 1
         XP: 200
         Rarity: RARE
-    IRON_SPADE:
+    IRON_SHOVEL:
         Amount: 1
         XP: 200
         Rarity: RARE
@@ -167,7 +168,7 @@ Fishing:
         Amount: 1
         XP: 200
         Rarity: LEGENDARY
-    DIAMOND_SPADE:
+    DIAMOND_SHOVEL:
         Amount: 1
         XP: 200
         Rarity: LEGENDARY
@@ -199,43 +200,47 @@ Fishing:
         Amount: 1
         XP: 200
         Rarity: LEGENDARY
-    RECORD_3:
+    MUSIC_DISC_BLOCKS:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_4:
+    MUSIC_DISC_CHIRP:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_5:
+    MUSIC_DISC_FAR:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_6:
+    MUSIC_DISC_MALL:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_7:
+    MUSIC_DISC_MELLOHI:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_8:
+    MUSIC_DISC_STAL:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_9:
+    MUSIC_DISC_STRAD:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_10:
+    MUSIC_DISC_WARD:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_11:
+    MUSIC_DISC_11:
         Amount: 1
         XP: 200
         Rarity: RECORD
-    RECORD_12:
+    MUSIC_DISC_WAIT:
+        Amount: 1
+        XP: 200
+        Rarity: RECORD
+    MUSIC_DISC_13:
         Amount: 1
         XP: 200
         Rarity: RECORD
@@ -447,7 +452,7 @@ Excavation:
         Drop_Chance: 0.05
         Drop_Level: 750
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
-    SULPHUR:
+    GUNPOWDER:
         Amount: 1
         XP: 30
         Drop_Chance: 10.0
@@ -507,13 +512,13 @@ Excavation:
         Drop_Chance: 0.5
         Drop_Level: 650
         Drops_From: [Sand, Red_Sand]
-    WATCH:
+    CLOCK:
         Amount: 1
         XP: 100
         Drop_Chance: 0.1
         Drop_Level: 500
         Drops_From: [Clay]
-    WEB:
+    COBWEB:
         Amount: 1
         XP: 150
         Drop_Chance: 5.0
@@ -531,13 +536,13 @@ Excavation:
         Drop_Chance: 5.0
         Drop_Level: 25
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Mycelium]
-    GOLD_RECORD:
+    MUSIC_DISC_13:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
         Drop_Level: 250
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
-    GREEN_RECORD:
+    MUSIC_DISC_CAT:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
@@ -549,7 +554,7 @@ Excavation:
         Drop_Chance: 0.13
         Drop_Level: 350
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
-    INK_SACK_BROWN:
+    COCOA_BEANS:
         Amount: 1
         XP: 100
         Drop_Chance: 1.33
@@ -583,19 +588,19 @@ Hylian_Luck:
         Drop_Chance: 100.0
         Drop_Level: 0
         Drops_From: [Bushes]
-    INK_SACK_BROWN:
+    COCOA_BEANS:
         Amount: 1
         XP: 0
         Drop_Chance: 100.0
         Drop_Level: 0
         Drops_From: [Bushes]
-    CARROT_ITEM:
+    CARROT:
         Amount: 1
         XP: 0
         Drop_Chance: 100.0
         Drop_Level: 0
         Drops_From: [Flowers]
-    POTATO_ITEM:
+    POTATO:
         Amount: 1
         XP: 0
         Drop_Chance: 100.0
@@ -646,7 +651,7 @@ Shake:
             XP: 0
             Drop_Chance: 49.0
             Drop_Level: 0
-        WEB:
+        COBWEB:
             Amount: 1
             XP: 0
             Drop_Chance: 1.0
@@ -664,7 +669,7 @@ Shake:
             XP: 0
             Drop_Chance: 33.3
             Drop_Level: 0
-        RAW_CHICKEN:
+        CHICKEN:
             Amount: 1
             XP: 0
             Drop_Chance: 33.3
@@ -685,19 +690,19 @@ Shake:
             XP: 0
             Drop_Chance: 49.0
             Drop_Level: 0
-        RAW_BEEF:
+        BEEF:
             Amount: 1
             XP: 0
             Drop_Chance: 49.0
             Drop_Level: 0
     CREEPER:
-        SKULL_ITEM:
+        SKELETON_SKULL:
             Data: 4
             Amount: 1
             XP: 0
             Drop_Chance: 1.0
             Drop_Level: 0
-        SULPHUR:
+        GUNPOWDER:
             Amount: 1
             XP: 0
             Drop_Chance: 99.0
@@ -709,7 +714,7 @@ Shake:
             Drop_Chance: 100.0
             Drop_Level: 0
     GHAST:
-        SULPHUR:
+        GUNPOWDER:
             Amount: 1
             XP: 0
             Drop_Chance: 50.0
@@ -741,7 +746,7 @@ Shake:
             XP: 0
             Drop_Chance: 12.0
             Drop_Level: 0
-        RED_ROSE:
+        POPPY:
             Amount: 1
             XP: 0
             Drop_Chance: 85.0
@@ -758,7 +763,7 @@ Shake:
             XP: 0
             Drop_Chance: 5.0
             Drop_Level: 0
-        MUSHROOM_SOUP:
+        MUSHROOM_STEW:
             Amount: 1
             XP: 0
             Drop_Chance: 5.0
@@ -779,7 +784,7 @@ Shake:
             Drop_Chance: 30.0
             Drop_Level: 0
     PIG:
-        PORK:
+        PORKCHOP:
             Amount: 1
             XP: 0
             Drop_Chance: 100.0
@@ -796,7 +801,7 @@ Shake:
             Drop_Chance: 50.0
             Drop_Level: 0
     PLAYER:
-        SKULL_ITEM:
+        SKELETON_SKULL:
             Amount: 1
             XP: 0
             Drop_Chance: 0.0
@@ -806,7 +811,7 @@ Shake:
             Drop_Chance: 0.0
             Drop_Level: 0
     SHEEP:
-        WOOL:
+        WHITE_WOOL:
             Amount: 3
             XP: 0
             Drop_Chance: 100.0
@@ -823,7 +828,7 @@ Shake:
             Drop_Chance: 75.0
             Drop_Level: 0
     SKELETON:
-        SKULL_ITEM:
+        SKELETON_SKULL:
             Data: 0
             Amount: 1
             XP: 0
@@ -868,7 +873,7 @@ Shake:
             Drop_Chance: 97.0
             Drop_Level: 0
     SQUID:
-        INK_SACK_BLACK:
+        INK_SAC:
             Amount: 1
             XP: 0
             Drop_Chance: 100.0
@@ -905,7 +910,7 @@ Shake:
             XP: 0
             Drop_Chance: 15.0
             Drop_Level: 0
-        SULPHUR:
+        GUNPOWDER:
             Amount: 1
             XP: 0
             Drop_Chance: 15.0
@@ -931,7 +936,7 @@ Shake:
             Drop_Chance: 15.0
             Drop_Level: 0
     WITHER_SKELETON:
-        SKULL_ITEM:
+        WITHER_SKELETON_SKULL:
             Data: 0
             Amount: 1
             XP: 0
@@ -948,7 +953,7 @@ Shake:
             Drop_Chance: 49.0
             Drop_Level: 0
     ZOMBIE:
-        SKULL_ITEM:
+        SKELETON_SKULL:
             Data: 2
             Amount: 1
             XP: 0

src/util/java/mcMMO/PotionConfigGenerator.java

@@ -347,10 +347,10 @@ public class PotionConfigGenerator {
         }
         for (Entry<WriteablePotion, Map<Ingredient, WriteablePotion>> entry : vanillaPotions.entrySet()) {
             if (entry.getKey().mat == Material.POTION) {
-                entry.getValue().put(new Ingredient(Material.SULPHUR), new WriteablePotion(Material.SPLASH_POTION, entry.getKey().data));
+                entry.getValue().put(new Ingredient(Material.GUNPOWDER), new WriteablePotion(Material.SPLASH_POTION, entry.getKey().data));
             }
             if (entry.getKey().mat == Material.SPLASH_POTION) {
-                entry.getValue().put(new Ingredient(Material.DRAGONS_BREATH), new WriteablePotion(Material.LINGERING_POTION, entry.getKey().data));
+                entry.getValue().put(new Ingredient(Material.DRAGON_BREATH), new WriteablePotion(Material.LINGERING_POTION, entry.getKey().data));
             }
         }
     }
@@ -393,10 +393,10 @@ public class PotionConfigGenerator {
                     mod = 0.25;
                 }
                 children.put(new Ingredient(Material.BROWN_MUSHROOM), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.CONFUSION, (int) (450 * mod), 0), "NAUSEA"));
-                children.put(new Ingredient(Material.CARROT_ITEM), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.FAST_DIGGING, (int) (3600 * mod), 0), "HASTE"));
+                children.put(new Ingredient(Material.CARROT), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.FAST_DIGGING, (int) (3600 * mod), 0), "HASTE"));
                 children.put(new Ingredient(Material.SLIME_BALL), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.SLOW_DIGGING, (int) (3600 * mod), 0), "DULLNESS"));
                 children.put(new Ingredient(Material.GOLDEN_APPLE), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, (int) (450 * mod), 0), "RESISTANCE"));
-                children.put(new Ingredient(Material.INK_SACK), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.BLINDNESS, (int) (225 * mod), 0), "BLINDNESS"));
+                children.put(new Ingredient(Material.INK_SAC), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.BLINDNESS, (int) (225 * mod), 0), "BLINDNESS"));
                 children.put(new Ingredient(Material.ROTTEN_FLESH), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.HUNGER, (int) (900 * mod), 0), "HUNGER"));
                 children.put(new Ingredient(Material.POISONOUS_POTATO), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.WITHER, (int) (450 * mod), 0), "DECAY"));
                 children.put(new Ingredient(Material.QUARTZ), new WriteablePotion(current.mat, PotionType.UNCRAFTABLE, new PotionEffect(PotionEffectType.ABSORPTION, (int) (1800 * mod), 0), "ABSORPTION"));
@@ -608,10 +608,10 @@ public class PotionConfigGenerator {
         for (Entry<WriteablePotion, Map<Ingredient, WriteablePotion>> entry : mcMMOPotions.entrySet()) {
             if (entry.getKey().mat == Material.POTION) {
                 PotionEffect effect = new PotionEffect(entry.getKey().effect.getType(), (int) (entry.getKey().effect.getDuration() * 0.75), entry.getKey().effect.getAmplifier());
-                entry.getValue().put(new Ingredient(Material.SULPHUR), new WriteablePotion(Material.SPLASH_POTION, entry.getKey().data, effect, entry.getKey().baseName));
+                entry.getValue().put(new Ingredient(Material.GUNPOWDER), new WriteablePotion(Material.SPLASH_POTION, entry.getKey().data, effect, entry.getKey().baseName));
             } else if (entry.getKey().mat == Material.SPLASH_POTION) {
                 PotionEffect effect = new PotionEffect(entry.getKey().effect.getType(), (int) (entry.getKey().effect.getDuration() * 0.33), entry.getKey().effect.getAmplifier());
-                entry.getValue().put(new Ingredient(Material.DRAGONS_BREATH), new WriteablePotion(Material.LINGERING_POTION, entry.getKey().data, effect, entry.getKey().baseName));
+                entry.getValue().put(new Ingredient(Material.DRAGON_BREATH), new WriteablePotion(Material.LINGERING_POTION, entry.getKey().data, effect, entry.getKey().baseName));
             }
         }
     }