Added XP for Animal Taming

Changelog.txt

@@ -8,6 +8,8 @@ Version 1.3.00-dev
  - Added hunger regain bonuses to Herbalism skill
  - Added framework for new Blast Mining skill
  - Added Fast Food Service subskill to Taming
+ - Added Wolf Taming XP to Taming
+ - Added Sheep Shearing XP to Taming
  - Re-added mcMMO reporting damage events
  - Fixed /mcability not respecting permissions
  - Changed Taming to also gain XP from shearing

src/main/java/com/gmail/nossr50/config/LoadProperties.java

@@ -57,7 +57,7 @@ public class LoadProperties {
 			MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, 
 			nIron, nGold, nDiamond, locale, nString, nLeather;
 
-	public static int mshearing, mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
+	public static int mtameWolf, mshearing, mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
 			chimaeraId, msandstone, mbase, mpine, mbirch, mspruce, mmelon,
 			mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold,
 			mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack,
@@ -267,6 +267,7 @@ public class LoadProperties {
 		mmossstone = readInteger("Experience.Mining.Moss_Stone", 30);
 		
 		mshearing = readInteger("Experience.Taming.Shearing", 250);
+		mtameWolf = readInteger("Experience.Taming.Animal_Taming.Wolf", 250);
 
 		mfishing = readInteger("Experience.Fishing.Base", 800);
 

src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java

@@ -32,6 +32,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityTameEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.inventory.ItemStack;
@@ -39,6 +40,7 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
@@ -223,8 +225,7 @@ public class mcEntityListener implements Listener
 			}
 		}		
 	}
-	
-	
+		
 	@EventHandler (priority = EventPriority.LOW)
 	public void onEnitityExplode(EntityExplodeEvent event)
 	{
@@ -334,6 +335,20 @@ public class mcEntityListener implements Listener
 		}
 	}
 	
+	@EventHandler (priority = EventPriority.MONITOR)
+	public void onEntityTame(EntityTameEvent event)
+	{
+		Player player = (Player) event.getOwner();
+	    if(mcPermissions.getInstance().taming(player))
+	    {
+	        PlayerProfile PP = Users.getProfile(player);
+	        if(event.getEntity() instanceof Wolf)
+	        {
+	        	PP.addXP(SkillType.TAMING, LoadProperties.mtameWolf, player);
+	        }
+	    }
+	}
+	
 	public boolean isBow(ItemStack is){
 		if (is.getTypeId() == 261){
 			return true;

src/main/resources/config.yml

@@ -208,6 +208,8 @@ Experience:
         Moss_Stone: 30
     Taming:
         Shearing: 250
+        Animal_Taming:
+            Wolf: 250
 
 #
 #  Settings for Fishing

src/main/resources/locale/locale_de.properties

@@ -40,7 +40,7 @@ m.AbilityBonusTemplate=[[YELLOW]]{0}: [[GREEN]]{1}
 m.Effects=EFFEKTE
 m.YourStats=[[DARK_AQUA]]_______ [[YELLOW]]DEINE WERTE [[DARK_AQUA]]_______
 m.SkillTaming=Bestienkunde (Taming)
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=[[YELLOW]]Bestienkunde
 m.EffectsTaming1_1=[[AQUA]]mit Knochen schlagen inspiziert Woelfe
 m.EffectsTaming2_0=[[YELLOW]]Biss

src/main/resources/locale/locale_en_us.properties

@@ -40,7 +40,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=EFFECTS
 m.YourStats=YOUR STATS
 m.SkillTaming=TAMING
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Beast Lore
 m.EffectsTaming1_1=Bone-whacking inspects wolves
 m.EffectsTaming2_0=Gore

src/main/resources/locale/locale_es_es.properties

@@ -40,7 +40,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=EFECTOS
 m.YourStats=TUS ESTADISTICAS
 m.SkillTaming=DOMADURA
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Leyenda de bestias
 m.EffectsTaming1_1=Golpear con huesos examina a los lobos
 m.EffectsTaming2_0=Sangre

src/main/resources/locale/locale_fi.properties

@@ -40,7 +40,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=EFEKTIT
 m.YourStats=TILASTOSI
 m.SkillTaming=KESYTTÄMINEN
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Pedon Tarina
 m.EffectsTaming1_1=Luulla lyöminen tutkii susia
 m.EffectsTaming2_0=Pisto

src/main/resources/locale/locale_fr.properties

@@ -40,7 +40,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=EFFETS
 m.YourStats=VOS STATS
 m.SkillTaming=DRESSAGE
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Connaissance des bêtes
 m.EffectsTaming1_1=Inspecte un loup avec un os
 m.EffectsTaming2_0=Morsures

src/main/resources/locale/locale_nl.properties

@@ -46,7 +46,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=EFFECTEN
 m.YourStats=JOUW STATUS
 m.SkillTaming=TEMMEN
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Wolfinspectie
 m.EffectsTaming1_1=Bone-meal inspecteert wolven
 m.EffectsTaming2_0=Gestold bloed

src/main/resources/locale/locale_pl.properties

@@ -40,7 +40,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=EFEKTY
 m.YourStats=TWOJE STATYSTYKI
 m.SkillTaming=OSWAJANIE
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Wiedza o zwierzetach
 m.EffectsTaming1_1=Uderz koscia aby sprawdzic wilka.
 m.EffectsTaming2_0=Krwotok

src/main/resources/locale/locale_pt_br.properties

@@ -40,7 +40,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=EFEITOS
 m.YourStats=SUAS ESTATISTICAS
 m.SkillTaming=DOMESTICAR
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Conhecimento de Feras
 m.EffectsTaming1_1=Inspeciona um lobo com um osso
 m.EffectsTaming2_0=Mordida

src/main/resources/locale/locale_ru.properties

@@ -41,7 +41,7 @@ m.AbilityBonusTemplate=[[RED]]{0}: [[YELLOW]]{1}
 m.Effects=ÝÔÔÅÊÒÛ
 m.YourStats=ÂÀØÈ ÕÀÐÀÊÒÅÐÈÑÒÈÊÈ
 m.SkillTaming=Ïðèðó÷åíèå
-m.XPGainTaming=Shearing or combat w/ your wolves
+m.XPGainTaming=Shearing, Animal Taming, or combat w/ your wolves
 m.EffectsTaming1_0=Óäàð Âîëêà
 m.EffectsTaming1_1=Óìåíüøåíèå êîëè÷åñòâà êîñòåé
 m.EffectsTaming2_0=Îêðàâëåíèå