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

Interface cleanup

Browse source 
Specifying public in an interface is redundant.
This commit is contained in:
Nick 2016-03-14 18:55:44 -07:00
parent 76b3c14499
commit f5d02b2807
10 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java
View file

@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
*/ */
public interface IUpgradeTrainer public interface IUpgradeTrainer
{ {
public List<String> getTrainedUpgrades(ItemStack stack); List<String> getTrainedUpgrades(ItemStack stack);
public boolean setTrainedUpgrades(ItemStack stack, List<String> keys); boolean setTrainedUpgrades(ItemStack stack, List<String> keys);
} }

21
src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java
View file

@ -15,34 +15,37 @@ import com.google.common.collect.Multimap;
*/ */
public interface ILivingArmour public interface ILivingArmour
{ {
public Multimap<String, AttributeModifier> getAttributeModifiers(); Multimap<String, AttributeModifier> getAttributeModifiers();
public boolean upgradeArmour(EntityPlayer user, LivingArmourUpgrade upgrade); boolean upgradeArmour(EntityPlayer user, LivingArmourUpgrade upgrade);
public boolean removeUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade); boolean removeUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade);
public void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade); void notifyPlayerOfUpgrade(EntityPlayer user, LivingArmourUpgrade upgrade);
/** /**
* Ticks the upgrades and stat trackers, passing in the world and player as * Ticks the upgrades and stat trackers, passing in the world and player as
* well as the LivingArmour * well as the LivingArmour
* *
* @param world * @param world
* - The World
* @param player * @param player
* - The player wearing the Armour
*/ */
public void onTick(World world, EntityPlayer player); void onTick(World world, EntityPlayer player);
public void readFromNBT(NBTTagCompound tag); void readFromNBT(NBTTagCompound tag);
public void writeToNBT(NBTTagCompound tag, boolean forceWrite); void writeToNBT(NBTTagCompound tag, boolean forceWrite);
/** /**
* Writes the LivingArmour to the NBTTag. This will only write the trackers * Writes the LivingArmour to the NBTTag. This will only write the trackers
* that are dirty. * that are dirty.
* *
* @param tag * @param tag
* - The NBT tag to write to
*/ */
public void writeDirtyToNBT(NBTTagCompound tag); void writeDirtyToNBT(NBTTagCompound tag);
public void writeToNBT(NBTTagCompound tag); void writeToNBT(NBTTagCompound tag);
} }

12
src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillConduit.java
View file

@ -6,15 +6,15 @@ package WayofTime.bloodmagic.api.soul;
*/ */
public interface IDemonWillConduit public interface IDemonWillConduit
{ {
public int getWeight(); int getWeight();
public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill); double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill);
public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain); double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain);
public boolean canFill(EnumDemonWillType type); boolean canFill(EnumDemonWillType type);
public boolean canDrain(EnumDemonWillType type); boolean canDrain(EnumDemonWillType type);
public double getCurrentWill(EnumDemonWillType type); double getCurrentWill(EnumDemonWillType type);
} }

16
src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java
View file

@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
public interface IDemonWillGem public interface IDemonWillGem
{ {
/** /**
* *
* @param willGemStack * @param willGemStack
* - The ItemStack for this demon will gem. * - The ItemStack for this demon will gem.
* @param willStack * @param willStack
@ -13,20 +13,20 @@ public interface IDemonWillGem
* @return - The remainder willStack after the will has been absorbed into * @return - The remainder willStack after the will has been absorbed into
* the gem. Return null if there is no will left in the stack. * the gem. Return null if there is no will left in the stack.
*/ */
public ItemStack fillDemonWillGem(ItemStack willGemStack, ItemStack willStack); ItemStack fillDemonWillGem(ItemStack willGemStack, ItemStack willStack);
/** /**
* Returns the number of souls that are left in the soul gem. Returns a * Returns the number of souls that are left in the soul gem. Returns a
* double because souls can be fractionally drained. * double because souls can be fractionally drained.
* *
*/ */
public double getWill(EnumDemonWillType type, ItemStack willGemStack); double getWill(EnumDemonWillType type, ItemStack willGemStack);
public void setWill(EnumDemonWillType type, ItemStack willGemStack, double amount); void setWill(EnumDemonWillType type, ItemStack willGemStack, double amount);
public int getMaxWill(EnumDemonWillType type, ItemStack willGemStack); int getMaxWill(EnumDemonWillType type, ItemStack willGemStack);
public double drainWill(EnumDemonWillType type, ItemStack stack, double drainAmount); double drainWill(EnumDemonWillType type, ItemStack stack, double drainAmount);
public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount); double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount);
} }

2
src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java
View file

@ -7,5 +7,5 @@ import net.minecraft.item.ItemStack;
public interface IDemonWillWeapon public interface IDemonWillWeapon
{ {
public List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting); List<ItemStack> getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting);
} }

4
src/main/java/WayofTime/bloodmagic/api/teleport/ITeleport.java
View file

@ -2,7 +2,7 @@ package WayofTime.bloodmagic.api.teleport;
public interface ITeleport public interface ITeleport
{ {
public void teleport(); void teleport();
public int getTeleportCost(); int getTeleportCost();
} }

4
src/main/java/WayofTime/bloodmagic/routing/IInputItemRoutingNode.java
View file

@ -4,7 +4,7 @@ import net.minecraft.util.EnumFacing;
public interface IInputItemRoutingNode extends IItemRoutingNode public interface IInputItemRoutingNode extends IItemRoutingNode
{ {
public boolean isInput(EnumFacing side); boolean isInput(EnumFacing side);
public IItemFilter getInputFilterForSide(EnumFacing side); IItemFilter getInputFilterForSide(EnumFacing side);
} }

10
src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java
View file

@ -6,13 +6,13 @@ import net.minecraft.util.BlockPos;
public interface IMasterRoutingNode extends IRoutingNode public interface IMasterRoutingNode extends IRoutingNode
{ {
public boolean isConnected(List<BlockPos> path, BlockPos nodePos); boolean isConnected(List<BlockPos> path, BlockPos nodePos);
public void addNodeToList(IRoutingNode node); void addNodeToList(IRoutingNode node);
public void addConnections(BlockPos pos, List<BlockPos> connectionList); void addConnections(BlockPos pos, List<BlockPos> connectionList);
public void addConnection(BlockPos pos1, BlockPos pos2); void addConnection(BlockPos pos1, BlockPos pos2);
public void removeConnection(BlockPos pos1, BlockPos pos2); void removeConnection(BlockPos pos1, BlockPos pos2);
} }

4
src/main/java/WayofTime/bloodmagic/routing/IOutputItemRoutingNode.java
View file

@ -4,7 +4,7 @@ import net.minecraft.util.EnumFacing;
public interface IOutputItemRoutingNode extends IItemRoutingNode public interface IOutputItemRoutingNode extends IItemRoutingNode
{ {
public boolean isOutput(EnumFacing side); boolean isOutput(EnumFacing side);
public IItemFilter getOutputFilterForSide(EnumFacing side); IItemFilter getOutputFilterForSide(EnumFacing side);
} }

18
src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java
View file

@ -7,21 +7,21 @@ import net.minecraft.world.World;
public interface IRoutingNode public interface IRoutingNode
{ {
public void connectMasterToRemainingNode(World world, List<BlockPos> alreadyChecked, IMasterRoutingNode master); void connectMasterToRemainingNode(World world, List<BlockPos> alreadyChecked, IMasterRoutingNode master);
public BlockPos getBlockPos(); BlockPos getBlockPos();
public List<BlockPos> getConnected(); List<BlockPos> getConnected();
public BlockPos getMasterPos(); BlockPos getMasterPos();
public boolean isConnectionEnabled(BlockPos testPos); boolean isConnectionEnabled(BlockPos testPos);
public boolean isMaster(IMasterRoutingNode master); boolean isMaster(IMasterRoutingNode master);
public void addConnection(BlockPos pos1); void addConnection(BlockPos pos1);
public void removeConnection(BlockPos pos1); void removeConnection(BlockPos pos1);
public void removeAllConnections(); void removeAllConnections();
} }