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

Comment fixes

Browse source
This commit is contained in:
Vindex 2016-01-01 10:34:17 +01:00
parent a2e77adbff
commit e8b4e6f2c0
11 changed files with 46 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
View file

@ -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--;

7
src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java
View file

@ -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();
}
}
}

11
src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java
View file

@ -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

10
src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java
View file

@ -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<String, AttributeModifier> getAttributeModifiers()
{
return HashMultimap.<String, AttributeModifier> create();
return HashMultimap.<String, AttributeModifier>create();
}
public abstract void writeToNBT(NBTTagCompound tag);

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

@ -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);
}
}
}

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

@ -15,8 +15,10 @@ public class RitualRegistry
public static final Map<Ritual, Boolean> enabledRituals = new HashMap<Ritual, Boolean>();
private static final BiMap<String, Ritual> 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<String> orderedIdList = new ArrayList<String>();
/**

4
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
View file

@ -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)

4
src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java
View file

@ -21,8 +21,8 @@ public class AltarRecipeMaker
for (Map.Entry<ItemStack, AltarRecipeRegistry.AltarRecipe> 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();

18
src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java
View file

@ -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)
{

14
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

@ -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()
{

6
src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
View file

@ -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;