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

Removed all the old Alchemy/Enchanting/Sorcery stuff from the code.

Browse Source
This commit is contained in:
GJ
2012-02-22 09:32:08 -05:00
parent c74f43a1ad
commit 3d5bb334f6
18 changed files with 4 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/Leaderboard.java
View File

@ -53,8 +53,6 @@ public class Leaderboard
Tree Unarmed = new Tree();
Tree Taming = new Tree();
Tree Fishing = new Tree();
Tree Enchanting = new Tree();
Tree Alchemy = new Tree();
Tree PowerLevel = new Tree();
//Add Data To Trees
@ -148,8 +146,6 @@ public class Leaderboard
leaderWrite(Acrobatics.inOrder(), SkillType.ACROBATICS); //$NON-NLS-1$
leaderWrite(Taming.inOrder(), SkillType.TAMING); //$NON-NLS-1$
leaderWrite(Fishing.inOrder(), SkillType.FISHING); //$NON-NLS-1$
leaderWrite(Alchemy.inOrder(), SkillType.ALCHEMY); //$NON-NLS-1$
leaderWrite(Enchanting.inOrder(), SkillType.ENCHANTING); //$NON-NLS-1$
leaderWrite(PowerLevel.inOrder(), SkillType.ALL); //$NON-NLS-1$
}
public static void leaderWrite(PlayerStat[] ps, SkillType skillType)

6
src/main/java/com/gmail/nossr50/commands/general/StatsCommand.java
View File

@ -77,8 +77,6 @@ public class StatsCommand implements CommandExecutor {
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES)));
if (mcPermissions.getInstance().archery(player))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY)));
// if(mcPermissions.getInstance().sorcery(player))
// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SorcerySkill"), PP.getSkill("sorcery"), PP.getSkill("sorceryXP"), PP.getXpToLevel("excavation")));
if (mcPermissions.getInstance().swords(player))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS)));
if (mcPermissions.getInstance().taming(player))
@ -91,10 +89,6 @@ public class StatsCommand implements CommandExecutor {
player.sendMessage(header + "-=MISC SKILLS=-");
if (mcPermissions.getInstance().acrobatics(player))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS)));
// if(mcPermissions.getInstance().alchemy(player))
// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AlchemySkill"), PP.getSkillLevel(SkillType.ALCHEMY), PP.getSkillXpLevel(SkillType.ALCHEMY), PP.getXpToLevel(SkillType.ALCHEMY)));
// if(mcPermissions.getInstance().enchanting(player))
// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.EnchantingSkill"), PP.getSkillLevel(SkillType.ENCHANTING), PP.getSkillXpLevel(SkillType.ENCHANTING), PP.getXpToLevel(SkillType.ENCHANTING)));
if (mcPermissions.getInstance().repair(player))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR)));
}

6
src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java
View File

@ -79,8 +79,6 @@ public class WhoisCommand implements CommandExecutor {
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES)));
if (mcPermissions.getInstance().archery(player))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY)));
// if(mcPermissions.getInstance().sorcery(target))
// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SorcerySkill"), PPt.getSkill("sorcery"), PPt.getSkill("sorceryXP"), PPt.getXpToLevel("excavation")));
if (mcPermissions.getInstance().swords(target))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS)));
if (mcPermissions.getInstance().taming(target))
@ -91,10 +89,6 @@ public class WhoisCommand implements CommandExecutor {
player.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-");
if (mcPermissions.getInstance().acrobatics(target))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS)));
// if(mcPermissions.getInstance().alchemy(target))
// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AlchemySkill"), PPt.getSkillLevel(SkillType.ALCHEMY), PPt.getSkillXpLevel(SkillType.ALCHEMY), PPt.getXpToLevel(SkillType.ALCHEMY)));
// if(mcPermissions.getInstance().enchanting(target))
// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.EnchantingSkill"), PPt.getSkillLevel(SkillType.ENCHANTING), PPt.getSkillXpLevel(SkillType.ENCHANTING), PPt.getXpToLevel(SkillType.ENCHANTING)));
if (mcPermissions.getInstance().repair(target))
player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));

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

@ -19,12 +19,10 @@ package com.gmail.nossr50.datatypes;
public enum SkillType
{
ACROBATICS,
ALCHEMY,
ALL, //This one is just for convenience
ARCHERY,
AXES,
EXCAVATION,
ENCHANTING,
FISHING,
HERBALISM,
MINING,

12
src/main/java/com/gmail/nossr50/mcPermissions.java
View File

@ -25,7 +25,6 @@ public class mcPermissions
public boolean permission(Player player, String perm) {
return player.hasPermission(perm);
}
public boolean admin(Player player){
return player.hasPermission("mcmmo.admin");
}
@ -53,7 +52,6 @@ public class mcPermissions
public boolean axesAbility(Player player){
return player.hasPermission("mcmmo.ability.axes");
}
public boolean swordsAbility(Player player){
return player.hasPermission("mcmmo.ability.swords");
}
@ -63,9 +61,6 @@ public class mcPermissions
public boolean mcgod(Player player) {
return player.hasPermission("mcmmo.tools.mcgod");
}
public boolean regeneration(Player player){
return player.hasPermission("mcmmo.regeneration");
}
public boolean motd(Player player) {
return player.hasPermission("mcmmo.motd");
}
@ -102,7 +97,6 @@ public class mcPermissions
}
return instance;
}
public boolean taming(Player player) {
return player.hasPermission("mcmmo.skills.taming");
}
@ -112,12 +106,6 @@ public class mcPermissions
public boolean fishing(Player player) {
return player.hasPermission("mcmmo.skills.fishing");
}
public boolean alchemy(Player player) {
return player.hasPermission("mcmmo.skills.alchemy");
}
public boolean enchanting(Player player) {
return player.hasPermission("mcmmo.skills.enchanting");
}
public boolean woodcutting(Player player) {
return player.hasPermission("mcmmo.skills.woodcutting");
}

5
src/main/java/com/gmail/nossr50/skills/Alchemy.java
View File

@ -1,5 +0,0 @@
package com.gmail.nossr50.skills;
public class Alchemy {
}

5
src/main/java/com/gmail/nossr50/skills/Enchanting.java
View File

@ -1,5 +0,0 @@
package com.gmail.nossr50.skills;
public class Enchanting {
}

4
src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
View File

@ -125,7 +125,7 @@ public class SpoutStuff
for(SkillType y : SkillType.values())
{
if(y == SkillType.ALL || y == SkillType.ENCHANTING || y == SkillType.ALCHEMY)
if(y == SkillType.ALL)
continue;
String theFileNameA = m.getCapitalized(y.toString())+".png";
@ -189,7 +189,7 @@ public class SpoutStuff
//Standard XP Icons
for(SkillType y : SkillType.values())
{
if(y == SkillType.ALL || y == SkillType.ENCHANTING || y == SkillType.ALCHEMY)
if(y == SkillType.ALL)
continue;
files.add(new File(dir+"HUD/Standard/"+m.getCapitalized(y.toString())+".png"));
files.add(new File(dir+"HUD/Retro/"+m.getCapitalized(y.toString())+"_r.png"));