EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 13:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Update classes to use DSM over CM

Browse Source
This commit is contained in:
nossr50
2019-05-13 01:27:48 -07:00
parent 80163c0d8f
commit 2c8b8658a3
29 changed files with 61 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java
View File

@ -24,7 +24,7 @@ public class Excavation {
}
protected static int getBlockXP(BlockState blockState) {
int xp = mcMMO.getConfigManager().getExperienceMapManager().getExcavationXp(blockState.getType());
int xp = mcMMO.getDynamicSettingsManager().getExperienceMapManager().getExcavationXp(blockState.getType());
return xp;
}

2
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -92,7 +92,7 @@ public class FishingManager extends SkillManager {
if (fishHook.getMetadata(MetadataConstants.FISH_HOOK_REF_METAKEY).size() > 0)
return;
fishHook.setMetadata(MetadataConstants.FISH_HOOK_REF_METAKEY, mcMMO.metadataValue);
fishHook.setMetadata(MetadataConstants.FISH_HOOK_REF_METAKEY, MetadataConstants.metadataValue);
fishHookSpawnTimestamp = System.currentTimeMillis();
fishingRodCastTimestamp = System.currentTimeMillis();
}

2
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -148,7 +148,7 @@ public class HerbalismManager extends SkillManager {
// }
// }
// else {
xp = mcMMO.getConfigManager().getExperienceMapManager().getHerbalismXp(blockState.getType());
xp = mcMMO.getDynamicSettingsManager().getExperienceMapManager().getHerbalismXp(blockState.getType());
if (!oneBlockPlant) {
//Kelp is actually two blocks mixed together

2
src/main/java/com/gmail/nossr50/skills/mining/Mining.java
View File

@ -32,7 +32,7 @@ public class Mining {
* @param blockState The {@link BlockState} to check ability activation for
*/
public static int getBlockXp(BlockState blockState) {
int xp = mcMMO.getConfigManager().getExperienceMapManager().getMiningXp(blockState.getType());
int xp = mcMMO.getDynamicSettingsManager().getExperienceMapManager().getMiningXp(blockState.getType());
return xp;
}

4
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -106,7 +106,7 @@ public class TamingManager extends SkillManager {
* @param entity The LivingEntity to award XP for
*/
public void awardTamingXP(LivingEntity entity) {
applyXpGain(mcMMO.getConfigManager().getExperienceMapManager().getTamingXp(entity.getType()), XPGainReason.PVE);
applyXpGain(mcMMO.getDynamicSettingsManager().getExperienceMapManager().getTamingXp(entity.getType()), XPGainReason.PVE);
}
/**
@ -308,7 +308,7 @@ public class TamingManager extends SkillManager {
continue;
}
entity.setMetadata(MetadataConstants.UNNATURAL_MOB_METAKEY, mcMMO.metadataValue);
entity.setMetadata(MetadataConstants.UNNATURAL_MOB_METAKEY, MetadataConstants.metadataValue);
((Tameable) entity).setOwner(player);
entity.setRemoveWhenFarAway(false);

2
src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
View File

@ -43,7 +43,7 @@ public final class Woodcutting {
return mcMMO.getModManager().getBlock(blockState).getXpGain();
}*/
return mcMMO.getConfigManager().getExperienceMapManager().getWoodcuttingXp(blockState.getType());
return mcMMO.getDynamicSettingsManager().getExperienceMapManager().getWoodcuttingXp(blockState.getType());
}
/**