Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Took care of the case of the mundane splash potions

Browse source
This commit is contained in:
pahimar 2013-06-28 11:07:13 -04:00
parent edb489bdd4
commit 2d95d550a4
1 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ee3_common/com/pahimar/ee3/item/crafting/RecipesPotions.java
View file

@ -28,8 +28,10 @@ public class RecipesPotions {
public static ItemStack bottleWater = new ItemStack(Item.potion.itemID, 1, 0); public static ItemStack bottleWater = new ItemStack(Item.potion.itemID, 1, 0);
public static ItemStack potionAwkward = new ItemStack(Item.potion.itemID, 1, 16); public static ItemStack potionAwkward = new ItemStack(Item.potion.itemID, 1, 16);
public static ItemStack potionThick = new ItemStack(Item.potion.itemID, 1, 32); public static ItemStack potionThick = new ItemStack(Item.potion.itemID, 1, 32);
public static ItemStack potionMundaneBase = new ItemStack(Item.potion.itemID, 1, 64); public static ItemStack potionMundane = new ItemStack(Item.potion.itemID, 1, 128);
public static ItemStack potionMundaneExtended = new ItemStack(Item.potion.itemID, 1, 128); public static ItemStack potionMundaneExtended = new ItemStack(Item.potion.itemID, 1, 64);
public static ItemStack potionMundaneSplash = new ItemStack(Item.potion.itemID, 1, 16512);
public static ItemStack potionMundaneSplashExtended = new ItemStack(Item.potion.itemID, 1, 16448);
public static ItemStack potionRegeneration = new ItemStack(Item.potion.itemID, 1, 8193); public static ItemStack potionRegeneration = new ItemStack(Item.potion.itemID, 1, 8193);
public static ItemStack potionRegenerationEnhanced = new ItemStack(Item.potion.itemID, 1, 8225); public static ItemStack potionRegenerationEnhanced = new ItemStack(Item.potion.itemID, 1, 8225);
@ -225,12 +227,13 @@ public class RecipesPotions {
potionRecipes.put(potionWeakness, Arrays.asList(potionRegenerationEnhanced, fermentedSpiderEye)); potionRecipes.put(potionWeakness, Arrays.asList(potionRegenerationEnhanced, fermentedSpiderEye));
potionRecipes.put(potionWeakness, Arrays.asList(potionStrength, fermentedSpiderEye)); potionRecipes.put(potionWeakness, Arrays.asList(potionStrength, fermentedSpiderEye));
potionRecipes.put(potionWeakness, Arrays.asList(potionStrengthEnhanced, fermentedSpiderEye)); potionRecipes.put(potionWeakness, Arrays.asList(potionStrengthEnhanced, fermentedSpiderEye));
potionRecipes.put(potionWeakness, Arrays.asList(potionMundaneBase, fermentedSpiderEye)); potionRecipes.put(potionWeakness, Arrays.asList(potionMundane, fermentedSpiderEye));
potionRecipes.put(potionWeakness, Arrays.asList(potionWeaknessExtended, glowstoneDust)); potionRecipes.put(potionWeakness, Arrays.asList(potionWeaknessExtended, glowstoneDust));
potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionRegenerationSplash, fermentedSpiderEye)); potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionRegenerationSplash, fermentedSpiderEye));
potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionRegenerationSplashEnhanced, fermentedSpiderEye)); potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionRegenerationSplashEnhanced, fermentedSpiderEye));
potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionStrengthSplash, fermentedSpiderEye)); potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionStrengthSplash, fermentedSpiderEye));
potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionStrengthSplashEnhanced, fermentedSpiderEye)); potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionStrengthSplashEnhanced, fermentedSpiderEye));
potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionMundaneSplash, fermentedSpiderEye));
potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionWeaknessSplashExtended, glowstoneDust)); potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionWeaknessSplashExtended, glowstoneDust));
potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionWeakness, gunpowder)); potionRecipes.put(potionWeaknessSplash, Arrays.asList(potionWeakness, gunpowder));
@ -241,8 +244,7 @@ public class RecipesPotions {
potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionWeaknessSplash, redstoneDust)); potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionWeaknessSplash, redstoneDust));
potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionRegenerationSplashExtended, fermentedSpiderEye)); potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionRegenerationSplashExtended, fermentedSpiderEye));
potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionStrengthSplashExtended, fermentedSpiderEye)); potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionStrengthSplashExtended, fermentedSpiderEye));
// TODO Figure out the meta for the mundane splash potions potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionMundaneSplashExtended, fermentedSpiderEye));
// potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionMundaneSplashExtended, fermentedSpiderEye));
potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionWeaknessExtended, gunpowder)); potionRecipes.put(potionWeaknessSplashExtended, Arrays.asList(potionWeaknessExtended, gunpowder));
potionRecipes.put(potionStrength, Arrays.asList(potionAwkward, blazePowder)); potionRecipes.put(potionStrength, Arrays.asList(potionAwkward, blazePowder));
@ -262,14 +264,16 @@ public class RecipesPotions {
potionRecipes.put(potionThick, Arrays.asList(bottleWater, glowstoneDust)); potionRecipes.put(potionThick, Arrays.asList(bottleWater, glowstoneDust));
potionRecipes.put(potionMundaneBase, Arrays.asList(bottleWater, sugar)); potionRecipes.put(potionMundane, Arrays.asList(bottleWater, sugar));
potionRecipes.put(potionMundaneBase, Arrays.asList(bottleWater, glisteringMelon)); potionRecipes.put(potionMundane, Arrays.asList(bottleWater, glisteringMelon));
potionRecipes.put(potionMundaneBase, Arrays.asList(bottleWater, spiderEye)); potionRecipes.put(potionMundane, Arrays.asList(bottleWater, spiderEye));
potionRecipes.put(potionMundaneBase, Arrays.asList(bottleWater, blazePowder)); potionRecipes.put(potionMundane, Arrays.asList(bottleWater, blazePowder));
potionRecipes.put(potionMundaneBase, Arrays.asList(bottleWater, magmaCream)); potionRecipes.put(potionMundane, Arrays.asList(bottleWater, magmaCream));
potionRecipes.put(potionMundaneBase, Arrays.asList(bottleWater, ghastTear)); potionRecipes.put(potionMundane, Arrays.asList(bottleWater, ghastTear));
potionRecipes.put(potionMundaneSplash, Arrays.asList(potionMundane, gunpowder));
potionRecipes.put(potionMundaneExtended, Arrays.asList(bottleWater, redstoneDust)); potionRecipes.put(potionMundaneExtended, Arrays.asList(bottleWater, redstoneDust));
potionRecipes.put(potionMundaneSplashExtended, Arrays.asList(potionMundaneExtended, gunpowder));
return potionRecipes; return potionRecipes;
} }