EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup - fixing various formatting issues

Browse Source
This commit is contained in:
TfT_02 2013-05-18 22:41:42 +02:00
parent 483f348403
commit 2d66b8ed12
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/api/ChatAPI.java
View File

@ -138,7 +138,7 @@ public final class ChatAPI {
* *
* @param playerName The name of the player to toggle party chat on. * @param playerName The name of the player to toggle party chat on.
*/ */
public static void toggleAdminChat(String playerName){ public static void toggleAdminChat(String playerName) {
UserManager.getPlayer(playerName).setAdminChat(!isUsingAdminChat(playerName)); UserManager.getPlayer(playerName).setAdminChat(!isUsingAdminChat(playerName));
} }
} }

2
src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
View File

@ -119,7 +119,7 @@ public final class ExperienceAPI {
throw new InvalidSkillException(); throw new InvalidSkillException();
} }
UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier())); UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()));
} }
/** /**

2
src/main/java/com/gmail/nossr50/chat/ChatManager.java
View File

@ -12,7 +12,7 @@ import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
public final class ChatManager { public final class ChatManager {
public ChatManager () {} public ChatManager() {}
public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message, boolean isAsync) { public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message, boolean isAsync) {
McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message, isAsync); McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message, isAsync);

2
src/main/java/com/gmail/nossr50/config/ConfigLoader.java
View File

@ -57,7 +57,7 @@ public abstract class ConfigLoader {
OutputStream outputStream = null; OutputStream outputStream = null;
try { try {
outputStream = new FileOutputStream(configFile); outputStream = new FileOutputStream(configFile);
int read; int read;
byte[] bytes = new byte[1024]; byte[] bytes = new byte[1024];

2
src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
View File

@ -257,7 +257,7 @@ public class PlayerProfile {
* @return the Xp remaining until next level * @return the Xp remaining until next level
*/ */
public int getXpToLevel(SkillType skillType) { public int getXpToLevel(SkillType skillType) {
return 1020 + (skills.get(skillType) * Config.getInstance().getFormulaMultiplierCurve()); return 1020 + (skills.get(skillType) * Config.getInstance().getFormulaMultiplierCurve());
} }
private int getChildSkillLevel(SkillType skillType) { private int getChildSkillLevel(SkillType skillType) {

2
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -219,7 +219,7 @@ public class FishingManager extends SkillManager {
// Make a hole // Make a hole
block.setType(Material.STATIONARY_WATER); block.setType(Material.STATIONARY_WATER);
for (int x = -1; x <= 1; x++) { for (int x = -1; x <= 1; x++) {
for (int z = -1; z <= 1; z++) { for (int z = -1; z <= 1; z++) {
Block relative = block.getRelative(x, 0, z); Block relative = block.getRelative(x, 0, z);

2
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -27,7 +27,7 @@ import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.util.skills.SkillUtils;
public class MiningManager extends SkillManager{ public class MiningManager extends SkillManager {
public MiningManager(McMMOPlayer mcMMOPlayer) { public MiningManager(McMMOPlayer mcMMOPlayer) {
super(mcMMOPlayer, SkillType.MINING); super(mcMMOPlayer, SkillType.MINING);
} }

2
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@ -195,7 +195,7 @@ public class RepairManager extends SkillManager {
Player player = getPlayer(); Player player = getPlayer();
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
long LastUse = mcMMOPlayer.getLastAnvilUse(anvilId); long LastUse = mcMMOPlayer.getLastAnvilUse(anvilId);
// Don't use SkillUtils.cooldownOver() here since that also accounts for the cooldown perks // Don't use SkillUtils.cooldownOver() here since that also accounts for the cooldown perks
if ((((LastUse + 3) * Misc.TIME_CONVERSION_FACTOR) >= System.currentTimeMillis()) || !Config.getInstance().getRepairConfirmRequired()) { if ((((LastUse + 3) * Misc.TIME_CONVERSION_FACTOR) >= System.currentTimeMillis()) || !Config.getInstance().getRepairConfirmRequired()) {

2
src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java
View File

@ -43,7 +43,7 @@ public class Unarmed {
ItemStack addStack = itemstack.clone(); ItemStack addStack = itemstack.clone();
if (dropAmount + itemAmount <= itemMax) { if (dropAmount + itemAmount <= itemMax) {
drop.remove(); drop.remove();
addStack.setAmount(dropAmount + itemAmount); addStack.setAmount(dropAmount + itemAmount);
inventory.setItem(nextSlot, addStack); inventory.setItem(nextSlot, addStack);

2
src/main/java/com/gmail/nossr50/util/ItemUtils.java
View File

@ -660,6 +660,6 @@ public class ItemUtils {
} }
ItemMeta itemMeta = item.getItemMeta(); ItemMeta itemMeta = item.getItemMeta();
return itemMeta.hasDisplayName() && itemMeta.getDisplayName().equals(ChatColor.GOLD + LocaleLoader.getString("Item.ChimaeraWing.Name")); return itemMeta.hasDisplayName() && itemMeta.getDisplayName().equals(ChatColor.GOLD + LocaleLoader.getString("Item.ChimaeraWing.Name"));
} }
} }

2
src/main/resources/locale/locale_en_US.properties
View File

@ -659,7 +659,7 @@ Skills.Parents = PARENTS
Skills.Stats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]]) Skills.Stats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
Skills.TooTired=[[RED]]You are too tired to use that ability again. [[YELLOW]]({0}s) Skills.TooTired=[[RED]]You are too tired to use that ability again. [[YELLOW]]({0}s)
Skills.Cancelled=[[RED]]{0} cancelled! Skills.Cancelled=[[RED]]{0} cancelled!
Skills.ConfirmOrCancel=[[GREEN]]Right-click again to confirm [[GOLD]]{0} [[GREEN]]. Left-click to cancel. Skills.ConfirmOrCancel=[[GREEN]]Right-click again to confirm [[GOLD]]{0}[[GREEN]]. Left-click to cancel.
#STATISTICS #STATISTICS
Stats.Header.Combat=[[GOLD]]-=COMBAT SKILLS=- Stats.Header.Combat=[[GOLD]]-=COMBAT SKILLS=-