2
0
Эх сурвалжийг харах

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

GJ 13 жил өмнө
parent
commit
3d5bb334f6

+ 0 - 4
src/main/java/com/gmail/nossr50/Leaderboard.java

@@ -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)

+ 0 - 6
src/main/java/com/gmail/nossr50/commands/general/StatsCommand.java

@@ -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)));
 		}

+ 0 - 6
src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java

@@ -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)));
 

+ 0 - 2
src/main/java/com/gmail/nossr50/datatypes/SkillType.java

@@ -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,

+ 0 - 12
src/main/java/com/gmail/nossr50/mcPermissions.java

@@ -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");
     }

+ 0 - 5
src/main/java/com/gmail/nossr50/skills/Alchemy.java

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

+ 0 - 5
src/main/java/com/gmail/nossr50/skills/Enchanting.java

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

+ 2 - 2
src/main/java/com/gmail/nossr50/spout/SpoutStuff.java

@@ -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"));

+ 0 - 16
src/main/resources/locale/locale_de.properties

@@ -306,16 +306,6 @@ Skills.NeedMore=[[DARK_AQUA]]Hierfuer brauchst du mehr [[YELLOW]]
 Skills.AdeptDiamond=[[DARK_RED]]Du bist nicht talentiert genug um Diamantwerkzeuge zu reparieren
 Skills.FullDurability=[[AQUA]]Dieses Item hat volle Haltbarkeit
 Skills.Disarmed=[[DARK_RED]]Du wurdest entwaffnet!
-mcPlayerListener.SorcerySkill=Zauberkunst Skill (Sorcery): 
-m.SkillSorcery=Zauberkunst (Sorcery)
-Sorcery.HasCast=[[YELLOW]]**ZAUBERN**[[YELLOW]]
-Sorcery.Current_Mana=[[DARK_AQUA]]MP
-Sorcery.SpellSelected=[[YELLOW]]-=([[YELLOW]]{0}[[YELLOW]])=- [[RED]]([[AQUA]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} MP
-Sorcery.OOM=[[DARK_AQUA]][[[YELLOW]]{2}[[DARK_AQUA]]][[DARK_AQUA]] Kein Mana [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[AQUA]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=GEWITTER
-Sorcery.Curative.Self=HEILEN (SELBST)
-Sorcery.Curative.Other=HEILEN (ANDERE)
 m.LVL=[[AQUA]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]] ([[AQUA]]{1}[[YELLOW]]/[[AQUA]]{2}[[YELLOW]])
 Combat.BeastLore=[[YELLOW]]**BESTIENKUNDE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Besitzer ([[RED]]{0}[[DARK_AQUA]])
@@ -356,14 +346,8 @@ Commands.xprate.started2=[[YELLOW]]Die mcMMO XP RATE betraegt nun {0}x!!
 Commands.xplock.locked=[[YELLOW]]Deine XP BAR ist nun auf {0} gesperrt!
 Commands.xplock.unlocked=[[YELLOW]]Deine XP BAR ist nun wieder [[GREEN]]FREIGEGEBEN[[YELLOW]]!
 Commands.xplock.invalid=[[RED]]Dies ist kein gueltiger Skillname! Versuche /xplock mining
-m.SkillAlchemy=Alchemie(Alchemy)
-m.SkillEnchanting=Verzaubern (Enchanting)
 m.SkillFishing=Angeln (Fishing)
-mcPlayerListener.AlchemySkill=[[AQUA]]Alchemie Skill [[DARK_AQUA]](Alchemy):
-mcPlayerListener.EnchantingSkill=[[AQUA]]Verzauberungs Skill [[DARK_AQUA]](Enchanting):
 mcPlayerListener.FishingSkill=[[YELLOW]]Angeln Skill [[DARK_AQUA]](Fishing):
-Skills.AlchemyUp=[[AQUA]]Alchemie um [[YELLOW]]{0} erhoeht. Gesamt [[YELLOW]]({1})
-Skills.EnchantingUp=[[AQUA]]Verzaubern um [[YELLOW]]{0} erhoeht. Gesamt [[YELLOW]]({1})
 Skills.FishingUp=[[AQUA]]Angeln um [[YELLOW]]{0} erhoeht. Gesamt [[YELLOW]]({1})
 Repair.LostEnchants=[[YELLOW]]Du hast nicht genug Skill, Verzauberung verloren.
 Repair.ArcanePerfect=[[YELLOW]]Du hast die Arkanen Zauber in diesem Gegenstand erhalten.

+ 0 - 16
src/main/resources/locale/locale_en_us.properties

@@ -306,16 +306,6 @@ Skills.NeedMore=[[DARK_RED]]You need more
 Skills.AdeptDiamond=[[DARK_RED]]You're not skilled enough to repair Diamond
 Skills.FullDurability=[[GRAY]]That is at full durability.
 Skills.Disarmed=[[DARK_RED]]You have been disarmed!
-mcPlayerListener.SorcerySkill=Sorcery: 
-m.SkillSorcery=SORCERY
-Sorcery.HasCast=[[GREEN]]**CASTING**[[GOLD]]
-Sorcery.Current_Mana=[[DARK_AQUA]]MP
-Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} MP
-Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Out Of Mana [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=THUNDER
-Sorcery.Curative.Self=CURE SELF
-Sorcery.Curative.Other=CURE OTHER
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**BEAST LORE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Owner ([[RED]]{0}[[DARK_AQUA]])
@@ -349,14 +339,8 @@ Commands.xprate.started2=[[GOLD]]mcMMO XP RATE IS NOW {0}x!!
 Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}!
 Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]!
 Commands.xplock.invalid=[[RED]]That is not a valid skillname! Try /xplock mining
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
 m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 0 - 16
src/main/resources/locale/locale_es_es.properties

@@ -306,16 +306,6 @@ Skills.NeedMore=[[DARK_RED]]Necesitas mas
 Skills.AdeptDiamond=[[DARK_RED]]No tienes habilidades suficientes para reparar Diamante
 Skills.FullDurability=[[GRAY]]Esto esta a su maxima duracion
 Skills.Disarmed=[[DARK_RED]]Has sido desarmado!
-mcPlayerListener.SorcerySkill=Hechiceria: 
-m.SkillSorcery=HECHICERIA
-Sorcery.HasCast=[[GREEN]]**FUNDICION**[[GOLD]]
-Sorcery.Current_Mana=[[DARK_AQUA]]MP
-Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} MP
-Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Sin Mana [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=TRUENO
-Sorcery.Curative.Self=CURARSE A SI MISMO
-Sorcery.Curative.Other=CURAR A OTRO
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]EXP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**LEYENDA DE BESTIAS**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Dueño ([[RED]]{0}[[DARK_AQUA]])
@@ -349,14 +339,8 @@ Commands.xprate.started2=[[GOLD]]mcMMO XP RATE ES AHORA {0}x!!
 Commands.xplock.locked=[[GOLD]]Tu BARRA DE EXP esta bloqueada a {0}!
 Commands.xplock.unlocked=[[GOLD]]Tu BARRA DE EXP esta ahora [[GREEN]]DESBLOQUEADA[[GOLD]]!
 Commands.xplock.invalid=[[RED]]Ese no es un nombre de habilidad valido! Try /xplock mining
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
 m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 1 - 7
src/main/resources/locale/locale_fi.properties

@@ -328,14 +328,8 @@ Commands.xprate.started2=[[GOLD]]mcMMO XP RATE IS NOW {0}x!!
 Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}!
 Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]!
 Commands.xplock.invalid=[[RED]]That is not a valid skillname! Try /xplock mining
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
-m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
+m.SkillFishing=FISHING 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 0 - 16
src/main/resources/locale/locale_fr.properties

@@ -306,16 +306,6 @@ Skills.NeedMore=[[DARK_RED]]Vous devez en avoir plus
 Skills.AdeptDiamond=[[DARK_RED]]Vous n'avez pas encore le niveau nécessaire pour réparer du diamant
 Skills.FullDurability=[[GRAY]]Cet objet est déjà en bonne état.
 Skills.Disarmed=[[DARK_RED]]Vous avez été désarmé !
-mcPlayerListener.SorcerySkill=Sorcery: 
-m.SkillSorcery=SORCERY
-Sorcery.HasCast=[[GREEN]]**CASTING**[[GOLD]]
-Sorcery.Current_Mana=[[DARK_AQUA]]MP
-Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} MP
-Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Out Of Mana [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=THUNDER
-Sorcery.Curative.Self=CURE SELF
-Sorcery.Curative.Other=CURE OTHER
 m.LVL=NIVEAU [[GREEN]]{0} - [[DARK_AQUA]]XP : [[YELLOW]][[[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]]]
 Combat.BeastLore=[[GREEN]]**Connaissances des bêtes**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Propriétaire ([[RED]]{0}[[DARK_AQUA]])
@@ -349,14 +339,8 @@ Commands.xprate.started2=[[GOLD]]mcMMO XP RATE IS NOW {0}x!!
 Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}!
 Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]!
 Commands.xplock.invalid=[[RED]]That is not a valid skillname! Try /xplock mining
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
 m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 0 - 16
src/main/resources/locale/locale_nl.properties

@@ -312,16 +312,6 @@ Skills.NeedMore=[[DARK_RED]]Je hebt te weinig
 Skills.AdeptDiamond=[[DARK_RED]]Je bent niet goed genoeg om diamond te repareren.
 Skills.FullDurability=[[GRAY]]Dat is nog helemaal heel.
 Skills.Disarmed=[[DARK_RED]]Je bent ontwapend!
-mcPlayerListener.SorcerySkill=Tovenarij: 
-m.SkillSorcery=TOVERNARIJ
-Sorcery.HasCast=[[GREEN]]**UITROEPEN VAN**[[GOLD]]
-Sorcery.Current_Mana=[[DARK_AQUA]]MP
-Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} MP
-Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Geen Mana meer [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=DONDER
-Sorcery.Curative.Self=HEEL JEZELF
-Sorcery.Curative.Other=HEEL EEN ANDER
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**WOLFINSPECTIE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Eigenaar ([[RED]]{0}[[DARK_AQUA]])
@@ -355,14 +345,8 @@ Commands.xprate.started2=[[GOLD]]mcMMO XP RATE IS NOW {0}x!!
 Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}!
 Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]!
 Commands.xplock.invalid=[[RED]]That is not a valid skillname! Try /xplock mining
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
 m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 0 - 16
src/main/resources/locale/locale_pl.properties

@@ -306,16 +306,6 @@ Skills.NeedMore=[[DARK_RED]]Potrzebujesz wiecej
 Skills.AdeptDiamond=[[DARK_RED]]Nie potrafisz jeszcze naprawiac diamentow
 Skills.FullDurability=[[GRAY]]Ten przedmiot nie wymaga naprawy.
 Skills.Disarmed=[[DARK_RED]]Zostales rozbrojony!
-mcPlayerListener.SorcerySkill=Magia: 
-m.SkillSorcery=MAGIA
-Sorcery.HasCast=[[GREEN]]**RZUCANIE ZAKLECIA**[[GOLD]]
-Sorcery.Current_Mana=[[DARK_AQUA]]Mana
-Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} Many
-Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Brak Many [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=PIORUN
-Sorcery.Curative.Self=ULECZ SIEBIE
-Sorcery.Curative.Other=ULECZ INNYCH
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]Doswiadczenia[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**WIEDZA O ZWIERZETACH**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Wlasciciel ([[RED]]{0}[[DARK_AQUA]])
@@ -349,14 +339,8 @@ Commands.xprate.started2=[[GOLD]]mcMMO XP RATE IS NOW {0}x!!
 Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}!
 Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]!
 Commands.xplock.invalid=[[RED]]That is not a valid skillname! Try /xplock mining
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
 m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 0 - 18
src/main/resources/locale/locale_pt_br.properties

@@ -314,18 +314,6 @@ Skills.NeedMore=[[DARK_RED]]Voc
 Skills.AdeptDiamond=[[DARK_RED]]Você nao tem o nível necessário para reparar Diamante
 Skills.FullDurability=[[GRAY]]Já está com Durabilidade cheia.
 Skills.Disarmed=[[DARK_RED]]Você foi Desarmado!
-mcPlayerListener.SorcerySkill=Feitiçaria (Sorcery): 
-
-m.SkillSorcery=FEITIÇARIA
-Sorcery.HasCast=[[GREEN]]*CASTING*[[GOLD]]
-Sorcery.Current_Mana=[[DARK_AQUA]]MP
-Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} MP
-Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Sem Mana [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=TROVAO
-Sorcery.Curative.Self=CURAR-SE
-Sorcery.Curative.Other=CURAR AMIGOS
-
 m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]*CONHECIMENTO DE FERAS*
 Combat.BeastLoreOwner=[[DARK_AQUA]]Dono ([[RED]]{0}[[DARK_AQUA]])
@@ -359,14 +347,8 @@ Commands.xprate.started2=[[GOLD]]XP RATE AGORA 
 Commands.xplock.locked=[[GOLD]]Sua barra de XP BAR está travada em {0}!
 Commands.xplock.unlocked=[[GOLD]]Sua barra de XP foi [[GREEN]]DESTRAVADA[[GOLD]]!
 Commands.xplock.invalid=[[RED]]Nao existe habilidade com esse nome! Tente /xplock mining
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
 m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 1 - 17
src/main/resources/locale/locale_ru.properties

@@ -307,16 +307,6 @@ Skills.NeedMore=[[DARK_RED]]
 Skills.AdeptDiamond=[[DARK_RED]]Âû íå îáó÷åíû ÷èíèòü àëìàçíûå èíñòðóìåíòû è áðîíþ
 Skills.FullDurability=[[GRAY]]Âåùü íå íóæäàåòñÿ â ïî÷èíêå.
 Skills.Disarmed=[[DARK_RED]]Âû îáåçîðóæåíû!
-mcPlayerListener.SorcerySkill=Êîëäîâñòâî: 
-m.SkillSorcery=Êîëäîâñòâî
-Sorcery.HasCast=[[GREEN]]**Èñïîëüçóþ "Êîëäîâñòâî"**[[GOLD]]
-Sorcery.Current_Mana=[[DARK_AQUA]] Ìàíû
-Sorcery.SpellSelected=[[GREEN]]-=([[GOLD]]{0}[[GREEN]])=- [[RED]]([[GRAY]]{1}[[RED]])
-Sorcery.Cost=[[RED]][COST] {0} Ìàíû
-Sorcery.OOM=[[DARK_AQUA]][[[GOLD]]{2}[[DARK_AQUA]]][[DARK_GRAY]] Íå õâàòàåò ìàíû [[YELLOW]]([[RED]]{0}[[YELLOW]]/[[GRAY]]{1}[[YELLOW]])
-Sorcery.Water.Thunder=Ãðîì
-Sorcery.Curative.Self=Âûëå÷èòü ñåáÿ
-Sorcery.Curative.Other=Âûëå÷èòü äðóãèõ
 m.LVL=[[DARK_GRAY]]Óðîâåíü: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELLOW]]/[[GOLD]]{2}[[YELLOW]])
 Combat.BeastLore=[[GREEN]]**Óìåíèå "Óäàð âîëêà" àêòèâèðîâàíî**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Âëàäåëåö ([[RED]]{0}[[DARK_AQUA]])
@@ -341,14 +331,8 @@ Party.CouldNotKick=[[DARK_RED]]
 Party.NotInYourParty=[[DARK_RED]]{0} íå â ãðóïïå
 Party.CouldNotSetOwner=[[DARK_RED]]Âû íå ìîæåòå îòäàòü ëèäåðñòâî èãðîêó {0}
 mcMMO.Description=[[DARK_AQUA]]Q: ×òî ýòî?,[[GOLD]]mcMMO ýòî [[RED]]ÎÏÅÍ ÑÓÐÑ[[GOLD]] RPG ìîä äëÿ ñåðâåðà Bukkit îò ïîëüçîâàòåëÿ [[BLUE]]nossr50,[[GOLD]]Çäåñü áûëî äîáàâëåíî ìíîãî óìåíèé äëÿ Minecraft ñåðâåðà.,[[GOLD]]Âû ìîæåòå ïðîêà÷àòü èõ ðàçíûìè ñïîñîáàìè,[[GOLD]]Âû õîòèòå íàéòè áîëüøå èíôîðìàöèè î óìåíèè [[GREEN]]/SKILLNAME[[GOLD]] ?,[[DARK_AQUA]]Q: ×òî ÿ äîëæåí ñäåëàòü?,[[GOLD]]Äëÿ ïðèìåðà... in [[DARK_AQUA]]Øàõò¸ðñòâî[[GOLD]] âû ïîëó÷èòå [[RED]]2-îé äðîï[[GOLD]] èëè ñïîñîáíîñòü [[RED]]"Ñóïåð ðàçðóøèòåëü"[[GOLD]] ,êîòîðàÿ àêòèâèðóåòñÿ [[GOLD]]íàæàòèåì ïðàâîé êíîïêè ìûøè íà íåêîòîðîå âðåìÿ,[[GOLD]]ñâÿçàííîå ñ âàøèì óðîâíåì óìåíèÿ. Ïîäíÿòü óðîâåíü [[BLUE]]Øàõò¸ðñòâà,[[GOLD]]ëåãêî ïðîñòî êîïàéòå ðóäû è êàìíè!
-m.SkillAlchemy=ALCHEMY
-m.SkillEnchanting=ENCHANTING
-m.SkillFishing=FISHING
-mcPlayerListener.AlchemySkill=Alchemy: 
-mcPlayerListener.EnchantingSkill=Enchanting: 
+m.SkillFishing=FISHING 
 mcPlayerListener.FishingSkill=Fishing: 
-Skills.AlchemyUp=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
-Skills.EnchantingUp=[[YELLOW]]Enchanting skill increased by {0}. Total ({1})
 Skills.FishingUp=[[YELLOW]]Fishing skill increased by {0}. Total ({1})
 Repair.LostEnchants=[[RED]]You were not skilled enough to keep any enchantments.
 Repair.ArcanePerfect=[[GREEN]]You have sustained the arcane energies in this item.

+ 0 - 2
src/main/resources/plugin.yml

@@ -201,8 +201,6 @@ permissions:
     mcmmo.skills.*:
         description: Implies all mcmmo.skills permissions.
         children:
-            mcmmo.skills.alchemy: true
-            mcmmo.skills.enchanting: true
             mcmmo.skills.fishing: true
             mcmmo.skills.taming: true 
             mcmmo.skills.mining: true