Comment fixes
This commit is contained in:
parent
a2e77adbff
commit
e8b4e6f2c0
11 changed files with 46 additions and 44 deletions
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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>();
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue