From 54ecfe3bd33c1e6b9c4081fdbfc33eeb96421f5a Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 24 Jul 2018 21:48:30 -0500 Subject: [PATCH] Updated configs --- .../config/treasure/TreasureConfig.java | 4 +- .../datatypes/skills/MaterialType.java | 2 +- .../com/gmail/nossr50/util/ItemUtils.java | 12 - .../gmail/nossr50/util/skills/SkillUtils.java | 2 +- src/main/resources/config.yml | 2 +- src/main/resources/experience.yml | 2 +- src/main/resources/itemweights.yml | 44 +-- src/main/resources/potions.yml | 334 +++++++++--------- src/main/resources/repair.vanilla.yml | 28 +- src/main/resources/salvage.vanilla.yml | 28 +- src/main/resources/treasures.yml | 111 +++--- .../java/mcMMO/PotionConfigGenerator.java | 12 +- 12 files changed, 287 insertions(+), 294 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java index 2ccb5c611..3c506dcd0 100755 --- a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java +++ b/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 { diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java index 62f7ed160..8458c43fb 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java index a20f0a5da..08aac96cc 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/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: diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java index be785453d..3e0183c36 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/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; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 55c4869e2..e2f6e9660 100644 --- a/src/main/resources/config.yml +++ b/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 diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index bf1757de8..5f04a656e 100644 --- a/src/main/resources/experience.yml +++ b/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 diff --git a/src/main/resources/itemweights.yml b/src/main/resources/itemweights.yml index a0434e47a..7cf690e39 100644 --- a/src/main/resources/itemweights.yml +++ b/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 - Gold_Spade: 75 - Gold_Pickaxe: 75 - Gold_Axe: 75 - Gold_Helmet: 75 - Gold_Chestplate: 75 - Gold_Leggings: 75 - Gold_Boots: 75 + Golden_Sword: 75 + Golden_Shovel: 75 + Golden_Pickaxe: 75 + Golden_Axe: 75 + Golden_Helmet: 75 + Golden_Chestplate: 75 + Golden_Leggings: 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 - - Gold_Spade - - Gold_Pickaxe - - Gold_Axe + - Golden_Sword + - Golden_Shovel + - Golden_Pickaxe + - 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 - - Gold_Chestplate - - Gold_Leggings - - Gold_Boots + - Golden_Helmet + - Golden_Chestplate + - Golden_Leggings + - Golden_Boots - Iron_Helmet - Iron_Chestplate - Iron_Leggings diff --git a/src/main/resources/potions.yml b/src/main/resources/potions.yml index a49f78118..1ee6612bf 100644 --- a/src/main/resources/potions.yml +++ b/src/main/resources/potions.yml @@ -10,17 +10,17 @@ Concoctions: - GLOWSTONE_DUST - GOLDEN_CARROT - MAGMA_CREAM - - NETHER_STALK + - NETHER_WART - REDSTONE - - SPECKLED_MELON + - GLISTERING_MELON_SLICE - SPIDER_EYE - SUGAR - - SULPHUR + - GUNPOWDER - WATER_LILY - - 'RAW_FISH:3' - - 'DRAGONS_BREATH' + - PUFFERFISH + - DRAGON_BREATH Tier_Two_Ingredients: - - CARROT_ITEM + - CARROT - SLIME_BALL Tier_Three_Ingredients: - QUARTZ @@ -30,13 +30,13 @@ Concoctions: - ROTTEN_FLESH Tier_Five_Ingredients: - BROWN_MUSHROOM - - 'INK_SACK:0' + - INK_SAC Tier_Six_Ingredients: - - 'LONG_GRASS:2' + - FERN Tier_Seven_Ingredients: - POISONOUS_POTATO Tier_Eight_Ingredients: - - 'GOLDEN_APPLE:0' + - GOLDEN_APPLE # # Settings for Potions @@ -60,7 +60,7 @@ Potions: PotionData: PotionType: UNCRAFTABLE Children: - SULPHUR: SPLASH_POTION_OF_EMPTY + GUNPOWDER: SPLASH_POTION_OF_EMPTY POTION_OF_WATER: Material: POTION PotionData: @@ -70,10 +70,10 @@ Potions: GHAST_TEAR: POTION_OF_MUNDANE SUGAR: POTION_OF_MUNDANE FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS - SULPHUR: SPLASH_POTION_OF_WATER - NETHER_STALK: POTION_OF_AWKWARD + GUNPOWDER: SPLASH_POTION_OF_WATER + NETHER_WART: POTION_OF_AWKWARD REDSTONE: POTION_OF_MUNDANE - SPECKLED_MELON: POTION_OF_MUNDANE + GLISTERING_MELON_SLICE: POTION_OF_MUNDANE BLAZE_POWDER: POTION_OF_MUNDANE MAGMA_CREAM: POTION_OF_MUNDANE RABBIT_FOOT: POTION_OF_MUNDANE @@ -87,10 +87,10 @@ Potions: GHAST_TEAR: POTION_OF_MUNDANE SUGAR: POTION_OF_MUNDANE FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS - SULPHUR: SPLASH_POTION_OF_WATER - NETHER_STALK: POTION_OF_AWKWARD + GUNPOWDER: SPLASH_POTION_OF_WATER + NETHER_WART: POTION_OF_AWKWARD REDSTONE: POTION_OF_MUNDANE - SPECKLED_MELON: POTION_OF_MUNDANE + GLISTERING_MELON_SLICE: POTION_OF_MUNDANE BLAZE_POWDER: POTION_OF_MUNDANE MAGMA_CREAM: POTION_OF_MUNDANE RABBIT_FOOT: POTION_OF_MUNDANE @@ -100,13 +100,13 @@ Potions: PotionData: PotionType: MUNDANE Children: - SULPHUR: SPLASH_POTION_OF_MUNDANE + GUNPOWDER: SPLASH_POTION_OF_MUNDANE POTION_OF_THICK: Material: POTION PotionData: PotionType: THICK Children: - SULPHUR: SPLASH_POTION_OF_THICK + GUNPOWDER: SPLASH_POTION_OF_THICK POTION_OF_AWKWARD: Material: POTION PotionData: @@ -114,21 +114,21 @@ Potions: Children: MAGMA_CREAM: POTION_OF_FIRE_RESISTANCE ROTTEN_FLESH: POTION_OF_HUNGER - SULPHUR: SPLASH_POTION_OF_AWKWARD + GUNPOWDER: SPLASH_POTION_OF_AWKWARD RABBIT_FOOT: POTION_OF_LEAPING GOLDEN_CARROT: POTION_OF_NIGHT_VISION - CARROT_ITEM: POTION_OF_HASTE + CARROT: POTION_OF_HASTE SLIME_BALL: POTION_OF_DULLNESS - 'RAW_FISH:3': POTION_OF_WATER_BREATHING - SPECKLED_MELON: POTION_OF_HEALING + PUFFERFISH: POTION_OF_WATER_BREATHING + GLISTERING_MELON_SLICE: POTION_OF_HEALING SPIDER_EYE: POTION_OF_POISON GHAST_TEAR: POTION_OF_REGENERATION - INK_SACK: POTION_OF_BLINDNESS + INK_SAC: POTION_OF_BLINDNESS BROWN_MUSHROOM: POTION_OF_NAUSEA BLAZE_POWDER: POTION_OF_STRENGTH POISONOUS_POTATO: POTION_OF_DECAY QUARTZ: POTION_OF_ABSORPTION - 'LONG_GRASS:2': POTION_OF_SATURATION + FERN: POTION_OF_SATURATION APPLE: POTION_OF_HEALTH_BOOST SUGAR: POTION_OF_SWIFTNESS GOLDEN_APPLE: POTION_OF_RESISTANCE @@ -138,7 +138,7 @@ Potions: PotionType: NIGHT_VISION Children: FERMENTED_SPIDER_EYE: POTION_OF_INVISIBILITY - SULPHUR: SPLASH_POTION_OF_NIGHT_VISION + GUNPOWDER: SPLASH_POTION_OF_NIGHT_VISION REDSTONE: POTION_OF_NIGHT_VISION_EXTENDED POTION_OF_NIGHT_VISION_EXTENDED: Material: POTION @@ -146,14 +146,14 @@ Potions: PotionType: NIGHT_VISION Extended: true Children: - SULPHUR: SPLASH_POTION_OF_NIGHT_VISION_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_NIGHT_VISION_EXTENDED FERMENTED_SPIDER_EYE: POTION_OF_INVISIBILITY_EXTENDED POTION_OF_INVISIBILITY: Material: POTION PotionData: PotionType: INVISIBILITY Children: - SULPHUR: SPLASH_POTION_OF_INVISIBILITY + GUNPOWDER: SPLASH_POTION_OF_INVISIBILITY REDSTONE: POTION_OF_INVISIBILITY_EXTENDED POTION_OF_INVISIBILITY_EXTENDED: Material: POTION @@ -161,7 +161,7 @@ Potions: PotionType: INVISIBILITY Extended: true Children: - SULPHUR: SPLASH_POTION_OF_INVISIBILITY_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_INVISIBILITY_EXTENDED POTION_OF_LEAPING: Material: POTION PotionData: @@ -169,7 +169,7 @@ Potions: Children: REDSTONE: POTION_OF_LEAPING_EXTENDED FERMENTED_SPIDER_EYE: POTION_OF_SLOWNESS - SULPHUR: SPLASH_POTION_OF_LEAPING + GUNPOWDER: SPLASH_POTION_OF_LEAPING GLOWSTONE_DUST: POTION_OF_LEAPING_II POTION_OF_LEAPING_EXTENDED: Material: POTION @@ -177,20 +177,20 @@ Potions: PotionType: JUMP Extended: true Children: - SULPHUR: SPLASH_POTION_OF_LEAPING_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_LEAPING_EXTENDED POTION_OF_LEAPING_II: Material: POTION PotionData: PotionType: JUMP Upgraded: true Children: - SULPHUR: SPLASH_POTION_OF_LEAPING_II + GUNPOWDER: SPLASH_POTION_OF_LEAPING_II POTION_OF_FIRE_RESISTANCE: Material: POTION PotionData: PotionType: FIRE_RESISTANCE Children: - SULPHUR: SPLASH_POTION_OF_FIRE_RESISTANCE + GUNPOWDER: SPLASH_POTION_OF_FIRE_RESISTANCE FERMENTED_SPIDER_EYE: POTION_OF_SLOWNESS REDSTONE: POTION_OF_FIRE_RESISTANCE_EXTENDED POTION_OF_FIRE_RESISTANCE_EXTENDED: @@ -200,7 +200,7 @@ Potions: Extended: true Children: FERMENTED_SPIDER_EYE: POTION_OF_SLOWNESS_EXTENDED - SULPHUR: SPLASH_POTION_OF_FIRE_RESISTANCE_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_FIRE_RESISTANCE_EXTENDED POTION_OF_SWIFTNESS: Material: POTION PotionData: @@ -208,7 +208,7 @@ Potions: Children: FERMENTED_SPIDER_EYE: POTION_OF_SLOWNESS GLOWSTONE_DUST: POTION_OF_SWIFTNESS_II - SULPHUR: SPLASH_POTION_OF_SWIFTNESS + GUNPOWDER: SPLASH_POTION_OF_SWIFTNESS REDSTONE: POTION_OF_SWIFTNESS_EXTENDED POTION_OF_SWIFTNESS_II: Material: POTION @@ -217,21 +217,21 @@ Potions: Upgraded: true Children: FERMENTED_SPIDER_EYE: POTION_OF_SLOWNESS_EXTENDED - SULPHUR: SPLASH_POTION_OF_SWIFTNESS_II + GUNPOWDER: SPLASH_POTION_OF_SWIFTNESS_II POTION_OF_SWIFTNESS_EXTENDED: Material: POTION PotionData: PotionType: SPEED Extended: true Children: - SULPHUR: SPLASH_POTION_OF_SWIFTNESS_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_SWIFTNESS_EXTENDED FERMENTED_SPIDER_EYE: POTION_OF_SLOWNESS_EXTENDED POTION_OF_SLOWNESS: Material: POTION PotionData: PotionType: SLOWNESS Children: - SULPHUR: SPLASH_POTION_OF_SLOWNESS + GUNPOWDER: SPLASH_POTION_OF_SLOWNESS REDSTONE: POTION_OF_SLOWNESS_EXTENDED POTION_OF_SLOWNESS_EXTENDED: Material: POTION @@ -239,7 +239,7 @@ Potions: PotionType: SLOWNESS Extended: true Children: - SULPHUR: SPLASH_POTION_OF_SLOWNESS_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_SLOWNESS_EXTENDED POTION_OF_WATER_BREATHING: Material: POTION PotionData: @@ -247,21 +247,21 @@ Potions: Children: FERMENTED_SPIDER_EYE: POTION_OF_HARMING REDSTONE: POTION_OF_WATER_BREATHING_EXTENDED - SULPHUR: SPLASH_POTION_OF_WATER_BREATHING + GUNPOWDER: SPLASH_POTION_OF_WATER_BREATHING POTION_OF_WATER_BREATHING_EXTENDED: Material: POTION PotionData: PotionType: WATER_BREATHING Extended: true Children: - SULPHUR: SPLASH_POTION_OF_WATER_BREATHING_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_WATER_BREATHING_EXTENDED POTION_OF_HEALING: Material: POTION PotionData: PotionType: INSTANT_HEAL Children: GLOWSTONE_DUST: POTION_OF_HEALING_II - SULPHUR: SPLASH_POTION_OF_HEALING + GUNPOWDER: SPLASH_POTION_OF_HEALING FERMENTED_SPIDER_EYE: POTION_OF_HARMING POTION_OF_HEALING_II: Material: POTION @@ -270,21 +270,21 @@ Potions: Upgraded: true Children: FERMENTED_SPIDER_EYE: POTION_OF_HARMING_II - SULPHUR: SPLASH_POTION_OF_HEALING_II + GUNPOWDER: SPLASH_POTION_OF_HEALING_II POTION_OF_HARMING: Material: POTION PotionData: PotionType: INSTANT_DAMAGE Children: GLOWSTONE_DUST: POTION_OF_HARMING_II - SULPHUR: SPLASH_POTION_OF_HARMING + GUNPOWDER: SPLASH_POTION_OF_HARMING POTION_OF_HARMING_II: Material: POTION PotionData: PotionType: INSTANT_DAMAGE Upgraded: true Children: - SULPHUR: SPLASH_POTION_OF_HARMING_II + GUNPOWDER: SPLASH_POTION_OF_HARMING_II POTION_OF_POISON: Material: POTION PotionData: @@ -293,14 +293,14 @@ Potions: GLOWSTONE_DUST: POTION_OF_POISON_II REDSTONE: POTION_OF_POISON_EXTENDED FERMENTED_SPIDER_EYE: POTION_OF_HARMING - SULPHUR: SPLASH_POTION_OF_POISON + GUNPOWDER: SPLASH_POTION_OF_POISON POTION_OF_POISON_EXTENDED: Material: POTION PotionData: PotionType: POISON Extended: true Children: - SULPHUR: SPLASH_POTION_OF_POISON_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_POISON_EXTENDED FERMENTED_SPIDER_EYE: POTION_OF_HARMING_II POTION_OF_POISON_II: Material: POTION @@ -309,14 +309,14 @@ Potions: Upgraded: true Children: FERMENTED_SPIDER_EYE: POTION_OF_HARMING_II - SULPHUR: SPLASH_POTION_OF_POISON_II + GUNPOWDER: SPLASH_POTION_OF_POISON_II POTION_OF_REGENERATION: Material: POTION PotionData: PotionType: REGEN Children: REDSTONE: POTION_OF_REGENERATION_EXTENDED - SULPHUR: SPLASH_POTION_OF_REGENERATION + GUNPOWDER: SPLASH_POTION_OF_REGENERATION GLOWSTONE_DUST: POTION_OF_REGENERATION_II POTION_OF_REGENERATION_II: Material: POTION @@ -324,14 +324,14 @@ Potions: PotionType: REGEN Upgraded: true Children: - SULPHUR: SPLASH_POTION_OF_REGENERATION_II + GUNPOWDER: SPLASH_POTION_OF_REGENERATION_II POTION_OF_REGENERATION_EXTENDED: Material: POTION PotionData: PotionType: REGEN Extended: true Children: - SULPHUR: SPLASH_POTION_OF_REGENERATION_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_REGENERATION_EXTENDED POTION_OF_STRENGTH: Material: POTION PotionData: @@ -339,27 +339,27 @@ Potions: Children: GLOWSTONE_DUST: POTION_OF_STRENGTH_II REDSTONE: POTION_OF_STRENGTH_EXTENDED - SULPHUR: SPLASH_POTION_OF_STRENGTH + GUNPOWDER: SPLASH_POTION_OF_STRENGTH POTION_OF_STRENGTH_EXTENDED: Material: POTION PotionData: PotionType: STRENGTH Extended: true Children: - SULPHUR: SPLASH_POTION_OF_STRENGTH_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_STRENGTH_EXTENDED POTION_OF_STRENGTH_II: Material: POTION PotionData: PotionType: STRENGTH Upgraded: true Children: - SULPHUR: SPLASH_POTION_OF_STRENGTH_II + GUNPOWDER: SPLASH_POTION_OF_STRENGTH_II POTION_OF_WEAKNESS: Material: POTION PotionData: PotionType: WEAKNESS Children: - SULPHUR: SPLASH_POTION_OF_WEAKNESS + GUNPOWDER: SPLASH_POTION_OF_WEAKNESS REDSTONE: POTION_OF_WEAKNESS_EXTENDED POTION_OF_WEAKNESS_EXTENDED: Material: POTION @@ -367,13 +367,13 @@ Potions: PotionType: WEAKNESS Extended: true Children: - SULPHUR: SPLASH_POTION_OF_WEAKNESS_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_WEAKNESS_EXTENDED POTION_OF_LUCK: Material: POTION PotionData: PotionType: LUCK Children: - SULPHUR: SPLASH_POTION_OF_LUCK + GUNPOWDER: SPLASH_POTION_OF_LUCK POTION_OF_ABSORPTION: Name: Potion Of Absorption Material: POTION @@ -383,7 +383,7 @@ Potions: Children: GLOWSTONE_DUST: POTION_OF_ABSORPTION_II REDSTONE: POTION_OF_ABSORPTION_EXTENDED - SULPHUR: SPLASH_POTION_OF_ABSORPTION + GUNPOWDER: SPLASH_POTION_OF_ABSORPTION POTION_OF_BLINDNESS: Name: Potion Of Blindness Material: POTION @@ -391,7 +391,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["BLINDNESS 0 225"] Children: - SULPHUR: SPLASH_POTION_OF_BLINDNESS + GUNPOWDER: SPLASH_POTION_OF_BLINDNESS GLOWSTONE_DUST: POTION_OF_BLINDNESS_II REDSTONE: POTION_OF_BLINDNESS_EXTENDED POTION_OF_DECAY: @@ -402,7 +402,7 @@ Potions: Effects: ["WITHER 0 450"] Children: REDSTONE: POTION_OF_DECAY_EXTENDED - SULPHUR: SPLASH_POTION_OF_DECAY + GUNPOWDER: SPLASH_POTION_OF_DECAY GLOWSTONE_DUST: POTION_OF_DECAY_II POTION_OF_DULLNESS: Name: Potion Of Dullness @@ -412,7 +412,7 @@ Potions: Effects: ["SLOW_DIGGING 0 3600"] Children: REDSTONE: POTION_OF_DULLNESS_EXTENDED - SULPHUR: SPLASH_POTION_OF_DULLNESS + GUNPOWDER: SPLASH_POTION_OF_DULLNESS GLOWSTONE_DUST: POTION_OF_DULLNESS_II POTION_OF_HASTE: Name: Potion Of Haste @@ -423,7 +423,7 @@ Potions: Children: REDSTONE: POTION_OF_HASTE_EXTENDED GLOWSTONE_DUST: POTION_OF_HASTE_II - SULPHUR: SPLASH_POTION_OF_HASTE + GUNPOWDER: SPLASH_POTION_OF_HASTE POTION_OF_HEALTH_BOOST: Name: Potion Of Health Boost Material: POTION @@ -432,7 +432,7 @@ Potions: Effects: ["HEALTH_BOOST 0 1800"] Children: GLOWSTONE_DUST: POTION_OF_HEALTH_BOOST_II - SULPHUR: SPLASH_POTION_OF_HEALTH_BOOST + GUNPOWDER: SPLASH_POTION_OF_HEALTH_BOOST REDSTONE: POTION_OF_HEALTH_BOOST_EXTENDED POTION_OF_HUNGER: Name: Potion Of Hunger @@ -441,7 +441,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HUNGER 0 900"] Children: - SULPHUR: SPLASH_POTION_OF_HUNGER + GUNPOWDER: SPLASH_POTION_OF_HUNGER GLOWSTONE_DUST: POTION_OF_HUNGER_II REDSTONE: POTION_OF_HUNGER_EXTENDED POTION_OF_NAUSEA: @@ -452,7 +452,7 @@ Potions: Effects: ["CONFUSION 0 450"] Children: REDSTONE: POTION_OF_NAUSEA_EXTENDED - SULPHUR: SPLASH_POTION_OF_NAUSEA + GUNPOWDER: SPLASH_POTION_OF_NAUSEA GLOWSTONE_DUST: POTION_OF_NAUSEA_II POTION_OF_RESISTANCE: Name: Potion Of Resistance @@ -462,7 +462,7 @@ Potions: Effects: ["DAMAGE_RESISTANCE 0 450"] Children: REDSTONE: POTION_OF_RESISTANCE_EXTENDED - SULPHUR: SPLASH_POTION_OF_RESISTANCE + GUNPOWDER: SPLASH_POTION_OF_RESISTANCE GLOWSTONE_DUST: POTION_OF_RESISTANCE_II POTION_OF_SATURATION: Name: Potion Of Saturation @@ -473,7 +473,7 @@ Potions: Children: REDSTONE: POTION_OF_SATURATION_EXTENDED GLOWSTONE_DUST: POTION_OF_SATURATION_II - SULPHUR: SPLASH_POTION_OF_SATURATION + GUNPOWDER: SPLASH_POTION_OF_SATURATION POTION_OF_ABSORPTION_EXTENDED: Name: Potion Of Absorption Extended Material: POTION @@ -481,7 +481,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["ABSORPTION 0 3600"] Children: - SULPHUR: SPLASH_POTION_OF_ABSORPTION_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_ABSORPTION_EXTENDED POTION_OF_BLINDNESS_EXTENDED: Name: Potion Of Blindness Extended Material: POTION @@ -489,7 +489,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["BLINDNESS 0 450"] Children: - SULPHUR: SPLASH_POTION_OF_BLINDNESS_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_BLINDNESS_EXTENDED POTION_OF_DECAY_EXTENDED: Name: Potion Of Decay Extended Material: POTION @@ -497,7 +497,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["WITHER 0 900"] Children: - SULPHUR: SPLASH_POTION_OF_DECAY_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_DECAY_EXTENDED POTION_OF_DULLNESS_EXTENDED: Name: Potion Of Dullness Extended Material: POTION @@ -505,7 +505,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SLOW_DIGGING 0 7200"] Children: - SULPHUR: SPLASH_POTION_OF_DULLNESS_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_DULLNESS_EXTENDED POTION_OF_HASTE_EXTENDED: Name: Potion Of Haste Extended Material: POTION @@ -513,7 +513,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["FAST_DIGGING 0 7200"] Children: - SULPHUR: SPLASH_POTION_OF_HASTE_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_HASTE_EXTENDED POTION_OF_HEALTH_BOOST_EXTENDED: Name: Potion Of Health Boost Extended Material: POTION @@ -521,7 +521,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HEALTH_BOOST 0 3600"] Children: - SULPHUR: SPLASH_POTION_OF_HEALTH_BOOST_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_HEALTH_BOOST_EXTENDED POTION_OF_HUNGER_EXTENDED: Name: Potion Of Hunger Extended Material: POTION @@ -529,7 +529,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HUNGER 0 1800"] Children: - SULPHUR: SPLASH_POTION_OF_HUNGER_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_HUNGER_EXTENDED POTION_OF_NAUSEA_EXTENDED: Name: Potion Of Nausea Extended Material: POTION @@ -537,7 +537,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["CONFUSION 0 900"] Children: - SULPHUR: SPLASH_POTION_OF_NAUSEA_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_NAUSEA_EXTENDED POTION_OF_RESISTANCE_EXTENDED: Name: Potion Of Resistance Extended Material: POTION @@ -545,7 +545,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["DAMAGE_RESISTANCE 0 900"] Children: - SULPHUR: SPLASH_POTION_OF_RESISTANCE_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_RESISTANCE_EXTENDED POTION_OF_SATURATION_EXTENDED: Name: Potion Of Saturation Extended Material: POTION @@ -553,7 +553,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SATURATION 0 16"] Children: - SULPHUR: SPLASH_POTION_OF_SATURATION_EXTENDED + GUNPOWDER: SPLASH_POTION_OF_SATURATION_EXTENDED POTION_OF_ABSORPTION_II: Name: Potion Of Absorption II Material: POTION @@ -561,7 +561,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["ABSORPTION 1 900"] Children: - SULPHUR: SPLASH_POTION_OF_ABSORPTION_II + GUNPOWDER: SPLASH_POTION_OF_ABSORPTION_II POTION_OF_BLINDNESS_II: Name: Potion Of Blindness II Material: POTION @@ -569,7 +569,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["BLINDNESS 1 112"] Children: - SULPHUR: SPLASH_POTION_OF_BLINDNESS_II + GUNPOWDER: SPLASH_POTION_OF_BLINDNESS_II POTION_OF_DECAY_II: Name: Potion Of Decay II Material: POTION @@ -577,7 +577,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["WITHER 1 225"] Children: - SULPHUR: SPLASH_POTION_OF_DECAY_II + GUNPOWDER: SPLASH_POTION_OF_DECAY_II POTION_OF_DULLNESS_II: Name: Potion Of Dullness II Material: POTION @@ -585,7 +585,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SLOW_DIGGING 1 1800"] Children: - SULPHUR: SPLASH_POTION_OF_DULLNESS_II + GUNPOWDER: SPLASH_POTION_OF_DULLNESS_II POTION_OF_HASTE_II: Name: Potion Of Haste II Material: POTION @@ -593,7 +593,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["FAST_DIGGING 1 1800"] Children: - SULPHUR: SPLASH_POTION_OF_HASTE_II + GUNPOWDER: SPLASH_POTION_OF_HASTE_II POTION_OF_HEALTH_BOOST_II: Name: Potion Of Health Boost II Material: POTION @@ -601,7 +601,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HEALTH_BOOST 1 900"] Children: - SULPHUR: SPLASH_POTION_OF_HEALTH_BOOST_II + GUNPOWDER: SPLASH_POTION_OF_HEALTH_BOOST_II POTION_OF_HUNGER_II: Name: Potion Of Hunger II Material: POTION @@ -609,7 +609,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HUNGER 1 450"] Children: - SULPHUR: SPLASH_POTION_OF_HUNGER_II + GUNPOWDER: SPLASH_POTION_OF_HUNGER_II POTION_OF_NAUSEA_II: Name: Potion Of Nausea II Material: POTION @@ -617,7 +617,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["CONFUSION 1 225"] Children: - SULPHUR: SPLASH_POTION_OF_NAUSEA_II + GUNPOWDER: SPLASH_POTION_OF_NAUSEA_II POTION_OF_RESISTANCE_II: Name: Potion Of Resistance II Material: POTION @@ -625,7 +625,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["DAMAGE_RESISTANCE 1 225"] Children: - SULPHUR: SPLASH_POTION_OF_RESISTANCE_II + GUNPOWDER: SPLASH_POTION_OF_RESISTANCE_II POTION_OF_SATURATION_II: Name: Potion Of Saturation II Material: POTION @@ -633,13 +633,13 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SATURATION 1 4"] Children: - SULPHUR: SPLASH_POTION_OF_SATURATION_II + GUNPOWDER: SPLASH_POTION_OF_SATURATION_II SPLASH_POTION_OF_EMPTY: Material: SPLASH_POTION PotionData: PotionType: UNCRAFTABLE Children: - DRAGONS_BREATH: LINGERING_POTION_OF_EMPTY + DRAGON_BREATH: LINGERING_POTION_OF_EMPTY SPLASH_POTION_OF_WATER: Material: SPLASH_POTION PotionData: @@ -649,26 +649,26 @@ Potions: MAGMA_CREAM: SPLASH_POTION_OF_MUNDANE REDSTONE: SPLASH_POTION_OF_MUNDANE GLOWSTONE_DUST: SPLASH_POTION_OF_THICK - DRAGONS_BREATH: LINGERING_POTION_OF_WATER - SPECKLED_MELON: SPLASH_POTION_OF_MUNDANE + DRAGON_BREATH: LINGERING_POTION_OF_WATER + GLISTERING_MELON_SLICE: SPLASH_POTION_OF_MUNDANE GHAST_TEAR: SPLASH_POTION_OF_MUNDANE FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_WEAKNESS SPIDER_EYE: SPLASH_POTION_OF_MUNDANE BLAZE_POWDER: SPLASH_POTION_OF_MUNDANE - NETHER_STALK: SPLASH_POTION_OF_AWKWARD + NETHER_WART: SPLASH_POTION_OF_AWKWARD SUGAR: SPLASH_POTION_OF_MUNDANE SPLASH_POTION_OF_MUNDANE: Material: SPLASH_POTION PotionData: PotionType: MUNDANE Children: - DRAGONS_BREATH: LINGERING_POTION_OF_MUNDANE + DRAGON_BREATH: LINGERING_POTION_OF_MUNDANE SPLASH_POTION_OF_THICK: Material: SPLASH_POTION PotionData: PotionType: THICK Children: - DRAGONS_BREATH: LINGERING_POTION_OF_THICK + DRAGON_BREATH: LINGERING_POTION_OF_THICK SPLASH_POTION_OF_AWKWARD: Material: SPLASH_POTION PotionData: @@ -679,17 +679,17 @@ Potions: QUARTZ: SPLASH_POTION_OF_ABSORPTION GOLDEN_CARROT: SPLASH_POTION_OF_NIGHT_VISION POISONOUS_POTATO: SPLASH_POTION_OF_DECAY - DRAGONS_BREATH: LINGERING_POTION_OF_AWKWARD + DRAGON_BREATH: LINGERING_POTION_OF_AWKWARD MAGMA_CREAM: SPLASH_POTION_OF_FIRE_RESISTANCE - 'RAW_FISH:3': SPLASH_POTION_OF_WATER_BREATHING - INK_SACK: SPLASH_POTION_OF_BLINDNESS - 'LONG_GRASS:2': SPLASH_POTION_OF_SATURATION + PUFFERFISH: SPLASH_POTION_OF_WATER_BREATHING + INK_SAC: SPLASH_POTION_OF_BLINDNESS + FERN: SPLASH_POTION_OF_SATURATION GOLDEN_APPLE: SPLASH_POTION_OF_RESISTANCE - CARROT_ITEM: SPLASH_POTION_OF_HASTE + CARROT: SPLASH_POTION_OF_HASTE BLAZE_POWDER: SPLASH_POTION_OF_STRENGTH SUGAR: SPLASH_POTION_OF_SWIFTNESS SPIDER_EYE: SPLASH_POTION_OF_POISON - SPECKLED_MELON: SPLASH_POTION_OF_HEALING + GLISTERING_MELON_SLICE: SPLASH_POTION_OF_HEALING BROWN_MUSHROOM: SPLASH_POTION_OF_NAUSEA SLIME_BALL: SPLASH_POTION_OF_DULLNESS GHAST_TEAR: SPLASH_POTION_OF_REGENERATION @@ -700,7 +700,7 @@ Potions: PotionType: NIGHT_VISION Children: FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_INVISIBILITY - DRAGONS_BREATH: LINGERING_POTION_OF_NIGHT_VISION + DRAGON_BREATH: LINGERING_POTION_OF_NIGHT_VISION REDSTONE: SPLASH_POTION_OF_NIGHT_VISION_EXTENDED SPLASH_POTION_OF_NIGHT_VISION_EXTENDED: Material: SPLASH_POTION @@ -709,13 +709,13 @@ Potions: Extended: true Children: FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_INVISIBILITY_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_NIGHT_VISION_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_NIGHT_VISION_EXTENDED SPLASH_POTION_OF_INVISIBILITY: Material: SPLASH_POTION PotionData: PotionType: INVISIBILITY Children: - DRAGONS_BREATH: LINGERING_POTION_OF_INVISIBILITY + DRAGON_BREATH: LINGERING_POTION_OF_INVISIBILITY REDSTONE: SPLASH_POTION_OF_INVISIBILITY_EXTENDED SPLASH_POTION_OF_INVISIBILITY_EXTENDED: Material: SPLASH_POTION @@ -723,7 +723,7 @@ Potions: PotionType: INVISIBILITY Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_INVISIBILITY_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_INVISIBILITY_EXTENDED SPLASH_POTION_OF_LEAPING: Material: SPLASH_POTION PotionData: @@ -731,7 +731,7 @@ Potions: Children: GLOWSTONE_DUST: SPLASH_POTION_OF_LEAPING_II FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_SLOWNESS - DRAGONS_BREATH: LINGERING_POTION_OF_LEAPING + DRAGON_BREATH: LINGERING_POTION_OF_LEAPING REDSTONE: SPLASH_POTION_OF_LEAPING_EXTENDED SPLASH_POTION_OF_LEAPING_II: Material: SPLASH_POTION @@ -739,20 +739,20 @@ Potions: PotionType: JUMP Upgraded: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_LEAPING_II + DRAGON_BREATH: LINGERING_POTION_OF_LEAPING_II SPLASH_POTION_OF_LEAPING_EXTENDED: Material: SPLASH_POTION PotionData: PotionType: JUMP Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_LEAPING_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_LEAPING_EXTENDED SPLASH_POTION_OF_FIRE_RESISTANCE: Material: SPLASH_POTION PotionData: PotionType: FIRE_RESISTANCE Children: - DRAGONS_BREATH: LINGERING_POTION_OF_FIRE_RESISTANCE + DRAGON_BREATH: LINGERING_POTION_OF_FIRE_RESISTANCE REDSTONE: SPLASH_POTION_OF_FIRE_RESISTANCE_EXTENDED FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_SLOWNESS SPLASH_POTION_OF_FIRE_RESISTANCE_EXTENDED: @@ -762,7 +762,7 @@ Potions: Extended: true Children: FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_SLOWNESS_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_FIRE_RESISTANCE_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_FIRE_RESISTANCE_EXTENDED SPLASH_POTION_OF_SWIFTNESS: Material: SPLASH_POTION PotionData: @@ -771,14 +771,14 @@ Potions: REDSTONE: SPLASH_POTION_OF_SWIFTNESS_EXTENDED FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_SLOWNESS GLOWSTONE_DUST: SPLASH_POTION_OF_SWIFTNESS_II - DRAGONS_BREATH: LINGERING_POTION_OF_SWIFTNESS + DRAGON_BREATH: LINGERING_POTION_OF_SWIFTNESS SPLASH_POTION_OF_SWIFTNESS_EXTENDED: Material: SPLASH_POTION PotionData: PotionType: SPEED Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_SWIFTNESS_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_SWIFTNESS_EXTENDED FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_SLOWNESS_EXTENDED SPLASH_POTION_OF_SWIFTNESS_II: Material: SPLASH_POTION @@ -786,7 +786,7 @@ Potions: PotionType: SPEED Upgraded: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_SWIFTNESS_II + DRAGON_BREATH: LINGERING_POTION_OF_SWIFTNESS_II FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_SLOWNESS_EXTENDED SPLASH_POTION_OF_SLOWNESS: Material: SPLASH_POTION @@ -794,14 +794,14 @@ Potions: PotionType: SLOWNESS Children: REDSTONE: SPLASH_POTION_OF_SLOWNESS_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_SLOWNESS + DRAGON_BREATH: LINGERING_POTION_OF_SLOWNESS SPLASH_POTION_OF_SLOWNESS_EXTENDED: Material: SPLASH_POTION PotionData: PotionType: SLOWNESS Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_SLOWNESS_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_SLOWNESS_EXTENDED SPLASH_POTION_OF_WATER_BREATHING: Material: SPLASH_POTION PotionData: @@ -809,14 +809,14 @@ Potions: Children: FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_HARMING REDSTONE: SPLASH_POTION_OF_WATER_BREATHING_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_WATER_BREATHING + DRAGON_BREATH: LINGERING_POTION_OF_WATER_BREATHING SPLASH_POTION_OF_WATER_BREATHING_EXTENDED: Material: SPLASH_POTION PotionData: PotionType: WATER_BREATHING Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_WATER_BREATHING_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_WATER_BREATHING_EXTENDED SPLASH_POTION_OF_HEALING: Material: SPLASH_POTION PotionData: @@ -824,14 +824,14 @@ Potions: Children: FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_HARMING GLOWSTONE_DUST: SPLASH_POTION_OF_HEALING_II - DRAGONS_BREATH: LINGERING_POTION_OF_HEALING + DRAGON_BREATH: LINGERING_POTION_OF_HEALING SPLASH_POTION_OF_HEALING_II: Material: SPLASH_POTION PotionData: PotionType: INSTANT_HEAL Upgraded: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HEALING_II + DRAGON_BREATH: LINGERING_POTION_OF_HEALING_II FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_HARMING_II SPLASH_POTION_OF_HARMING: Material: SPLASH_POTION @@ -839,20 +839,20 @@ Potions: PotionType: INSTANT_DAMAGE Children: GLOWSTONE_DUST: SPLASH_POTION_OF_HARMING_II - DRAGONS_BREATH: LINGERING_POTION_OF_HARMING + DRAGON_BREATH: LINGERING_POTION_OF_HARMING SPLASH_POTION_OF_HARMING_II: Material: SPLASH_POTION PotionData: PotionType: INSTANT_DAMAGE Upgraded: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HARMING_II + DRAGON_BREATH: LINGERING_POTION_OF_HARMING_II SPLASH_POTION_OF_POISON: Material: SPLASH_POTION PotionData: PotionType: POISON Children: - DRAGONS_BREATH: LINGERING_POTION_OF_POISON + DRAGON_BREATH: LINGERING_POTION_OF_POISON FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_HARMING REDSTONE: SPLASH_POTION_OF_POISON_EXTENDED GLOWSTONE_DUST: SPLASH_POTION_OF_POISON_II @@ -863,14 +863,14 @@ Potions: Extended: true Children: FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_HARMING_II - DRAGONS_BREATH: LINGERING_POTION_OF_POISON_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_POISON_EXTENDED SPLASH_POTION_OF_POISON_II: Material: SPLASH_POTION PotionData: PotionType: POISON Upgraded: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_POISON_II + DRAGON_BREATH: LINGERING_POTION_OF_POISON_II FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_HARMING_II SPLASH_POTION_OF_REGENERATION: Material: SPLASH_POTION @@ -878,7 +878,7 @@ Potions: PotionType: REGEN Children: GLOWSTONE_DUST: SPLASH_POTION_OF_REGENERATION_II - DRAGONS_BREATH: LINGERING_POTION_OF_REGENERATION + DRAGON_BREATH: LINGERING_POTION_OF_REGENERATION REDSTONE: SPLASH_POTION_OF_REGENERATION_EXTENDED SPLASH_POTION_OF_REGENERATION_EXTENDED: Material: SPLASH_POTION @@ -886,14 +886,14 @@ Potions: PotionType: REGEN Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_REGENERATION_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_REGENERATION_EXTENDED SPLASH_POTION_OF_REGENERATION_II: Material: SPLASH_POTION PotionData: PotionType: REGEN Upgraded: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_REGENERATION_II + DRAGON_BREATH: LINGERING_POTION_OF_REGENERATION_II SPLASH_POTION_OF_STRENGTH: Material: SPLASH_POTION PotionData: @@ -901,27 +901,27 @@ Potions: Children: REDSTONE: SPLASH_POTION_OF_STRENGTH_EXTENDED GLOWSTONE_DUST: SPLASH_POTION_OF_STRENGTH_II - DRAGONS_BREATH: LINGERING_POTION_OF_STRENGTH + DRAGON_BREATH: LINGERING_POTION_OF_STRENGTH SPLASH_POTION_OF_STRENGTH_EXTENDED: Material: SPLASH_POTION PotionData: PotionType: STRENGTH Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_STRENGTH_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_STRENGTH_EXTENDED SPLASH_POTION_OF_STRENGTH_II: Material: SPLASH_POTION PotionData: PotionType: STRENGTH Upgraded: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_STRENGTH_II + DRAGON_BREATH: LINGERING_POTION_OF_STRENGTH_II SPLASH_POTION_OF_WEAKNESS: Material: SPLASH_POTION PotionData: PotionType: WEAKNESS Children: - DRAGONS_BREATH: LINGERING_POTION_OF_WEAKNESS + DRAGON_BREATH: LINGERING_POTION_OF_WEAKNESS REDSTONE: SPLASH_POTION_OF_WEAKNESS_EXTENDED SPLASH_POTION_OF_WEAKNESS_EXTENDED: Material: SPLASH_POTION @@ -929,13 +929,13 @@ Potions: PotionType: WEAKNESS Extended: true Children: - DRAGONS_BREATH: LINGERING_POTION_OF_WEAKNESS_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_WEAKNESS_EXTENDED SPLASH_POTION_OF_LUCK: Material: SPLASH_POTION PotionData: PotionType: LUCK Children: - DRAGONS_BREATH: LINGERING_POTION_OF_LUCK + DRAGON_BREATH: LINGERING_POTION_OF_LUCK SPLASH_POTION_OF_ABSORPTION: Name: Splash Potion Of Absorption Material: SPLASH_POTION @@ -944,7 +944,7 @@ Potions: Effects: ["ABSORPTION 0 1350"] Children: GLOWSTONE_DUST: SPLASH_POTION_OF_ABSORPTION_II - DRAGONS_BREATH: LINGERING_POTION_OF_ABSORPTION + DRAGON_BREATH: LINGERING_POTION_OF_ABSORPTION REDSTONE: SPLASH_POTION_OF_ABSORPTION_EXTENDED SPLASH_POTION_OF_BLINDNESS: Name: Splash Potion Of Blindness @@ -955,7 +955,7 @@ Potions: Children: GLOWSTONE_DUST: SPLASH_POTION_OF_BLINDNESS_II REDSTONE: SPLASH_POTION_OF_BLINDNESS_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_BLINDNESS + DRAGON_BREATH: LINGERING_POTION_OF_BLINDNESS SPLASH_POTION_OF_DECAY: Name: Splash Potion Of Decay Material: SPLASH_POTION @@ -963,7 +963,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["WITHER 0 337"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_DECAY + DRAGON_BREATH: LINGERING_POTION_OF_DECAY GLOWSTONE_DUST: SPLASH_POTION_OF_DECAY_II REDSTONE: SPLASH_POTION_OF_DECAY_EXTENDED SPLASH_POTION_OF_DULLNESS: @@ -974,7 +974,7 @@ Potions: Effects: ["SLOW_DIGGING 0 2700"] Children: GLOWSTONE_DUST: SPLASH_POTION_OF_DULLNESS_II - DRAGONS_BREATH: LINGERING_POTION_OF_DULLNESS + DRAGON_BREATH: LINGERING_POTION_OF_DULLNESS REDSTONE: SPLASH_POTION_OF_DULLNESS_EXTENDED SPLASH_POTION_OF_HASTE: Name: Splash Potion Of Haste @@ -984,7 +984,7 @@ Potions: Effects: ["FAST_DIGGING 0 2700"] Children: GLOWSTONE_DUST: SPLASH_POTION_OF_HASTE_II - DRAGONS_BREATH: LINGERING_POTION_OF_HASTE + DRAGON_BREATH: LINGERING_POTION_OF_HASTE REDSTONE: SPLASH_POTION_OF_HASTE_EXTENDED SPLASH_POTION_OF_HEALTH_BOOST: Name: Splash Potion Of Health Boost @@ -994,7 +994,7 @@ Potions: Effects: ["HEALTH_BOOST 0 1350"] Children: REDSTONE: SPLASH_POTION_OF_HEALTH_BOOST_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_HEALTH_BOOST + DRAGON_BREATH: LINGERING_POTION_OF_HEALTH_BOOST GLOWSTONE_DUST: SPLASH_POTION_OF_HEALTH_BOOST_II SPLASH_POTION_OF_HUNGER: Name: Splash Potion Of Hunger @@ -1005,7 +1005,7 @@ Potions: Children: GLOWSTONE_DUST: SPLASH_POTION_OF_HUNGER_II REDSTONE: SPLASH_POTION_OF_HUNGER_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_HUNGER + DRAGON_BREATH: LINGERING_POTION_OF_HUNGER SPLASH_POTION_OF_NAUSEA: Name: Splash Potion Of Nausea Material: SPLASH_POTION @@ -1015,7 +1015,7 @@ Potions: Children: GLOWSTONE_DUST: SPLASH_POTION_OF_NAUSEA_II REDSTONE: SPLASH_POTION_OF_NAUSEA_EXTENDED - DRAGONS_BREATH: LINGERING_POTION_OF_NAUSEA + DRAGON_BREATH: LINGERING_POTION_OF_NAUSEA SPLASH_POTION_OF_RESISTANCE: Name: Splash Potion Of Resistance Material: SPLASH_POTION @@ -1023,7 +1023,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["DAMAGE_RESISTANCE 0 337"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_RESISTANCE + DRAGON_BREATH: LINGERING_POTION_OF_RESISTANCE REDSTONE: SPLASH_POTION_OF_RESISTANCE_EXTENDED GLOWSTONE_DUST: SPLASH_POTION_OF_RESISTANCE_II SPLASH_POTION_OF_SATURATION: @@ -1035,7 +1035,7 @@ Potions: Children: REDSTONE: SPLASH_POTION_OF_SATURATION_EXTENDED GLOWSTONE_DUST: SPLASH_POTION_OF_SATURATION_II - DRAGONS_BREATH: LINGERING_POTION_OF_SATURATION + DRAGON_BREATH: LINGERING_POTION_OF_SATURATION SPLASH_POTION_OF_ABSORPTION_EXTENDED: Name: Splash Potion Of Absorption Extended Material: SPLASH_POTION @@ -1043,7 +1043,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["ABSORPTION 0 2700"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_ABSORPTION_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_ABSORPTION_EXTENDED SPLASH_POTION_OF_BLINDNESS_EXTENDED: Name: Splash Potion Of Blindness Extended Material: SPLASH_POTION @@ -1051,7 +1051,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["BLINDNESS 0 336"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_BLINDNESS_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_BLINDNESS_EXTENDED SPLASH_POTION_OF_DECAY_EXTENDED: Name: Splash Potion Of Decay Extended Material: SPLASH_POTION @@ -1059,7 +1059,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["WITHER 0 674"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_DECAY_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_DECAY_EXTENDED SPLASH_POTION_OF_DULLNESS_EXTENDED: Name: Splash Potion Of Dullness Extended Material: SPLASH_POTION @@ -1067,7 +1067,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SLOW_DIGGING 0 5400"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_DULLNESS_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_DULLNESS_EXTENDED SPLASH_POTION_OF_HASTE_EXTENDED: Name: Splash Potion Of Haste Extended Material: SPLASH_POTION @@ -1075,7 +1075,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["FAST_DIGGING 0 5400"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HASTE_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_HASTE_EXTENDED SPLASH_POTION_OF_HEALTH_BOOST_EXTENDED: Name: Splash Potion Of Health Boost Extended Material: SPLASH_POTION @@ -1083,7 +1083,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HEALTH_BOOST 0 2700"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HEALTH_BOOST_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_HEALTH_BOOST_EXTENDED SPLASH_POTION_OF_HUNGER_EXTENDED: Name: Splash Potion Of Hunger Extended Material: SPLASH_POTION @@ -1091,7 +1091,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HUNGER 0 1350"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HUNGER_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_HUNGER_EXTENDED SPLASH_POTION_OF_NAUSEA_EXTENDED: Name: Splash Potion Of Nausea Extended Material: SPLASH_POTION @@ -1099,7 +1099,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["CONFUSION 0 674"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_NAUSEA_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_NAUSEA_EXTENDED SPLASH_POTION_OF_RESISTANCE_EXTENDED: Name: Splash Potion Of Resistance Extended Material: SPLASH_POTION @@ -1107,7 +1107,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["DAMAGE_RESISTANCE 0 674"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_RESISTANCE_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_RESISTANCE_EXTENDED SPLASH_POTION_OF_SATURATION_EXTENDED: Name: Splash Potion Of Saturation Extended Material: SPLASH_POTION @@ -1115,7 +1115,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SATURATION 0 12"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_SATURATION_EXTENDED + DRAGON_BREATH: LINGERING_POTION_OF_SATURATION_EXTENDED SPLASH_POTION_OF_ABSORPTION_II: Name: Splash Potion Of Absorption II Material: SPLASH_POTION @@ -1123,7 +1123,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["ABSORPTION 1 675"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_ABSORPTION_II + DRAGON_BREATH: LINGERING_POTION_OF_ABSORPTION_II SPLASH_POTION_OF_BLINDNESS_II: Name: Splash Potion Of Blindness II Material: SPLASH_POTION @@ -1131,7 +1131,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["BLINDNESS 1 84"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_BLINDNESS_II + DRAGON_BREATH: LINGERING_POTION_OF_BLINDNESS_II SPLASH_POTION_OF_DECAY_II: Name: Splash Potion Of Decay II Material: SPLASH_POTION @@ -1139,7 +1139,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["WITHER 1 168"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_DECAY_II + DRAGON_BREATH: LINGERING_POTION_OF_DECAY_II SPLASH_POTION_OF_DULLNESS_II: Name: Splash Potion Of Dullness II Material: SPLASH_POTION @@ -1147,7 +1147,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SLOW_DIGGING 1 1350"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_DULLNESS_II + DRAGON_BREATH: LINGERING_POTION_OF_DULLNESS_II SPLASH_POTION_OF_HASTE_II: Name: Splash Potion Of Haste II Material: SPLASH_POTION @@ -1155,7 +1155,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["FAST_DIGGING 1 1350"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HASTE_II + DRAGON_BREATH: LINGERING_POTION_OF_HASTE_II SPLASH_POTION_OF_HEALTH_BOOST_II: Name: Splash Potion Of Health Boost II Material: SPLASH_POTION @@ -1163,7 +1163,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HEALTH_BOOST 1 675"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HEALTH_BOOST_II + DRAGON_BREATH: LINGERING_POTION_OF_HEALTH_BOOST_II SPLASH_POTION_OF_HUNGER_II: Name: Splash Potion Of Hunger II Material: SPLASH_POTION @@ -1171,7 +1171,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["HUNGER 1 337"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_HUNGER_II + DRAGON_BREATH: LINGERING_POTION_OF_HUNGER_II SPLASH_POTION_OF_NAUSEA_II: Name: Splash Potion Of Nausea II Material: SPLASH_POTION @@ -1179,7 +1179,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["CONFUSION 1 168"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_NAUSEA_II + DRAGON_BREATH: LINGERING_POTION_OF_NAUSEA_II SPLASH_POTION_OF_RESISTANCE_II: Name: Splash Potion Of Resistance II Material: SPLASH_POTION @@ -1187,7 +1187,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["DAMAGE_RESISTANCE 1 168"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_RESISTANCE_II + DRAGON_BREATH: LINGERING_POTION_OF_RESISTANCE_II SPLASH_POTION_OF_SATURATION_II: Name: Splash Potion Of Saturation II Material: SPLASH_POTION @@ -1195,7 +1195,7 @@ Potions: PotionType: UNCRAFTABLE Effects: ["SATURATION 1 3"] Children: - DRAGONS_BREATH: LINGERING_POTION_OF_SATURATION_II + DRAGON_BREATH: LINGERING_POTION_OF_SATURATION_II LINGERING_POTION_OF_EMPTY: Material: LINGERING_POTION PotionData: @@ -1205,7 +1205,7 @@ Potions: PotionData: PotionType: WATER Children: - NETHER_STALK: LINGERING_POTION_OF_AWKWARD + NETHER_WART: LINGERING_POTION_OF_AWKWARD MAGMA_CREAM: LINGERING_POTION_OF_MUNDANE BLAZE_POWDER: LINGERING_POTION_OF_MUNDANE RABBIT_FOOT: LINGERING_POTION_OF_MUNDANE @@ -1213,7 +1213,7 @@ Potions: GLOWSTONE_DUST: LINGERING_POTION_OF_THICK SPIDER_EYE: LINGERING_POTION_OF_MUNDANE REDSTONE: LINGERING_POTION_OF_MUNDANE - SPECKLED_MELON: LINGERING_POTION_OF_MUNDANE + GLISTERING_MELON_SLICE: LINGERING_POTION_OF_MUNDANE FERMENTED_SPIDER_EYE: LINGERING_POTION_OF_WEAKNESS GHAST_TEAR: LINGERING_POTION_OF_MUNDANE LINGERING_POTION_OF_MUNDANE: @@ -1231,22 +1231,22 @@ Potions: Children: ROTTEN_FLESH: LINGERING_POTION_OF_HUNGER APPLE: LINGERING_POTION_OF_HEALTH_BOOST - CARROT_ITEM: LINGERING_POTION_OF_HASTE + CARROT: LINGERING_POTION_OF_HASTE SPIDER_EYE: LINGERING_POTION_OF_POISON GOLDEN_CARROT: LINGERING_POTION_OF_NIGHT_VISION BLAZE_POWDER: LINGERING_POTION_OF_STRENGTH GHAST_TEAR: LINGERING_POTION_OF_REGENERATION - 'RAW_FISH:3': LINGERING_POTION_OF_WATER_BREATHING + PUFFERFISH: LINGERING_POTION_OF_WATER_BREATHING BROWN_MUSHROOM: LINGERING_POTION_OF_NAUSEA - SPECKLED_MELON: LINGERING_POTION_OF_HEALING + GLISTERING_MELON_SLICE: LINGERING_POTION_OF_HEALING GOLDEN_APPLE: LINGERING_POTION_OF_RESISTANCE RABBIT_FOOT: LINGERING_POTION_OF_LEAPING MAGMA_CREAM: LINGERING_POTION_OF_FIRE_RESISTANCE QUARTZ: LINGERING_POTION_OF_ABSORPTION SLIME_BALL: LINGERING_POTION_OF_DULLNESS - 'LONG_GRASS:2': LINGERING_POTION_OF_SATURATION + FERN: LINGERING_POTION_OF_SATURATION SUGAR: LINGERING_POTION_OF_SWIFTNESS - INK_SACK: LINGERING_POTION_OF_BLINDNESS + INK_SAC: LINGERING_POTION_OF_BLINDNESS POISONOUS_POTATO: LINGERING_POTION_OF_DECAY LINGERING_POTION_OF_NIGHT_VISION: Material: LINGERING_POTION diff --git a/src/main/resources/repair.vanilla.yml b/src/main/resources/repair.vanilla.yml index a491f5660..a270791ab 100644 --- a/src/main/resources/repair.vanilla.yml +++ b/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 diff --git a/src/main/resources/salvage.vanilla.yml b/src/main/resources/salvage.vanilla.yml index fe1c76833..c7d943203 100644 --- a/src/main/resources/salvage.vanilla.yml +++ b/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 diff --git a/src/main/resources/treasures.yml b/src/main/resources/treasures.yml index 37d5b73fe..6d5bb8bd1 100755 --- a/src/main/resources/treasures.yml +++ b/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 diff --git a/src/util/java/mcMMO/PotionConfigGenerator.java b/src/util/java/mcMMO/PotionConfigGenerator.java index 6a5977671..e592a731f 100644 --- a/src/util/java/mcMMO/PotionConfigGenerator.java +++ b/src/util/java/mcMMO/PotionConfigGenerator.java @@ -347,10 +347,10 @@ public class PotionConfigGenerator { } for (Entry> 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> 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)); } } }