diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java index 595dafbe..42258d92 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java @@ -1,8 +1,7 @@ package WayofTime.bloodmagic.api.altar; /** - * List of different components used to construct - * different tiers of altars. + * List of different components used to construct different tiers of altars. */ public enum EnumAltarComponent { diff --git a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java index 7cc7bea1..deecdc44 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java @@ -15,9 +15,9 @@ public class BoundToolEvent extends Event } /** - * This event is called when a {@link WayofTime.bloodmagic.item.ItemBoundTool} - * is being charged. - * + * This event is called when a + * {@link WayofTime.bloodmagic.item.ItemBoundTool} is being charged. + * * If canceled, will result in the charging being canceled. */ @@ -34,9 +34,9 @@ public class BoundToolEvent extends Event } /** - * This event is called when a {@link WayofTime.bloodmagic.item.ItemBoundTool}'s - * charge is released. - * + * This event is called when a + * {@link WayofTime.bloodmagic.item.ItemBoundTool}'s charge is released. + * * If canceled, will result in the charge not being released. */ diff --git a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java index 49e6ef65..10b657ba 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java @@ -13,16 +13,17 @@ public class ItemBindEvent extends Event public ItemStack itemStack; /** - * This event is called whenever a player attempts to bind a {@link WayofTime.bloodmagic.api.iface.IBindable} item. - * + * This event is called whenever a player attempts to bind a + * {@link WayofTime.bloodmagic.api.iface.IBindable} item. + * * @param player * The player doing the binding * @param key * The UUID of the player doing the binding * @param itemStack * The {@link ItemStack} that the player is binding - * - * This event is {@link Cancelable}.
+ * + * This event is {@link Cancelable}.
*/ public ItemBindEvent(EntityPlayer player, String key, ItemStack itemStack) { diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java index 41230abb..f3bccfe8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java @@ -15,9 +15,10 @@ public class SacrificeKnifeUsedEvent extends Event public boolean shouldFillAltar; /** - * This event is called whenever a player attempts to use a {@link WayofTime.bloodmagic.item.ItemSacrificialDagger} - * to self-sacrifice near an altar. - * + * This event is called whenever a player attempts to use a + * {@link WayofTime.bloodmagic.item.ItemSacrificialDagger} to self-sacrifice + * near an altar. + * * @param player * The player doing the sacrificing * @param shouldDrainHealth @@ -28,8 +29,8 @@ public class SacrificeKnifeUsedEvent extends Event * Amount of health lost * @param lpAdded * Amount of LP added to the altar - * - * This event is {@link Cancelable}.
+ * + * This event is {@link Cancelable}.
*/ public SacrificeKnifeUsedEvent(EntityPlayer player, boolean shouldDrainHealth, boolean shouldFillAltar, int hp, int lpAdded) { diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java index d2feadc9..07f74091 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java @@ -7,9 +7,9 @@ import net.minecraftforge.fml.common.eventhandler.Event; /** * Base event class for Soul Network related events. - * - * {@link #ownerUUID} contains the owner's UUID - * {@link #syphon} contains the amount of LP to be drained + * + * {@link #ownerUUID} contains the owner's UUID {@link #syphon} contains the + * amount of LP to be drained */ public class SoulNetworkEvent extends Event { @@ -23,9 +23,10 @@ public class SoulNetworkEvent extends Event } /** - * This event is called when an {@link WayofTime.bloodmagic.api.impl.ItemBindable} - * is being drained inside of a {@link net.minecraft.tileentity.TileEntity}. - * + * This event is called when an + * {@link WayofTime.bloodmagic.api.impl.ItemBindable} is being drained + * inside of a {@link net.minecraft.tileentity.TileEntity}. + * * If canceled, the drain will not be executed. */ @Cancelable @@ -41,9 +42,8 @@ public class SoulNetworkEvent extends Event } /** - * This event is called when a {@link EntityPlayer} - * drains the Soul Network - * + * This event is called when a {@link EntityPlayer} drains the Soul Network + * * If canceled, the drain will not be executed. */ @Cancelable diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java index 451bc2c1..3673655d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.api.iface; /** - * Used for all {@link WayofTime.bloodmagic.api.impl.ItemSigil} - * EXCEPT Sigils of Holdings. + * Used for all {@link WayofTime.bloodmagic.api.impl.ItemSigil} EXCEPT + * Sigils of Holdings. */ public interface ISigil { diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java index dccb1599..eca0f5a2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java index 1ada0d3a..8e41c3f7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java @@ -18,11 +18,13 @@ public class AltarRecipeRegistry private static BiMap, AltarRecipe> recipes = HashBiMap.create(); /** - * Registers an {@link AltarRecipe} for the Blood Altar. This can be a {@code ItemStack}, {@code List}, - * 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}, 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 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 diff --git a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java b/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java index 328da1bd..bd9cc104 100644 --- a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java +++ b/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java @@ -25,7 +25,8 @@ public class PropertyString extends PropertyHelper } @SideOnly(Side.CLIENT) - public Optional parseValue(String value) { + public Optional parseValue(String value) + { return allowedValues.contains(value) ? Optional.of(value) : Optional.absent(); } diff --git a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java index dbc57078..ac10d288 100644 --- a/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java +++ b/src/main/java/WayofTime/bloodmagic/client/IMeshProvider.java @@ -16,7 +16,7 @@ public interface IMeshProvider { /** * Gets the custom ItemMeshDefinition to use for the item. - * + * * @return - the custom ItemMeshDefinition to use for the item. */ @SideOnly(Side.CLIENT) @@ -24,16 +24,16 @@ public interface IMeshProvider /** * Gets all possible variants for this item - * + * * @return - All possible variants for this item */ List getVariants(); /** * If a custom ResourceLocation is required, return it here. - * + * * Can be null if unneeded. - * + * * @return - The custom ResourceLocation */ @Nullable diff --git a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java index c631a113..dadeccd4 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java @@ -10,7 +10,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class TranquilityHandlers { +public class TranquilityHandlers +{ public static class Plant implements ITranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 43e4ef79..f3f21ed9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -94,7 +94,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable NBTHelper.checkNBT(stack); if (TextHelper.canTranslate("tooltip.BloodMagic.bound.sword.desc")) - tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.bound.sword.desc")); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.bound.sword.desc")); tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated"))); diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 46d37941..2eab3d95 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -35,8 +35,8 @@ public class ChatUtil } /** - * Returns a standard {@link TextComponentString} for the given {@link String} - * . + * Returns a standard {@link TextComponentString} for the given + * {@link String} . * * @param s * The string to wrap. diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java index 13ab6ba2..08da2246 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java @@ -69,7 +69,8 @@ public class TextHelper return cutLongString(string, 30); } - public static boolean canTranslate(String key) { + public static boolean canTranslate(String key) + { return I18n.canTranslate(key); } }