From 538a0c5d6cf8d4b4f323d64bffcd97cde5598829 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 21 Mar 2016 14:38:58 -0400 Subject: [PATCH 1/2] Fixes Stage 1 Potions The 'NETHER_WARTS' material enum should be 'NETHER_STALK' to represent the actual item. Adds Dragon's Breath as Tier 1 Ingredient so lingering potions are actually validated as an mcMMO brew. Adds second type of Potion of Water to support water potions that are spawned in via commands or other plugins. --- src/main/resources/potions.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/resources/potions.yml b/src/main/resources/potions.yml index ae6a1a090..212b41cee 100644 --- a/src/main/resources/potions.yml +++ b/src/main/resources/potions.yml @@ -18,6 +18,7 @@ Concoctions: - SULPHUR - WATER_LILY - 'RAW_FISH:3' + - 'DRAGONS_BREATH' Tier_Two_Ingredients: - CARROT_ITEM - SLIME_BALL @@ -69,7 +70,24 @@ Potions: SUGAR: POTION_OF_MUNDANE FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS SULPHUR: SPLASH_POTION_OF_WATER - NETHER_WARTS: POTION_OF_AWKWARD + NETHER_STALK: POTION_OF_AWKWARD + REDSTONE: POTION_OF_MUNDANE + SPECKLED_MELON: POTION_OF_MUNDANE + BLAZE_POWDER: POTION_OF_MUNDANE + MAGMA_CREAM: POTION_OF_MUNDANE + RABBIT_FOOT: POTION_OF_MUNDANE + GLOWSTONE_DUST: POTION_OF_THICK + POTION_OF_WATER_UNCRAFTABLE: + Material: POTION + PotionData: + PotionType: UNCRAFTABLE + Children: + SPIDER_EYE: POTION_OF_MUNDANE + 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 REDSTONE: POTION_OF_MUNDANE SPECKLED_MELON: POTION_OF_MUNDANE BLAZE_POWDER: POTION_OF_MUNDANE @@ -636,7 +654,7 @@ Potions: FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_WEAKNESS SPIDER_EYE: SPLASH_POTION_OF_MUNDANE BLAZE_POWDER: SPLASH_POTION_OF_MUNDANE - NETHER_WARTS: SPLASH_POTION_OF_AWKWARD + NETHER_STALK: SPLASH_POTION_OF_AWKWARD SUGAR: SPLASH_POTION_OF_MUNDANE SPLASH_POTION_OF_MUNDANE: Material: SPLASH_POTION @@ -1186,7 +1204,7 @@ Potions: PotionData: PotionType: WATER Children: - NETHER_WARTS: LINGERING_POTION_OF_AWKWARD + NETHER_STALK: LINGERING_POTION_OF_AWKWARD MAGMA_CREAM: LINGERING_POTION_OF_MUNDANE BLAZE_POWDER: LINGERING_POTION_OF_MUNDANE RABBIT_FOOT: LINGERING_POTION_OF_MUNDANE From c5970e924635d61e0ceb83c553521a7e294e7467 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 21 Mar 2016 14:42:57 -0400 Subject: [PATCH 2/2] Ensure NETHER_WARTS are renamed to NETHER_STALK --- src/util/java/mcMMO/PotionConfigGenerator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/java/mcMMO/PotionConfigGenerator.java b/src/util/java/mcMMO/PotionConfigGenerator.java index ccd6c26f1..6a5977671 100644 --- a/src/util/java/mcMMO/PotionConfigGenerator.java +++ b/src/util/java/mcMMO/PotionConfigGenerator.java @@ -62,6 +62,9 @@ public class PotionConfigGenerator { this.mat = type; this.baseName = baseName; this.name = "POTION_OF_" + baseName; + if(mat == Material.NETHER_WARTS){ + this.mat = Material.NETHER_STALK; + } if (mat == Material.SPLASH_POTION) { this.name = "SPLASH_" + this.name; } @@ -357,7 +360,7 @@ public class PotionConfigGenerator { case WATER : assert(!current.data.isExtended()); assert(!current.data.isUpgraded()); - children.put(new Ingredient(Material.NETHER_WARTS), new WriteablePotion(current.mat, PotionType.AWKWARD)); + children.put(new Ingredient(Material.NETHER_STALK), new WriteablePotion(current.mat, PotionType.AWKWARD)); children.put(new Ingredient(Material.FERMENTED_SPIDER_EYE), new WriteablePotion(current.mat, PotionType.WEAKNESS)); children.put(new Ingredient(Material.REDSTONE), new WriteablePotion(current.mat, PotionType.MUNDANE)); children.put(new Ingredient(Material.GLOWSTONE_DUST), new WriteablePotion(current.mat, PotionType.THICK));