From e8b4e6f2c0ffac3df20bc206d085c8d545d92ac4 Mon Sep 17 00:00:00 2001 From: Vindex Date: Fri, 1 Jan 2016 10:34:17 +0100 Subject: [PATCH] Comment fixes --- .../WayofTime/bloodmagic/altar/BloodAltar.java | 4 ++-- .../alchemyCrafting/AlchemyCircleRenderer.java | 7 ++++--- .../bloodmagic/api/event/SoulNetworkEvent.java | 11 +++++++---- .../api/livingArmour/LivingArmourUpgrade.java | 10 ++++++---- .../api/registry/AltarRecipeRegistry.java | 6 +----- .../api/registry/RitualRegistry.java | 6 ++++-- .../BindingAlchemyCircleRenderer.java | 4 ++-- .../compat/jei/altar/AltarRecipeMaker.java | 4 ++-- .../StorageBlockCraftingRecipeAssimilator.java | 18 +++++++----------- .../item/gear/ItemPackSelfSacrifice.java | 14 ++++++++------ .../bloodmagic/tile/TileMasterRitualStone.java | 6 +++--- 11 files changed, 46 insertions(+), 44 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 2b2df490..24d09027 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -312,8 +312,8 @@ public class BloodAltar if (world.isRemote) return; - internalCounter++; // Used instead of the world time for checks that do - // not happen every tick + // Used instead of the world time for checks that do not happen every tick + internalCounter++; if (lockdownDuration > 0) lockdownDuration--; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java index 32fded29..afb0d3b2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java @@ -93,8 +93,9 @@ public class AlchemyCircleRenderer GlStateManager.translate(x, y, z); - EnumFacing sideHit = EnumFacing.UP; // Specify which face this "circle" - // is located on + // Specify which face this "circle" is located on + EnumFacing sideHit = EnumFacing.UP; + GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); switch (sideHit) @@ -151,4 +152,4 @@ public class AlchemyCircleRenderer GlStateManager.popMatrix(); } -} \ No newline at end of file +} diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java index 009eb4b3..ed83ccf2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java @@ -35,8 +35,8 @@ public class SoulNetworkEvent extends Event { public final EntityPlayer player; - public boolean shouldDamage; // If true, will damage regardless of if - // the network had enough inside it + // If true, will damage regardless of if the network had enough inside it + public boolean shouldDamage; public PlayerDrainNetworkEvent(EntityPlayer player, String ownerNetwork, int drainAmount) { @@ -51,8 +51,11 @@ public class SoulNetworkEvent extends Event { public final ItemStack itemStack; - public float damageAmount; // Amount of damage that would incur if the - // network could not drain properly + /** + * Amount of damage that would incur if the network could not drain + * properly + */ + public float damageAmount; /** * Set result to deny the action i.e. damage/drain anyways. Cancelling diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java index 60eb0d41..91d7b23c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java @@ -12,8 +12,11 @@ import com.google.common.collect.Multimap; public abstract class LivingArmourUpgrade { - protected int level = 0; // Upgrade level 0 is the first upgrade. Upgrade - // goes from 0 to getMaxTier() - 1. + /** + * Upgrade level 0 is the first upgrade. Upgrade goes from 0 to getMaxTier() + * - 1. + */ + protected int level = 0; /** * The LivingArmourUpgrade must have a constructor that has a single integer @@ -36,7 +39,6 @@ public abstract class LivingArmourUpgrade public abstract String getUniqueIdentifier(); /** - * * @return */ public abstract int getMaxTier(); @@ -49,7 +51,7 @@ public abstract class LivingArmourUpgrade public Multimap getAttributeModifiers() { - return HashMultimap. create(); + return HashMultimap.create(); } public abstract void writeToNBT(NBTTagCompound tag); diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java index dbdaa8d2..dec43c56 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java @@ -89,11 +89,7 @@ public class AltarRecipeRegistry return false; return tierCheck.ordinal() >= minTier.ordinal() && this.input.isItemEqual(comparedStack);// && - // (this.useTag - // ? - // this.areRequiredTagsEqual(comparedStack) - // : - // true); + // (this.useTag this.areRequiredTagsEqual(comparedStack) : true); } } } diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java index ddecaa4e..674fde90 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java @@ -15,8 +15,10 @@ public class RitualRegistry public static final Map enabledRituals = new HashMap(); private static final BiMap registry = HashBiMap.create(); - // Ordered list for actions that depend on the order that the rituals were - // registered in + /** + * Ordered list for actions that depend on the order that the rituals were + * registered in + */ private static final ArrayList orderedIdList = new ArrayList(); /** diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index c4f98287..db9b89e4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -187,8 +187,8 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer GlStateManager.translate(x, y, z); - EnumFacing sideHit = EnumFacing.UP; // Specify which face this "circle" - // is located on + // Specify which face this "circle" is located on + EnumFacing sideHit = EnumFacing.UP; GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); switch (sideHit) diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java index 079fc2d1..a2adf9ed 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java @@ -21,8 +21,8 @@ public class AltarRecipeMaker for (Map.Entry itemStackAltarRecipeEntry : altarMap.entrySet()) { if (itemStackAltarRecipeEntry.getValue().getOutput() != null) - { // Make sure output is not null. If it is, the recipe is for a - // filling orb, and we don't want that. + { + // Make sure output is not null. If it is, the recipe is for a filling orb, and we don't want that. ItemStack input = itemStackAltarRecipeEntry.getKey(); ItemStack output = itemStackAltarRecipeEntry.getValue().getOutput(); int requiredTier = itemStackAltarRecipeEntry.getValue().getMinTier().toInt(); diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java index 816062a5..42f82a03 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java @@ -66,15 +66,13 @@ public class StorageBlockCraftingRecipeAssimilator { PackingRecipe recipePack = it.next(); - // check if the packing recipe accepts the unpacking recipe's - // output + // check if the packing recipe accepts the unpacking recipe's output boolean matched = false; if (recipePack.possibleInputs != null) - { // the recipe could be parsed, use its inputs directly since - // that's faster - // verify recipe size + { + // the recipe could be parsed, use its inputs directly since that's faster verify recipe size if (recipePack.inputCount != unpacked.stackSize) continue; @@ -91,15 +89,13 @@ public class StorageBlockCraftingRecipeAssimilator } } } else - { // unknown IRecipe, check through the recipe conventionally - // verify recipe size for 3x3 to skip anything smaller - // quickly - + { + // unknown IRecipe, check through the recipe conventionally verify recipe size for 3x3 to skip anything smaller quickly + if (unpacked.stackSize == 9 && recipePack.recipe.getRecipeSize() < 9) continue; - // initialize inventory late, but only once per unpack - // recipe + // initialize inventory late, but only once per unpack recipe if (inventory == null) { diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index b94b28ff..0df02bef 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -19,12 +19,14 @@ import java.util.List; public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulator { - - public final int CONVERSION = 100; // How much LP per half heart - public final int CAPACITY = 10000; // Max LP storage - public final int INTERVAL = 20; // How often the pack syphons - public final float HEALTHREQ = 0.5f; // How much health is required for the - // pack to syphon (0 - 1) + /** How much LP per half heart */ + public final int CONVERSION = 100; + /** Max LP storage */ + public final int CAPACITY = 10000; + /** How often the pack syphons */ + public final int INTERVAL = 20; + /** How much health is required for the pack to syphon (0 - 1) */ + public final float HEALTHREQ = 0.5f; public ItemPackSelfSacrifice() { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 5289ae21..87cae95f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -117,9 +117,9 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt network.syphon(ritual.getActivationCost()); ChatUtil.sendNoSpamUnloc(activator, "chat.BloodMagic.ritual.activate"); this.active = true; - this.owner = crystalOwner; // Set the owner of the - // ritual to the crystal's - // owner + // Set the owner of the ritual to the crystal's owner + this.owner = crystalOwner; + this.currentRitual = ritual; return true;