EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-26 10:44:43 +02:00
Code Issues Projects Releases Wiki Activity

Major cleanup

Browse Source
This commit is contained in:
bm01
2013-01-26 23:01:55 +01:00
parent f1075f800f
commit bff7919c21
101 changed files with 689 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/api/AbilityAPI.java
View File

@ -5,7 +5,8 @@ import org.bukkit.entity.Player;
import com.gmail.nossr50.skills.AbilityType;
import com.gmail.nossr50.util.Users;
public class AbilityAPI {
public final class AbilityAPI {
private AbilityAPI() {}
public static boolean berserkEnabled(Player player) {
return Users.getProfile(player).getAbilityMode(AbilityType.BERSERK);

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

@ -1,11 +1,9 @@
package com.gmail.nossr50.api;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.util.ChatManager;
public final class ChatAPI {
private ChatAPI() {}
/**
@ -18,8 +16,7 @@ public final class ChatAPI {
* @param message The message to send
*/
public static void sendPartyChat(String sender, String party, String message) {
ChatManager chatManager = new ChatManager(mcMMO.p, sender, message);
chatManager.handlePartyChat(PartyManager.getInstance().getParty(party));
ChatManager.handlePartyChat(PartyManager.getParty(party), sender, message);
}
/**
@ -31,7 +28,6 @@ public final class ChatAPI {
* @param message The message to send
*/
public static void sendAdminChat(String sender, String message) {
ChatManager chatManager = new ChatManager(mcMMO.p, sender, message);
chatManager.handleAdminChat();
ChatManager.handleAdminChat(sender, message);
}
}

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

@ -3,11 +3,10 @@ package com.gmail.nossr50.api;
import org.bukkit.entity.Player;
import com.gmail.nossr50.skills.SkillType;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.skills.SkillTools;
import com.gmail.nossr50.util.Users;
public final class ExperienceAPI {
private ExperienceAPI() {}
/**
@ -18,10 +17,10 @@ public final class ExperienceAPI {
*/
private static void checkXP(Player player, SkillType skillType) {
if (skillType.equals(SkillType.ALL)) {
Skills.xpCheckAll(player, Users.getProfile(player));
SkillTools.xpCheckAll(player, Users.getProfile(player));
}
else {
Skills.xpCheckSkill(skillType, player, Users.getProfile(player));
SkillTools.xpCheckSkill(skillType, player, Users.getProfile(player));
}
}

21
src/main/java/com/gmail/nossr50/api/PartyAPI.java
View File

@ -9,7 +9,6 @@ import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.util.Users;
public final class PartyAPI {
private PartyAPI() {}
/**
@ -46,7 +45,7 @@ public final class PartyAPI {
* @return true if the two players are in the same party, false otherwise
*/
public static boolean inSameParty(Player playera, Player playerb) {
return PartyManager.getInstance().inSameParty(playera, playerb);
return PartyManager.inSameParty(playera, playerb);
}
/**
@ -57,7 +56,7 @@ public final class PartyAPI {
* @return the list of parties.
*/
public static List<Party> getParties() {
return PartyManager.getInstance().getParties();
return PartyManager.getParties();
}
/**
@ -69,7 +68,7 @@ public final class PartyAPI {
* @param partyName The party to add the player to
*/
public static void addToParty(Player player, String partyName) {
Party party = PartyManager.getInstance().getParty(partyName);
Party party = PartyManager.getParty(partyName);
String playerName = player.getName();
if (party == null) {
@ -78,7 +77,7 @@ public final class PartyAPI {
party.setLeader(playerName);
}
PartyManager.getInstance().addToParty(playerName, Users.getProfile(player), party);
PartyManager.addToParty(playerName, Users.getProfile(player), party);
}
/**
@ -89,7 +88,7 @@ public final class PartyAPI {
* @param player The player to remove
*/
public static void removeFromParty(Player player) {
PartyManager.getInstance().removeFromParty(player.getName(), Users.getProfile(player).getParty());
PartyManager.removeFromParty(player.getName(), Users.getProfile(player).getParty());
}
/**
@ -101,7 +100,7 @@ public final class PartyAPI {
* @return the leader of the party
*/
public static String getPartyLeader(String partyName) {
return PartyManager.getInstance().getPartyLeader(partyName);
return PartyManager.getPartyLeader(partyName);
}
/**
@ -113,7 +112,7 @@ public final class PartyAPI {
* @param player The player to set as leader
*/
public static void setPartyLeader(String partyName, String player) {
PartyManager.getInstance().setPartyLeader(player, PartyManager.getInstance().getParty(partyName));
PartyManager.setPartyLeader(player, PartyManager.getParty(partyName));
}
/**
@ -125,7 +124,7 @@ public final class PartyAPI {
* @return all the players in the player's party
*/
public static List<String> getAllMembers(Player player) {
return PartyManager.getInstance().getAllMembers(player);
return PartyManager.getAllMembers(player);
}
/**
@ -137,7 +136,7 @@ public final class PartyAPI {
* @return all online players in this party
*/
public static List<Player> getOnlineMembers(String partyName) {
return PartyManager.getInstance().getOnlineMembers(partyName);
return PartyManager.getOnlineMembers(partyName);
}
/**
@ -149,6 +148,6 @@ public final class PartyAPI {
* @return all online players in the player's party
*/
public static List<Player> getOnlineMembers(Player player) {
return PartyManager.getInstance().getOnlineMembers(player);
return PartyManager.getOnlineMembers(player);
}
}

5
src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
View File

@ -8,15 +8,14 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.skills.ToolType;
public final class SpoutToolsAPI {
private SpoutToolsAPI() {}
public static final List<ItemStack> spoutSwords = new ArrayList<ItemStack>();
public static final List<ItemStack> spoutAxes = new ArrayList<ItemStack>();
public static final List<ItemStack> spoutPickaxes = new ArrayList<ItemStack>();
public static final List<ItemStack> spoutHoes = new ArrayList<ItemStack>();
public static final List<ItemStack> spoutShovels = new ArrayList<ItemStack>();
private SpoutToolsAPI() {}
/**
* Add a custom Spout tool to mcMMO for XP gain & ability use.
* </br>