EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-01 20:15:28 +02:00
Code Issues Projects Releases Wiki Activity

wire up taming XP

Browse Source
This commit is contained in:
nossr50
2019-04-30 01:46:59 -07:00
parent e5441f2a96
commit 2efa64ae17
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/gmail/nossr50/util/experience/ExperienceMapManager.java
View File

@@ -17,7 +17,7 @@ public class ExperienceMapManager implements Unload {
private HashMap<String, Integer> herbalismFullyQualifiedBlockXpMap;
private HashMap<String, Integer> woodcuttingFullyQualifiedBlockXpMap;
private HashMap<String, Integer> excavationFullyQualifiedBlockXpMap;
private HashMap<EntityType, Integer> tamingExperienceMap;
private HashMap<EntityType, Float> tamingExperienceMap;
private double globalXpMult;
@@ -66,7 +66,7 @@ public class ExperienceMapManager implements Unload {
{
//Match!
matchFound = true;
tamingExperienceMap.put(entityType, userTamingConfigMap.get(s));
tamingExperienceMap.put(entityType, (float) userTamingConfigMap.get(s));
}
}
if(!matchFound)
@@ -155,6 +155,16 @@ public class ExperienceMapManager implements Unload {
return globalXpMult;
}
/**
* Gets the taming XP for this entity
* @param entityType target entity
* @return value of XP for this entity
*/
public float getTamingXp(EntityType entityType)
{
return tamingExperienceMap.get(entityType);
}
/**
* Gets the original value of the global XP multiplier
* This is defined by the users config
@@ -172,7 +182,7 @@ public class ExperienceMapManager implements Unload {
* @return true if the block has valid xp registers
*/
public boolean hasMiningXp(Material material) {
return miningFullyQualifiedBlockXpMap.get(material.getKey().getKey()) != null;
return miningFullyQualifiedBlockXpMap.get(material.getKey()) != null;
}
/**
@@ -182,7 +192,7 @@ public class ExperienceMapManager implements Unload {
* @return true if the block has valid xp registers
*/
public boolean hasHerbalismXp(Material material) {
return herbalismFullyQualifiedBlockXpMap.get(material) != null;
return herbalismFullyQualifiedBlockXpMap.get(material.getKey()) != null;
}
/**
@@ -192,7 +202,7 @@ public class ExperienceMapManager implements Unload {
* @return true if the block has valid xp registers
*/
public boolean hasWoodcuttingXp(Material material) {
return woodcuttingFullyQualifiedBlockXpMap.get(material) != null;
return woodcuttingFullyQualifiedBlockXpMap.get(material.getKey()) != null;
}
/**
@@ -202,7 +212,7 @@ public class ExperienceMapManager implements Unload {
* @return true if the block has valid xp registers
*/
public boolean hasExcavationXp(Material material) {
return excavationFullyQualifiedBlockXpMap.get(material) != null;
return excavationFullyQualifiedBlockXpMap.get(material.getKey()) != null;
}
/**
@@ -212,7 +222,7 @@ public class ExperienceMapManager implements Unload {
* @return the raw XP value before any modifiers are applied
*/
public int getMiningXp(Material material) {
return miningFullyQualifiedBlockXpMap.get(material);
return miningFullyQualifiedBlockXpMap.get(material.getKey());
}
/**
@@ -222,7 +232,7 @@ public class ExperienceMapManager implements Unload {
* @return the raw XP value before any modifiers are applied
*/
public int getHerbalismXp(Material material) {
return herbalismFullyQualifiedBlockXpMap.get(material);
return herbalismFullyQualifiedBlockXpMap.get(material.getKey());
}
/**
@@ -232,7 +242,7 @@ public class ExperienceMapManager implements Unload {
* @return the raw XP value before any modifiers are applied
*/
public int getWoodcuttingXp(Material material) {
return woodcuttingFullyQualifiedBlockXpMap.get(material);
return woodcuttingFullyQualifiedBlockXpMap.get(material.getKey());
}
/**
@@ -242,7 +252,7 @@ public class ExperienceMapManager implements Unload {
* @return the raw XP value before any modifiers are applied
*/
public int getExcavationXp(Material material) {
return excavationFullyQualifiedBlockXpMap.get(material);
return excavationFullyQualifiedBlockXpMap.get(material.getKey());
}
@Override