EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-13 20:48:46 +01:00
Code Issues Projects Releases Wiki Activity

Use OnlineMMOPlayer over McMMOPlayer

Browse Source
This commit is contained in:
nossr50
2020-12-22 13:43:12 -08:00
parent 573d9d014e
commit b7f713a50f
119 changed files with 460 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/skills/SkillManager.java
View File

@@ -2,17 +2,17 @@ package com.gmail.nossr50.skills;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
public abstract class SkillManager {
protected McMMOPlayer mmoPlayer;
protected OnlineMMOPlayer mmoPlayer;
protected PrimarySkillType skill;
public SkillManager(McMMOPlayer mmoPlayer, PrimarySkillType skill) {
public SkillManager(OnlineMMOPlayer mmoPlayer, PrimarySkillType skill) {
this.mmoPlayer = mmoPlayer;
this.skill = skill;
}

4
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@@ -4,7 +4,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.LimitedSizeList;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.mcMMO;
@@ -26,7 +26,7 @@ import org.bukkit.metadata.MetadataValue;
public class AcrobaticsManager extends SkillManager {
public AcrobaticsManager(McMMOPlayer mmoPlayer) {
public AcrobaticsManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.ACROBATICS);
fallLocationMap = new LimitedSizeList(50);
}

4
src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java
View File

@@ -4,7 +4,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
@@ -18,7 +18,7 @@ import java.util.List;
public class AlchemyManager extends SkillManager {
private final double LUCKY_MODIFIER = 4.0 / 3.0;
public AlchemyManager(McMMOPlayer mmoPlayer) {
public AlchemyManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.ALCHEMY);
}

6
src/main/java/com/gmail/nossr50/skills/archery/Archery.java
View File

@@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.archery;
import com.gmail.nossr50.api.ItemSpawnReason;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.skills.RankUtils;
@@ -65,13 +65,13 @@ public class Archery {
}
}
public static double getSkillShotBonusDamage(@NotNull McMMOPlayer mmoPlayer, double oldDamage) {
public static double getSkillShotBonusDamage(@NotNull OnlineMMOPlayer mmoPlayer, double oldDamage) {
double damageBonusPercent = getDamageBonusPercent(mmoPlayer);
double newDamage = oldDamage + (oldDamage * damageBonusPercent);
return Math.min(newDamage, (oldDamage + Archery.skillShotMaxBonusDamage));
}
public static double getDamageBonusPercent(@NotNull McMMOPlayer mmoPlayer) {
public static double getDamageBonusPercent(@NotNull OnlineMMOPlayer mmoPlayer) {
return ((RankUtils.getRank(mmoPlayer, SubSkillType.ARCHERY_SKILL_SHOT)) * (AdvancedConfig.getInstance().getSkillShotRankDamageMultiplier()) / 100.0D);
}
}

4
src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
View File

@@ -1,7 +1,7 @@
package com.gmail.nossr50.skills.archery;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.mcMMO;
@@ -22,7 +22,7 @@ import org.bukkit.potion.PotionEffectType;
import org.jetbrains.annotations.NotNull;
public class ArcheryManager extends SkillManager {
public ArcheryManager(McMMOPlayer mmoPlayer) {
public ArcheryManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.ARCHERY);
}

4
src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java
View File

@@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.axes;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.AbilityToolType;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -21,7 +21,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.Map;
public class AxesManager extends SkillManager {
public AxesManager(McMMOPlayer mmoPlayer) {
public AxesManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.AXES);
}

4
src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java
View File

@@ -1,6 +1,6 @@
package com.gmail.nossr50.skills.crossbows;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.mcMMO;
@@ -19,7 +19,7 @@ import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
public class CrossbowManager extends SkillManager {
public CrossbowManager(McMMOPlayer mmoPlayer) {
public CrossbowManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.CROSSBOWS);
}
private static final int SPREAD_VALUE = 12;

4
src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java
View File

@@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.excavation;
import com.gmail.nossr50.api.ItemSpawnReason;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
@@ -20,7 +20,7 @@ import org.bukkit.entity.Player;
import java.util.List;
public class ExcavationManager extends SkillManager {
public ExcavationManager(McMMOPlayer mmoPlayer) {
public ExcavationManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.EXCAVATION);
}

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

@@ -7,7 +7,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.config.treasure.TreasureConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.treasure.EnchantmentTreasure;
@@ -62,7 +62,7 @@ public class FishingManager extends SkillManager {
private Location hookLocation;
private int fishCaughtCounter = 1;
public FishingManager(McMMOPlayer mmoPlayer) {
public FishingManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.FISHING);
}

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

@@ -9,7 +9,7 @@ import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.meta.RecentlyReplantedCropMeta;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.AbilityToolType;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -47,7 +47,7 @@ import java.util.HashSet;
import java.util.List;
public class HerbalismManager extends SkillManager {
public HerbalismManager(McMMOPlayer mmoPlayer) {
public HerbalismManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.HERBALISM);
}

4
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@@ -6,7 +6,7 @@ import com.gmail.nossr50.config.Config;
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.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -33,7 +33,7 @@ import java.util.ArrayList;
import java.util.List;
public class MiningManager extends SkillManager {
public MiningManager(McMMOPlayer mmoPlayer) {
public MiningManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.MINING);
}

4
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config;
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.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -37,7 +37,7 @@ public class RepairManager extends SkillManager {
private boolean placedAnvil;
private int lastClick;
public RepairManager(McMMOPlayer mmoPlayer) {
public RepairManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.REPAIR);
}

4
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
View File

@@ -5,7 +5,7 @@ import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -39,7 +39,7 @@ public class SalvageManager extends SkillManager {
private boolean placedAnvil;
private int lastClick;
public SalvageManager(McMMOPlayer mmoPlayer) {
public SalvageManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.SALVAGE);
}

4
src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
View File

@@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.smelting;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.skills.SkillManager;
@@ -15,7 +15,7 @@ import org.bukkit.event.inventory.FurnaceBurnEvent;
import org.bukkit.inventory.ItemStack;
public class SmeltingManager extends SkillManager {
public SmeltingManager(McMMOPlayer mmoPlayer) {
public SmeltingManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.SMELTING);
}

4
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@@ -1,7 +1,7 @@
package com.gmail.nossr50.skills.swords;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.AbilityToolType;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Map;
public class SwordsManager extends SkillManager {
public SwordsManager(McMMOPlayer mmoPlayer) {
public SwordsManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.SWORDS);
}

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

@@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config;
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.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.subskills.taming.CallOfTheWildType;
@@ -45,7 +45,7 @@ public class TamingManager extends SkillManager {
private HashMap<CallOfTheWildType, List<TrackedTamingEntity>> playerSummonedEntities;
public TamingManager(@NotNull McMMOPlayer mmoPlayer) {
public TamingManager(@NotNull OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.TAMING);
init();
}

4
src/main/java/com/gmail/nossr50/skills/tridents/TridentManager.java
View File

@@ -1,11 +1,11 @@
package com.gmail.nossr50.skills.tridents;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.skills.SkillManager;
public class TridentManager extends SkillManager {
public TridentManager(McMMOPlayer mmoPlayer) {
public TridentManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.TRIDENTS);
}

4
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@@ -3,7 +3,7 @@ package com.gmail.nossr50.skills.unarmed;
import com.gmail.nossr50.api.ItemSpawnReason;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.AbilityToolType;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -27,7 +27,7 @@ import org.bukkit.inventory.ItemStack;
public class UnarmedManager extends SkillManager {
public UnarmedManager(McMMOPlayer mmoPlayer) {
public UnarmedManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.UNARMED);
}

4
src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java
View File

@@ -5,7 +5,7 @@ import com.gmail.nossr50.config.Config;
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.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -51,7 +51,7 @@ public class WoodcuttingManager extends SkillManager {
new int[] { 2, -1}, new int[] { 2, 0}, new int[] { 2, 1},
};
public WoodcuttingManager(McMMOPlayer mmoPlayer) {
public WoodcuttingManager(OnlineMMOPlayer mmoPlayer) {
super(mmoPlayer, PrimarySkillType.WOODCUTTING);
treeFellerThreshold = Config.getInstance().getTreeFellerThreshold();
}