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

53
src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java
View file

@ -13,9 +13,9 @@ import WayofTime.bloodmagic.api.iface.IBindable;
public class BindableHelper
{
/**
* Sets the Owner Name of the item without checking if it is already bound. Also
* bypasses {@link ItemBindEvent}.
*
* Sets the Owner Name of the item without checking if it is already bound.
* Also bypasses {@link ItemBindEvent}.
*
* @param stack
* - The ItemStack to bind
* @param ownerName
@ -29,9 +29,9 @@ public class BindableHelper
}
/**
* Sets the Owner UUID of the item without checking if it is already bound. Also
* bypasses {@link ItemBindEvent}.
*
* Sets the Owner UUID of the item without checking if it is already bound.
* Also bypasses {@link ItemBindEvent}.
*
* @param stack
* - The ItemStack to bind
* @param ownerUUID
@ -48,12 +48,12 @@ public class BindableHelper
/**
* Deprecated.
*
*
* Built into {@link IBindable} now.
*
*
* @param stack
* - The ItemStack to check the owner of
*
*
* @return - The username of the ItemStack's owner
*/
@Deprecated
@ -66,12 +66,12 @@ public class BindableHelper
/**
* Deprecated.
*
*
* Built into {@link IBindable} now.
*
*
* @param stack
* - The ItemStack to check the owner of
*
*
* @return - The UUID of the ItemStack's owner
*/
@Deprecated
@ -84,14 +84,15 @@ public class BindableHelper
/**
* Deprecated.
*
* Now handled automatically with {@link WayofTime.bloodmagic.util.handler.EventHandler#interactEvent(PlayerInteractEvent)}
*
*
* Now handled automatically with
* {@link WayofTime.bloodmagic.util.handler.EventHandler#interactEvent(PlayerInteractEvent)}
*
* @param stack
* - The ItemStack to bind
* @param player
* - The Player to bind the ItemStack to
*
*
* @return - Whether binding was successful
*/
@Deprecated
@ -102,16 +103,17 @@ public class BindableHelper
/**
* Deprecated.
*
* Now handled automatically with {@link WayofTime.bloodmagic.util.handler.EventHandler#interactEvent(PlayerInteractEvent)}
*
*
* Now handled automatically with
* {@link WayofTime.bloodmagic.util.handler.EventHandler#interactEvent(PlayerInteractEvent)}
*
* @param stack
* - The ItemStack to bind
* @param uuid
* - The username to bind the ItemStack to
* @param currentUsername
* - The current name of the player.
*
*
* @return - Whether the binding was successful
*/
@Deprecated
@ -141,9 +143,10 @@ public class BindableHelper
/**
* Deprecated.
*
* Now handled automatically with {@link WayofTime.bloodmagic.util.handler.EventHandler#interactEvent(PlayerInteractEvent)}
*
*
* Now handled automatically with
* {@link WayofTime.bloodmagic.util.handler.EventHandler#interactEvent(PlayerInteractEvent)}
*
* @param stack
* - ItemStack to check
* @param uuid
@ -159,9 +162,9 @@ public class BindableHelper
/**
* Deprecated.
*
*
* @see #setItemOwnerName(ItemStack, String)
*
*
* @param stack
* - The ItemStack to bind
* @param ownerName

3
src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java
View file

@ -85,7 +85,8 @@ public class NetworkHelper
return soulNetwork.getOrbTier();
}
public static int getMaximumForTier(int tier) {
public static int getMaximumForTier(int tier)
{
int ret = 0;
if (tier > OrbRegistry.getTierMap().size() || tier < 0)

5
src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java
View file

@ -21,11 +21,10 @@ public class PlayerHelper
{
/**
* A list of all known fake players that do not extend FakePlayer.
*
*
* Will be added to as needed.
*/
private static final ArrayList<String> knownFakePlayers = Lists.newArrayList(
);
private static final ArrayList<String> knownFakePlayers = Lists.newArrayList();
public static String getUsernameFromPlayer(EntityPlayer player)
{

6
src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java
View file

@ -120,7 +120,7 @@ public class RitualHelper
if (block instanceof IRitualStone)
return ((IRitualStone) block).isRuneType(world, pos, type);
else if(tile instanceof IRitualStone.Tile)
else if (tile instanceof IRitualStone.Tile)
return ((IRitualStone.Tile) tile).isRuneType(type);
else if (tile != null && tile.hasCapability(RUNE_CAPABILITY, null))
return tile.getCapability(RUNE_CAPABILITY, null).isRuneType(type);
@ -137,7 +137,7 @@ public class RitualHelper
if (block instanceof IRitualStone)
return true;
else if(tile instanceof IRitualStone.Tile)
else if (tile instanceof IRitualStone.Tile)
return true;
else if (tile != null && tile.hasCapability(RUNE_CAPABILITY, null))
return true;
@ -154,7 +154,7 @@ public class RitualHelper
if (block instanceof IRitualStone)
((IRitualStone) block).setRuneType(world, pos, type);
else if(tile instanceof IRitualStone.Tile)
else if (tile instanceof IRitualStone.Tile)
((IRitualStone.Tile) tile).setRuneType(type);
else if (tile != null && tile.hasCapability(RUNE_CAPABILITY, null))
{