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

Formatted the code - Release state for Blood Magic 1.8.9-2.0.0-1

Browse source
This commit is contained in:
WayofTime 2016-01-02 17:56:37 -05:00
parent d1ff8c6d4f
commit 71421b7d88
38 changed files with 223 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java
View file

@ -39,9 +39,9 @@ public abstract class AreaDescriptor
* (1,1,1), calling getContainedPositions() will only give (0,0,0).
*
* @param minimumOffset
* -
* -
* @param maximumOffset
* -
* -
*/
public Rectangle(BlockPos minimumOffset, BlockPos maximumOffset)
{
@ -95,9 +95,9 @@ public abstract class AreaDescriptor
* minimumOffset the lowest corner
*
* @param offset1
* -
* -
* @param offset2
* -
* -
*/
public void setOffsets(BlockPos offset1, BlockPos offset2)
{

8
src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
View file

@ -8,7 +8,13 @@ import java.util.Locale;
public enum EnumRuneType implements IStringSerializable
{
BLANK, WATER, FIRE, EARTH, AIR, DUSK, DAWN;
BLANK,
WATER,
FIRE,
EARTH,
AIR,
DUSK,
DAWN;
public static EnumRuneType byMetadata(int meta)
{

25
src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java
View file

@ -34,11 +34,11 @@ public abstract class Ritual
/**
* @param name
* - The name of the ritual
* - The name of the ritual
* @param crystalLevel
* - Required Activation Crystal tier
* - Required Activation Crystal tier
* @param activationCost
* - Base LP cost for activating the ritual
* - Base LP cost for activating the ritual
*/
public Ritual(String name, int crystalLevel, int activationCost, String unlocalizedName)
{
@ -51,9 +51,9 @@ public abstract class Ritual
* {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, EntityPlayer, Ritual)}
*
* @param masterRitualStone
* - The {@link IMasterRitualStone} that the ritual is bound to
* - The {@link IMasterRitualStone} that the ritual is bound to
* @param player
* - The activating player
* - The activating player
* @return - Whether activation was successful
*/
public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player)
@ -67,7 +67,7 @@ public abstract class Ritual
* {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos)}
*
* @param masterRitualStone
* - The {@link IMasterRitualStone} that the ritual is bound to
* - The {@link IMasterRitualStone} that the ritual is bound to
*/
public abstract void performRitual(IMasterRitualStone masterRitualStone);
@ -77,9 +77,9 @@ public abstract class Ritual
* {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(BreakType)}
*
* @param masterRitualStone
* - The {@link IMasterRitualStone} that the ritual is bound to
* - The {@link IMasterRitualStone} that the ritual is bound to
* @param breakType
* - The type of break that caused the stoppage.
* - The type of break that caused the stoppage.
*/
public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType)
{
@ -114,7 +114,7 @@ public abstract class Ritual
* Used to grab the range of a ritual for a given effect.
*
* @param range
* - Range that needs to be pulled.
* - Range that needs to be pulled.
* @return -
*/
public AreaDescriptor getBlockRange(String range)
@ -162,7 +162,12 @@ public abstract class Ritual
public enum BreakType
{
REDSTONE, BREAK_MRS, BREAK_STONE, ACTIVATE, DEACTIVATE, EXPLOSION,
REDSTONE,
BREAK_MRS,
BREAK_STONE,
ACTIVATE,
DEACTIVATE,
EXPLOSION,
}
public abstract Ritual getNewCopy();

11
src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java
View file

@ -27,11 +27,11 @@ public abstract class ImperfectRitual
/**
* @param name
* - The name of the ritual
* - The name of the ritual
* @param requiredBlock
* - The block required above the ImperfectRitualStone
* - The block required above the ImperfectRitualStone
* @param activationCost
* - Base LP cost for activating the ritual
* - Base LP cost for activating the ritual
*/
public ImperfectRitual(String name, BlockStack requiredBlock, int activationCost, String unlocalizedName)
{
@ -43,10 +43,9 @@ public abstract class ImperfectRitual
* {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, BlockPos, ImperfectRitual, EntityPlayer)}
*
* @param imperfectRitualStone
* - The {@link IImperfectRitualStone} that the ritual is bound
* to
* - The {@link IImperfectRitualStone} that the ritual is bound to
* @param player
* - The player activating the ritual
* - The player activating the ritual
* @return - Whether activation was successful
*/
public abstract boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player);