Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

New disp name option for killmob exp source

Browse Source
This commit is contained in:
Indyuce 2022-08-17 13:24:52 +02:00
parent bd1b40f1da
commit 95ea032dfa
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/source/KillMobExperienceSource.java
View File

@ -1,12 +1,13 @@
package net.Indyuce.mmocore.experience.source; package net.Indyuce.mmocore.experience.source;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.event.PlayerKillEntityEvent; import io.lumine.mythic.lib.api.event.PlayerKillEntityEvent;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser; import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser;
import net.Indyuce.mmocore.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.manager.profession.ExperienceSourceManager; import net.Indyuce.mmocore.manager.profession.ExperienceSourceManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
@ -16,19 +17,26 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.persistence.PersistentDataType; import org.bukkit.persistence.PersistentDataType;
import javax.annotation.Nullable;
public class KillMobExperienceSource extends SpecificExperienceSource<Entity> { public class KillMobExperienceSource extends SpecificExperienceSource<Entity> {
public final EntityType type; private final EntityType type;
@Nullable
private final String displayName;
public KillMobExperienceSource(ExperienceDispenser dispenser, MMOLineConfig config) { public KillMobExperienceSource(ExperienceDispenser dispenser, MMOLineConfig config) {
super(dispenser, config); super(dispenser, config);
config.validate("type"); config.validateKeys("type");
displayName = config.contains("name") ? MythicLib.plugin.parseColors(config.getString("name")) : null;
type = EntityType.valueOf(config.getString("type").toUpperCase().replace("-", "_").replace(" ", "_")); type = EntityType.valueOf(config.getString("type").toUpperCase().replace("-", "_").replace(" ", "_"));
} }
@Override @Override
public ExperienceSourceManager<KillMobExperienceSource> newManager() { public ExperienceSourceManager<KillMobExperienceSource> newManager() {
return new ExperienceSourceManager<KillMobExperienceSource>() { return new ExperienceSourceManager<KillMobExperienceSource>() {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void a(PlayerKillEntityEvent event) { public void a(PlayerKillEntityEvent event) {
Bukkit.getScheduler().runTaskLater(MMOCore.plugin, () -> { Bukkit.getScheduler().runTaskLater(MMOCore.plugin, () -> {
@ -46,6 +54,6 @@ public class KillMobExperienceSource extends SpecificExperienceSource<Entity> {
@Override @Override
public boolean matchesParameter(PlayerData player, Entity obj) { public boolean matchesParameter(PlayerData player, Entity obj) {
return obj.getType() == type; return obj.getType() == type && (displayName == null || displayName.equals(obj.getCustomName()));
} }
} }

6
MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/source/type/SpecificExperienceSource.java
View File

@ -10,7 +10,6 @@ import org.jetbrains.annotations.Nullable;
public abstract class SpecificExperienceSource<T> extends ExperienceSource<T> { public abstract class SpecificExperienceSource<T> extends ExperienceSource<T> {
private final RandomAmount amount; private final RandomAmount amount;
double counter = 0;
/** /**
* Used to register experience sources with SPECIFIC experience outputs. * Used to register experience sources with SPECIFIC experience outputs.
@ -20,21 +19,22 @@ public abstract class SpecificExperienceSource<T> extends ExperienceSource<T> {
public SpecificExperienceSource(ExperienceDispenser dispenser, MMOLineConfig config) { public SpecificExperienceSource(ExperienceDispenser dispenser, MMOLineConfig config) {
super(dispenser); super(dispenser);
config.validate("amount"); config.validateKeys("amount");
amount = new RandomAmount(config.getString("amount")); amount = new RandomAmount(config.getString("amount"));
} }
/** /**
* Used for FromExperienceSource * Used for FromExperienceSource
*
* @param dispenser * @param dispenser
*/ */
public SpecificExperienceSource(ExperienceDispenser dispenser) { public SpecificExperienceSource(ExperienceDispenser dispenser) {
super(dispenser); super(dispenser);
amount = new RandomAmount(0, 0); amount = new RandomAmount(0, 0);
} }
public RandomAmount getAmount() { public RandomAmount getAmount() {
return amount; return amount;
} }