lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made all item fields final

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-09-10 17:04:24 -07:00
parent 537ccc092c
commit 24b4c4b8d1
42 changed files with 445 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java
View file

@ -63,7 +63,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
{
if (inputStack == null)
{
ItemStack outputStack = new ItemStack(ModItems.potionFlask);
ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
List<PotionEffect> effectList = new ArrayList<PotionEffect>();
int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), lengthAugment, powerAugment - baseEffect.getAmplifier());
@ -103,7 +103,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
public static ItemStack getAugmentedPotionFlask(PotionEffect baseEffect)
{
ItemStack outputStack = new ItemStack(ModItems.potionFlask);
ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
List<PotionEffect> effectList = new ArrayList<PotionEffect>();
effectList.add(baseEffect);

8
src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java
View file

@ -16,7 +16,7 @@ import WayofTime.bloodmagic.registry.ModItems;
public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
{
public static final ItemStack basePotionFlaskStack = new ItemStack(ModItems.potionFlask, 1, OreDictionary.WILDCARD_VALUE);
public static final ItemStack basePotionFlaskStack = new ItemStack(ModItems.POTION_FLASK, 1, OreDictionary.WILDCARD_VALUE);
protected PotionEffect baseEffect;
public static final int temporaryMaximumEffectsOnThePotionFlaskYesThisIsALongFieldItIsJustSoIRemember = 3;
@ -53,7 +53,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
if (slot != null)
{
boolean match = slot.getItem() == ModItems.potionFlask;
boolean match = slot.getItem() == ModItems.POTION_FLASK;
if (match)
{
@ -105,7 +105,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
if (match)
{
if (next instanceof ItemStack && ((ItemStack) next).getItem() == ModItems.potionFlask)
if (next instanceof ItemStack && ((ItemStack) next).getItem() == ModItems.POTION_FLASK)
{
if (!isPotionFlaskValidInput(slot))
{
@ -152,7 +152,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
{
if (inputStack == null)
{
ItemStack outputStack = new ItemStack(ModItems.potionFlask);
ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
List<PotionEffect> effectList = new ArrayList<PotionEffect>();
effectList.add(baseEffect);