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

More API migration, feels like a mountain of work left lol

Browse Source
This commit is contained in:
nossr50
2020-12-22 17:27:25 -08:00
parent 73bc12841a
commit 4199ea0095
110 changed files with 2405 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -2,7 +2,6 @@ package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.meta.OldName;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
@@ -82,7 +81,7 @@ public final class CombatUtils {
return;
}
SwordsManager swordsManager = mmoPlayer.getSwordsManager();
SwordsManager swordsManager = ((McMMOPlayer) (mmoPlayer)).getSwordsManager();
double initialDamage = event.getDamage();
double finalDamage = initialDamage;
@@ -132,7 +131,7 @@ public final class CombatUtils {
return;
}
TridentManager tridentManager = mmoPlayer.getTridentManager();
TridentManager tridentManager = ((McMMOPlayer) (mmoPlayer)).getTridentManager();
// double initialDamage = entityDamageByEntityEvent.getDamage();
// double finalDamage = initialDamage;
@@ -168,7 +167,7 @@ public final class CombatUtils {
return;
}
AxesManager axesManager = mmoPlayer.getAxesManager();
AxesManager axesManager = ((McMMOPlayer) (mmoPlayer)).getArcheryManager();
if (axesManager.canActivateAbility()) {
mmoPlayer.getSuperAbilityManager().checkAbilityActivation(PrimarySkillType.AXES);
@@ -219,7 +218,7 @@ public final class CombatUtils {
return;
}
UnarmedManager unarmedManager = mmoPlayer.getUnarmedManager();
UnarmedManager unarmedManager = ((McMMOPlayer) (mmoPlayer)).getUnarmedManager();
if (unarmedManager.canActivateAbility()) {
mmoPlayer.getSuperAbilityManager().checkAbilityActivation(PrimarySkillType.UNARMED);
@@ -260,7 +259,7 @@ public final class CombatUtils {
return;
}
TamingManager tamingManager = mmoPlayer.getTamingManager();
TamingManager tamingManager = ((McMMOPlayer) (mmoPlayer)).getTamingManager();
if (tamingManager.canUseFastFoodService()) {
tamingManager.fastFoodService(wolf, event.getDamage());
@@ -292,7 +291,7 @@ public final class CombatUtils {
return;
}
ArcheryManager archeryManager = mmoPlayer.getArcheryManager();
ArcheryManager archeryManager = ((McMMOPlayer) (mmoPlayer)).getArcheryManager();
double finalDamage = event.getDamage();
@@ -341,7 +340,7 @@ public final class CombatUtils {
return;
}
CrossbowManager crossbowManager = mmoPlayer.getCrossbowManager();
CrossbowManager crossbowManager = ((McMMOPlayer) (mmoPlayer)).getCrossbowManager();
double finalDamage = event.getDamage();
@@ -394,7 +393,7 @@ public final class CombatUtils {
}
OnlineMMOPlayer mmoPlayer = mcMMO.getUserManager().queryPlayer(player);
AcrobaticsManager acrobaticsManager = mmoPlayer.getAcrobaticsManager();
AcrobaticsManager acrobaticsManager = ((McMMOPlayer) (mmoPlayer)).getAcrobaticsManager();
if (acrobaticsManager.canDodge(target)) {
event.setDamage(acrobaticsManager.dodgeCheck(painSourceRoot, event.getDamage()));
@@ -405,7 +404,7 @@ public final class CombatUtils {
return;
}
SwordsManager swordsManager = mmoPlayer.getSwordsManager();
SwordsManager swordsManager = ((McMMOPlayer) (mmoPlayer)).getSwordsManager();
if (swordsManager.canUseCounterAttack(painSource)) {
swordsManager.counterAttackChecks((LivingEntity) painSource, event.getDamage());
@@ -520,7 +519,7 @@ public final class CombatUtils {
return;
}
TamingManager tamingManager = mmoPlayer.getTamingManager();
TamingManager tamingManager = ((McMMOPlayer) (mmoPlayer)).getTamingManager();
tamingManager.attackTarget(target);
}
}
@@ -623,7 +622,7 @@ public final class CombatUtils {
public static boolean canUseLimitBreak(@NotNull OnlineMMOPlayer mmoPlayer, LivingEntity target, @NotNull SubSkillType subSkillType) {
if(target instanceof Player || AdvancedConfig.getInstance().canApplyLimitBreakPVE()) {
return RankUtils.hasUnlockedSubskill(mmoPlayer, subSkillType)
&& Permissions.isSubSkillEnabled(mmoPlayer.getPlayer(), subSkillType);
&& Permissions.isSubSkillEnabled(Misc.adaptPlayer(mmoPlayer), subSkillType);
} else {
return false;
}
@@ -812,7 +811,7 @@ public final class CombatUtils {
XPGainReason xpGainReason;
if (target instanceof Player) {
if (!ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled() || mcMMO.getPartyManager().inSameParty(mmoPlayer.getPlayer(), (Player) target)) {
if (!ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled() || mcMMO.getPartyManager().inSameParty(Misc.adaptPlayer(mmoPlayer), (Player) target)) {
return;
}

8
src/main/java/com/gmail/nossr50/util/skills/RankUtils.java
View File

@@ -38,7 +38,7 @@ public class RankUtils {
continue;
//Don't send notifications if the player lacks the permission node
if(!Permissions.isSubSkillEnabled(mmoPlayer.getPlayer(), subSkillType))
if(!Permissions.isSubSkillEnabled(Misc.adaptPlayer(mmoPlayer), subSkillType))
continue;
//The players level is the exact level requirement for this skill
@@ -159,7 +159,7 @@ public class RankUtils {
// */
// public static int getRank(Player player, SubSkillType subSkillType)
// {
// return getRank(mmoPlayer.getPlayer(), subSkillType);
// return getRank(Misc.adaptPlayer(mmoPlayer), subSkillType);
// }
/**
@@ -186,7 +186,7 @@ public class RankUtils {
HashMap<Integer, Integer> rankMap = subSkillRanks.get(skillName);
//Skill level of parent skill
int currentSkillLevel = mmoPlayer.getExperienceManager().getSkillLevel(subSkillType.getParentSkill());
int currentSkillLevel = mmoPlayer.getExperienceHandler().getSkillLevel(subSkillType.getParentSkill());
for(int i = 0; i < numRanks; i++)
{
@@ -230,7 +230,7 @@ public class RankUtils {
HashMap<Integer, Integer> rankMap = subSkillRanks.get(skillName);
//Skill level of parent skill
int currentSkillLevel = mmoPlayer.getExperienceManager().getSkillLevel(abstractSubSkill.getPrimarySkill());
int currentSkillLevel = mmoPlayer.getExperienceHandler().getSkillLevel(abstractSubSkill.getPrimarySkill());
for(int i = 0; i < numRanks; i++)
{

17
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@@ -3,8 +3,6 @@ package com.gmail.nossr50.util.skills;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.HiddenConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
@@ -15,7 +13,6 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.compat.layers.persistentdata.AbstractPersistentDataLayer;
import com.gmail.nossr50.util.experience.MMOExperienceBarManager;
import com.gmail.nossr50.util.player.NotificationManager;
import com.gmail.nossr50.util.text.StringUtils;
import com.neetgames.mcmmo.exceptions.UnexpectedValueException;
@@ -45,11 +42,11 @@ public final class SkillUtils {
private SkillUtils() {}
public static void applyXpGain(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason) {
mmoPlayer.getExperienceManager().beginXpGain(mmoPlayer.getPlayer(), primarySkillType, xp, xpGainReason, XPGainSource.SELF);
mmoPlayer.getExperienceHandler().beginXpGain(Misc.adaptPlayer(mmoPlayer), primarySkillType, xp, xpGainReason, XPGainSource.SELF);
}
public static void applyXpGain(@NotNull OnlineMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, float xp, @NotNull XPGainReason xpGainReason, @NotNull XPGainSource xpGainSource) {
mmoPlayer.getExperienceManager().beginXpGain(mmoPlayer.getPlayer(), primarySkillType, xp, xpGainReason, xpGainSource);
mmoPlayer.getExperienceHandler().beginXpGain(Misc.adaptPlayer(mmoPlayer), primarySkillType, xp, xpGainReason, xpGainSource);
}
public static @NotNull SkillBossBarState asBarState(String str) {
@@ -81,7 +78,7 @@ public final class SkillUtils {
length = 2 + (int) (skillValue / abilityLengthVar);
}
int enduranceLength = PerksUtils.handleActivationPerks(mmoPlayer.getPlayer(), length, maxLength);
int enduranceLength = PerksUtils.handleActivationPerks(Misc.adaptPlayer(mmoPlayer), length, maxLength);
if (maxLength != 0) {
length = Math.min(length, maxLength);
@@ -97,7 +94,7 @@ public final class SkillUtils {
public static int handleFoodSkills(@NotNull OnlineMMOPlayer mmoPlayer, int eventFoodLevel, @NotNull SubSkillType subSkillType) {
int curRank = RankUtils.getRank(mmoPlayer, subSkillType);
int currentFoodLevel = mmoPlayer.getPlayer().getFoodLevel();
int currentFoodLevel = Misc.adaptPlayer(mmoPlayer).getFoodLevel();
int foodChange = eventFoodLevel - currentFoodLevel;
foodChange+=curRank;
@@ -115,7 +112,7 @@ public final class SkillUtils {
* @return the number of seconds remaining before the cooldown expires
*/
public static int calculateTimeLeft(long deactivatedTimeStamp, int cooldown, @NotNull OnlineMMOPlayer mmoPlayer) {
return (int) (((deactivatedTimeStamp + (PerksUtils.handleCooldownPerks(mmoPlayer.getPlayer(), cooldown) * Misc.TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / Misc.TIME_CONVERSION_FACTOR);
return (int) (((deactivatedTimeStamp + (PerksUtils.handleCooldownPerks(Misc.adaptPlayer(mmoPlayer), cooldown) * Misc.TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / Misc.TIME_CONVERSION_FACTOR);
}
/**
@@ -203,10 +200,10 @@ public final class SkillUtils {
if(abilityLengthCap > 0)
{
ticks = PerksUtils.handleActivationPerks(player, Math.min(abilityLengthCap, 2 + (mmoPlayer.getExperienceManager().getSkillLevel(skill) / abilityLengthVar)),
ticks = PerksUtils.handleActivationPerks(player, Math.min(abilityLengthCap, 2 + (mmoPlayer.getExperienceHandler().getSkillLevel(skill) / abilityLengthVar)),
skill.getSuperAbilityType().getMaxLength()) * Misc.TICK_CONVERSION_FACTOR;
} else {
ticks = PerksUtils.handleActivationPerks(player, 2 + ((mmoPlayer.getExperienceManager().getSkillLevel(skill)) / abilityLengthVar),
ticks = PerksUtils.handleActivationPerks(player, 2 + ((mmoPlayer.getExperienceHandler().getSkillLevel(skill)) / abilityLengthVar),
skill.getSuperAbilityType().getMaxLength()) * Misc.TICK_CONVERSION_FACTOR;
}

2
src/main/java/com/gmail/nossr50/util/skills/SmeltingTracker.java
View File

@@ -40,7 +40,7 @@ public class SmeltingTracker {
private void printOwnershipGainDebug(Furnace furnace, OnlineMMOPlayer mmoPlayer) {
if(mmoPlayer != null) {
if(mmoPlayer.isDebugMode()) {
mmoPlayer.getPlayer().sendMessage("Furnace ownership " +
Misc.adaptPlayer(mmoPlayer).sendMessage("Furnace ownership " +
ChatColor.GREEN +"gained " + ChatColor.RESET +
"at location: " + furnace.getLocation().toString());
}