EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 05:36:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2850 from DylanCare/master

Browse Source 
Fixes Alchemy for Stage 1 Potions and Lingering
This commit is contained in:
t00thpick1 2016-03-23 21:21:51 -05:00
commit 321fcd7b84
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/resources/potions.yml
View File

@ -18,6 +18,7 @@ Concoctions:
- SULPHUR - SULPHUR
- WATER_LILY - WATER_LILY
- 'RAW_FISH:3' - 'RAW_FISH:3'
- 'DRAGONS_BREATH'
Tier_Two_Ingredients: Tier_Two_Ingredients:
- CARROT_ITEM - CARROT_ITEM
- SLIME_BALL - SLIME_BALL
@ -69,7 +70,24 @@ Potions:
SUGAR: POTION_OF_MUNDANE SUGAR: POTION_OF_MUNDANE
FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS FERMENTED_SPIDER_EYE: POTION_OF_WEAKNESS
SULPHUR: SPLASH_POTION_OF_WATER 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 REDSTONE: POTION_OF_MUNDANE
SPECKLED_MELON: POTION_OF_MUNDANE SPECKLED_MELON: POTION_OF_MUNDANE
BLAZE_POWDER: POTION_OF_MUNDANE BLAZE_POWDER: POTION_OF_MUNDANE
@ -636,7 +654,7 @@ Potions:
FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_WEAKNESS FERMENTED_SPIDER_EYE: SPLASH_POTION_OF_WEAKNESS
SPIDER_EYE: SPLASH_POTION_OF_MUNDANE SPIDER_EYE: SPLASH_POTION_OF_MUNDANE
BLAZE_POWDER: 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 SUGAR: SPLASH_POTION_OF_MUNDANE
SPLASH_POTION_OF_MUNDANE: SPLASH_POTION_OF_MUNDANE:
Material: SPLASH_POTION Material: SPLASH_POTION
@ -1186,7 +1204,7 @@ Potions:
PotionData: PotionData:
PotionType: WATER PotionType: WATER
Children: Children:
NETHER_WARTS: LINGERING_POTION_OF_AWKWARD NETHER_STALK: LINGERING_POTION_OF_AWKWARD
MAGMA_CREAM: LINGERING_POTION_OF_MUNDANE MAGMA_CREAM: LINGERING_POTION_OF_MUNDANE
BLAZE_POWDER: LINGERING_POTION_OF_MUNDANE BLAZE_POWDER: LINGERING_POTION_OF_MUNDANE
RABBIT_FOOT: LINGERING_POTION_OF_MUNDANE RABBIT_FOOT: LINGERING_POTION_OF_MUNDANE

5
src/util/java/mcMMO/PotionConfigGenerator.java
View File

@ -62,6 +62,9 @@ public class PotionConfigGenerator {
this.mat = type; this.mat = type;
this.baseName = baseName; this.baseName = baseName;
this.name = "POTION_OF_" + baseName; this.name = "POTION_OF_" + baseName;
if(mat == Material.NETHER_WARTS){
this.mat = Material.NETHER_STALK;
}
if (mat == Material.SPLASH_POTION) { if (mat == Material.SPLASH_POTION) {
this.name = "SPLASH_" + this.name; this.name = "SPLASH_" + this.name;
} }
@ -357,7 +360,7 @@ public class PotionConfigGenerator {
case WATER : case WATER :
assert(!current.data.isExtended()); assert(!current.data.isExtended());
assert(!current.data.isUpgraded()); 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.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.REDSTONE), new WriteablePotion(current.mat, PotionType.MUNDANE));
children.put(new Ingredient(Material.GLOWSTONE_DUST), new WriteablePotion(current.mat, PotionType.THICK)); children.put(new Ingredient(Material.GLOWSTONE_DUST), new WriteablePotion(current.mat, PotionType.THICK));