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

Formatting!

Browse source
This commit is contained in:
WayofTime 2016-04-05 16:16:17 -04:00
parent 029091852d
commit b56bbef29e
14 changed files with 57 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java
View file

@ -50,8 +50,7 @@ public class AlchemyArrayRecipeRegistry
if (eff != null)
{
return; // Recipe already exists!
}
else
} else
{
arrayRecipe.catalystMap.put(ItemStackWrapper.getHolder(catalystStack), arrayEffect);
if (circleRenderer != null)
@ -64,8 +63,7 @@ public class AlchemyArrayRecipeRegistry
if (circleRenderer == null)
{
recipes.put(input, new AlchemyArrayRecipe(input, catalystStack, arrayEffect, defaultRenderer));
}
else
} else
{
recipes.put(input, new AlchemyArrayRecipe(input, catalystStack, arrayEffect, circleRenderer));
}
@ -168,8 +166,7 @@ public class AlchemyArrayRecipeRegistry
{
if (ItemStackWrapper.getHolder(arrayRecipe.getInput().get(0)).equals(ItemStackWrapper.getHolder(input.get(0))))
return arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack); // TODO: Decide if a copy should be returned.
}
else
} else
{
if (input.equals(arrayRecipe.getInput()))
return arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack);
@ -235,8 +232,8 @@ public class AlchemyArrayRecipeRegistry
}
/**
* Compares the inputed list of ItemStacks to see if it matches with the recipe's
* list.
* Compares the inputed list of ItemStacks to see if it matches with the
* recipe's list.
*
* @param comparedList
* - The list to compare with

18
src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java
View file

@ -18,11 +18,13 @@ public class AltarRecipeRegistry
private static BiMap<List<ItemStack>, AltarRecipe> recipes = HashBiMap.create();
/**
* Registers an {@link AltarRecipe} for the Blood Altar. This can be a {@code ItemStack}, {@code List<Itemstack>},
* or {@code String} OreDictionary entry.
*
* If the OreDictionary entry does not exist or is empty, it will not be registered.
*
* Registers an {@link AltarRecipe} for the Blood Altar. This can be a
* {@code ItemStack}, {@code List<Itemstack>}, or {@code String}
* OreDictionary entry.
*
* If the OreDictionary entry does not exist or is empty, it will not be
* registered.
*
* @param altarRecipe
* - The AltarRecipe to register
*/
@ -41,9 +43,9 @@ public class AltarRecipeRegistry
/**
* Gets the recipe that the provided input is registered to.
*
*
* @param input
* - The input ItemStack to get the recipe for
* - The input ItemStack to get the recipe for
* @return - The recipe that the provided input is registered to.
*/
public static AltarRecipe getRecipeForInput(List<ItemStack> input)
@ -76,7 +78,7 @@ public class AltarRecipeRegistry
* {@link WayofTime.bloodmagic.tile.TileAltar}. The output ItemStack is
* allowed to be null as some recipes do not contain an output. (Blood
* Orbs)
*
*
* @param input
* - The input ItemStack
* @param output