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

Normalized code formatting.

Browse source
This commit is contained in:
WayofTime 2016-03-16 18:41:06 -04:00
parent b1db7c5152
commit 134b11f177
122 changed files with 944 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,11 +162,12 @@ public class AlchemyArrayRecipeRegistry
* inputStack.
*
* @param comparedStack
* - The stack to compare with
*
* - The stack to compare with
*
* @return - True if the ItemStack is a compatible item
*/
public boolean doesInputMatchRecipe(ItemStack comparedStack) {
public boolean doesInputMatchRecipe(ItemStack comparedStack)
{
return !(comparedStack == null || this.inputStack == null) && this.inputStack.isItemEqual(comparedStack);
}
@ -175,7 +176,7 @@ public class AlchemyArrayRecipeRegistry
*
* @param comparedStack
* The catalyst that is being checked
*
*
* @return - The effect
*/
public AlchemyArrayEffect getAlchemyArrayEffectForCatalyst(@Nullable ItemStack comparedStack)
@ -198,7 +199,8 @@ public class AlchemyArrayRecipeRegistry
}
}
public static BiMap<ItemStackWrapper, AlchemyArrayRecipe> getRecipes() {
public static BiMap<ItemStackWrapper, AlchemyArrayRecipe> getRecipes()
{
return HashBiMap.create(recipes);
}
}

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

@ -93,7 +93,8 @@ public class AltarRecipeRegistry
}
}
public static BiMap<ItemStack, AltarRecipe> getRecipes() {
public static BiMap<ItemStack, AltarRecipe> getRecipes()
{
return HashBiMap.create(recipes);
}
}

66
src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java
View file

@ -22,9 +22,9 @@ public class HarvestRegistry
/**
* Registers a handler for the Harvest Ritual to call.
*
*
* @param handler
* - The custom handler to register
* - The custom handler to register
*/
public static void registerHandler(IHarvestHandler handler)
{
@ -33,15 +33,16 @@ public class HarvestRegistry
}
/**
* Registers a standard crop (IE: Wheat, Carrots, Potatoes, Netherwart, etc) for
* the {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable} handler
* to handle.
*
* Registers a standard crop (IE: Wheat, Carrots, Potatoes, Netherwart, etc)
* for the
* {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable}
* handler to handle.
*
* @param crop
* - The crop block to handle.
* - The crop block to handle.
* @param matureMeta
* - The meta value at which the crop is considered mature
* and ready to be harvested.
* - The meta value at which the crop is considered mature and ready
* to be harvested.
*/
public static void registerStandardCrop(Block crop, int matureMeta)
{
@ -51,11 +52,11 @@ public class HarvestRegistry
/**
* Registers a tall crop (Sugar Cane and Cactus) for the
* {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall} handler
* to handle.
*
* {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall} handler to
* handle.
*
* @param crop
* - The crop block to handle.
* - The crop block to handle.
*/
public static void registerTallCrop(BlockStack crop)
{
@ -65,18 +66,18 @@ public class HarvestRegistry
/**
* Registers a stem crop (Melon and Pumpkin) for the
* {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem} handler
* to handle.
*
* Use {@link net.minecraftforge.oredict.OreDictionary#WILDCARD_VALUE} to accept
* any meta for the crop block.
*
* {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem} handler to
* handle.
*
* Use {@link net.minecraftforge.oredict.OreDictionary#WILDCARD_VALUE} to
* accept any meta for the crop block.
*
* The Stem must be instanceof {@link BlockStem}
*
*
* @param crop
* - The crop block to handle.
* - The crop block to handle.
* @param stem
* - The stem of the crop
* - The stem of the crop
*/
public static void registerStemCrop(BlockStack crop, BlockStack stem)
{
@ -86,11 +87,11 @@ public class HarvestRegistry
/**
* Registers a range amplifier for the Harvest Ritual.
*
*
* @param blockStack
* - The block for the amplifier.
* - The block for the amplifier.
* @param range
* - The range the amplifier provides.
* - The range the amplifier provides.
*/
public static void registerRangeAmplifier(BlockStack blockStack, int range)
{
@ -98,23 +99,28 @@ public class HarvestRegistry
amplifierMap.put(blockStack, range);
}
public static List<IHarvestHandler> getHandlerList() {
public static List<IHarvestHandler> getHandlerList()
{
return new ArrayList<IHarvestHandler>(handlerList);
}
public static Map<Block, Integer> getStandardCrops() {
public static Map<Block, Integer> getStandardCrops()
{
return new HashMap<Block, Integer>(standardCrops);
}
public static Set<BlockStack> getTallCrops() {
public static Set<BlockStack> getTallCrops()
{
return new HashSet<BlockStack>(tallCrops);
}
public static Map<BlockStack, BlockStack> getStemCrops() {
public static Map<BlockStack, BlockStack> getStemCrops()
{
return new HashMap<BlockStack, BlockStack>(stemCrops);
}
public static Map<BlockStack, Integer> getAmplifierMap() {
public static Map<BlockStack, Integer> getAmplifierMap()
{
return new HashMap<BlockStack, Integer>(amplifierMap);
}
}

3
src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java
View file

@ -94,7 +94,8 @@ public class ImperfectRitualRegistry
}
}
public static boolean ritualEnabled(String id) {
public static boolean ritualEnabled(String id)
{
return ritualEnabled(getRitualForId(id));
}

9
src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
View file

@ -37,8 +37,7 @@ public class OrbRegistry
{
orbs.add(orb);
registerOrbForTier(orb.getTier(), getOrbStack(orb));
}
else
} else
BloodMagicAPI.getLogger().error("Error adding orb %s. Orb already exists!", orb.toString());
}
@ -110,11 +109,13 @@ public class OrbRegistry
return new ItemStack(orbItem, 1, getIndexOf(orb));
}
public static List<BloodOrb> getOrbs() {
public static List<BloodOrb> getOrbs()
{
return new ArrayList<BloodOrb>(orbs);
}
public static ArrayListMultimap<Integer, ItemStack> getTierMap() {
public static ArrayListMultimap<Integer, ItemStack> getTierMap()
{
return ArrayListMultimap.create(tierMap);
}
}

3
src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java
View file

@ -91,7 +91,8 @@ public class RitualRegistry
}
}
public static boolean ritualEnabled(String id) {
public static boolean ritualEnabled(String id)
{
return ritualEnabled(getRitualForId(id));
}

3
src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java
View file

@ -35,7 +35,8 @@ public class TartaricForgeRecipeRegistry
return null;
}
public static List<TartaricForgeRecipe> getRecipeList() {
public static List<TartaricForgeRecipe> getRecipeList()
{
return new ArrayList<TartaricForgeRecipe>(recipeList);
}
}