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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Jules 2022-02-25 20:54:32 +01:00
commit 3e0f71aa37
12 changed files with 181 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -140,7 +140,7 @@
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib-dist</artifactId>
<version>1.3-R28-SNAPSHOT</version>
<version>1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

5
src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -156,7 +156,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
int j = 0;
while (j < boundSkills.size())
try {
boundSkills.set(j, getProfess().getSkill(boundSkills.get(j).getSkill()));
boundSkills.set(j, Objects.requireNonNull(getProfess().getSkill(boundSkills.get(j).getSkill())));
} catch (Exception ignored) {
} finally {
j++;
@ -555,7 +555,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
if (event.isCancelled())
return;
experience += event.getExperience();
experience = Math.max(0, experience + event.getExperience());
// Calculate the player's next level
int oldLevel = level, needed;
@ -843,6 +843,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
}
public void setBoundSkill(int slot, ClassSkill skill) {
Validate.notNull(skill, "Skill cannot be null");
if (boundSkills.size() < 6)
boundSkills.add(skill);
else

43
src/main/java/net/Indyuce/mmocore/api/player/social/FriendRequest.java
View File

@ -6,32 +6,23 @@ import net.Indyuce.mmocore.api.player.PlayerData;
import org.bukkit.Sound;
public class FriendRequest extends Request {
private final PlayerData target;
public FriendRequest(PlayerData creator, PlayerData target) {
super(creator, target);
}
public FriendRequest(PlayerData creator, PlayerData target) {
super(creator);
@Override
public void whenDenied() {
getTarget().getPlayer().playSound(getTarget().getPlayer().getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 1);
}
this.target = target;
}
public PlayerData getTarget() {
return target;
}
public void deny() {
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
if(!target.isOnline()) return;
target.getPlayer().playSound(target.getPlayer().getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 1);
}
public void accept() {
getCreator().setLastActivity(PlayerActivity.FRIEND_REQUEST, 0);
getCreator().addFriend(target.getUniqueId());
target.addFriend(getCreator().getUniqueId());
if(target.isOnline() && getCreator().isOnline()) {
MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", target.getPlayer().getName()).send(getCreator().getPlayer());
MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", getCreator().getPlayer().getName()).send(target.getPlayer());
}
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
@Override
public void whenAccepted() {
getCreator().setLastActivity(PlayerActivity.FRIEND_REQUEST, 0);
getCreator().addFriend(getTarget().getUniqueId());
getTarget().addFriend(getCreator().getUniqueId());
if (getCreator().isOnline()) {
MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", getTarget().getPlayer().getName()).send(getCreator().getPlayer());
MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", getCreator().getPlayer().getName()).send(getTarget().getPlayer());
}
}
}

62
src/main/java/net/Indyuce/mmocore/api/player/social/Request.java
View File

@ -1,31 +1,55 @@
package net.Indyuce.mmocore.api.player.social;
import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData;
import org.apache.commons.lang.Validate;
import java.util.UUID;
import net.Indyuce.mmocore.api.player.PlayerData;
public abstract class Request {
private final UUID uuid = UUID.randomUUID();
private final long date = System.currentTimeMillis();
private final PlayerData creator;
private final UUID uuid = UUID.randomUUID();
private final long date = System.currentTimeMillis();
private final PlayerData creator, target;
public Request(PlayerData creator) {
this.creator = creator;
}
/**
* Any request time out is by default 2 minutes.
*/
private static final long TIME_OUT = 1000 * 60 * 2;
public PlayerData getCreator() {
return creator;
}
public Request(PlayerData creator, PlayerData target) {
this.creator = creator;
this.target = target;
}
public UUID getUniqueId() {
return uuid;
}
public PlayerData getCreator() {
return creator;
}
public boolean isTimedOut() {
return date + 1000 * 60 * 2 < System.currentTimeMillis();
}
public PlayerData getTarget() {
return target;
}
public abstract void accept();
public UUID getUniqueId() {
return uuid;
}
public abstract void deny();
public boolean isTimedOut() {
return date + TIME_OUT < System.currentTimeMillis();
}
public void accept() {
Validate.isTrue(target.isOnline(), "Target must be online");
whenAccepted();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
public abstract void whenAccepted();
public void deny() {
Validate.isTrue(target.isOnline(), "Target must be online");
whenDenied();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
public abstract void whenDenied();
}

25
src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java
View File

@ -1,21 +1,21 @@
package net.Indyuce.mmocore.command.rpg.admin;
import java.util.function.BiConsumer;
import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode;
import io.lumine.mythic.lib.commands.mmolib.api.Parameter;
import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.command.CommandVerbose;
import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot;
import net.Indyuce.mmocore.experience.EXPSource;
import net.Indyuce.mmocore.experience.PlayerProfessions;
import net.Indyuce.mmocore.experience.Profession;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.experience.EXPSource;
import net.Indyuce.mmocore.experience.PlayerProfessions;
import net.Indyuce.mmocore.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.command.CommandVerbose;
import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot;
import io.lumine.mythic.lib.commands.mmolib.api.CommandTreeNode;
import io.lumine.mythic.lib.commands.mmolib.api.Parameter;
import java.util.function.BiConsumer;
public class ExperienceCommandTreeNode extends CommandTreeNode {
public ExperienceCommandTreeNode(CommandTreeNode parent) {
@ -24,6 +24,8 @@ public class ExperienceCommandTreeNode extends CommandTreeNode {
addChild(new ActionCommandTreeNode(this, "set", PlayerData::setExperience, PlayerProfessions::setExperience));
addChild(new ActionCommandTreeNode(this, "give", (data, value) -> data.giveExperience(value, EXPSource.COMMAND), (professions, profession,
value) -> professions.giveExperience(profession, value, EXPSource.COMMAND, professions.getPlayerData().getPlayer().getLocation())));
addChild(new ActionCommandTreeNode(this, "take", (data, value) -> data.giveExperience(-value, EXPSource.COMMAND), (professions, profession,
value) -> professions.giveExperience(profession, -value, EXPSource.COMMAND, professions.getPlayerData().getPlayer().getLocation())));
}
public static class ActionCommandTreeNode extends CommandTreeNode {
@ -56,6 +58,7 @@ public class ExperienceCommandTreeNode extends CommandTreeNode {
int amount;
try {
amount = Integer.parseInt(args[5]);
Validate.isTrue(amount > 0);
} catch (NumberFormatException exception) {
sender.sendMessage(ChatColor.RED + args[5] + " is not a valid number.");
return CommandResult.FAILURE;

2
src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java
View File

@ -43,7 +43,7 @@ public class StatModifiersCommandTreeNode extends CommandTreeNode {
StatInstance instance = data.getStats().getInstance(stat);
sender.sendMessage("Stat Modifiers (" + instance.getKeys().size() + "):");
for (String key : instance.getKeys()) {
StatModifier mod = instance.getAttribute(key);
StatModifier mod = instance.getModifier(key);
sender.sendMessage("- " + key + ": " + mod.getValue() + " " + mod.getType().name());
}

2
src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java
View File

@ -177,7 +177,7 @@ public class PlayerProfessions {
if (event.isCancelled())
return;
exp.put(profession.getId(), exp.containsKey(profession.getId()) ? exp.get(profession.getId()) + event.getExperience() : event.getExperience());
exp.put(profession.getId(), Math.max(0, exp.getOrDefault(profession.getId(), 0) + event.getExperience()));
int needed, exp, level, oldLevel = getLevel(profession);
/*

62
src/main/java/net/Indyuce/mmocore/guild/provided/GuildInvite.java
View File

@ -1,50 +1,44 @@
package net.Indyuce.mmocore.guild.provided;
import org.bukkit.Bukkit;
import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.social.Request;
import net.Indyuce.mmocore.manager.InventoryManager;
import org.bukkit.Bukkit;
public class GuildInvite extends Request {
private final PlayerData target;
private final Guild guild;
private final Guild guild;
public GuildInvite(Guild guild, PlayerData creator, PlayerData target) {
super(creator);
public GuildInvite(Guild guild, PlayerData creator, PlayerData target) {
super(creator, target);
this.guild = guild;
this.target = target;
}
this.guild = guild;
}
public Guild getGuild() {
return guild;
}
public Guild getGuild() {
return guild;
}
public PlayerData getPlayer() {
return target;
}
@Override
public void whenDenied() {
// Nothing
}
public void deny() {
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
@Override
public void whenAccepted() {
guild.removeLastInvite(getCreator().getPlayer());
guild.getMembers().forEach(member -> {
if (Bukkit.getPlayer(member) != null) {
MMOCore.plugin.configManager.getSimpleMessage("guild-joined-other", "player",
getTarget().getPlayer().getName()).send(Bukkit.getPlayer(member));
public void accept() {
guild.removeLastInvite(getCreator().getPlayer());
guild.getMembers().forEach(member -> {
if(Bukkit.getPlayer(member) != null) {
MMOCore.plugin.configManager.getSimpleMessage("guild-joined-other", "player",
target.getPlayer().getName()).send(Bukkit.getPlayer(member));
MMOCore.plugin.configManager.getSimpleMessage("guild-joined", "owner",
Bukkit.getPlayer(guild.getOwner()).getName()).send(getTarget().getPlayer());
}
}
);
MMOCore.plugin.configManager.getSimpleMessage("guild-joined", "owner",
Bukkit.getPlayer(guild.getOwner()).getName()).send(target.getPlayer());
}}
);
guild.addMember(target.getUniqueId());
InventoryManager.GUILD_VIEW.newInventory(target).open();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
guild.addMember(getTarget().getUniqueId());
InventoryManager.GUILD_VIEW.newInventory(getTarget()).open();
}
}

64
src/main/java/net/Indyuce/mmocore/manager/social/RequestManager.java
View File

@ -1,47 +1,41 @@
package net.Indyuce.mmocore.manager.social;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
import org.bukkit.Bukkit;
import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.social.Request;
import org.bukkit.Bukkit;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
public class RequestManager {
private final Set<Request> requests = new HashSet<>();
private final Map<UUID, Request> requests = new HashMap<>();
/*
* flush friend requests every 5 minutes so there is no memory overleak
*/
public RequestManager() {
Bukkit.getScheduler().runTaskTimer(MMOCore.plugin, this::flushRequests, 60 * 20, 60 * 20 * 5);
}
/**
* Flushes friend requests every 5 minutes so there is no memory overleak
*/
public RequestManager() {
Bukkit.getScheduler().runTaskTimer(MMOCore.plugin, this::flushRequests, 60 * 20, 60 * 20 * 5);
}
public Request getRequest(UUID uuid) {
for (Request request : requests)
if (request.getUniqueId().equals(uuid))
return request;
return null;
}
public Request getRequest(UUID uuid) {
return requests.get(uuid);
}
public void registerRequest(Request request) {
requests.add(request);
}
public void registerRequest(Request request) {
requests.put(request.getUniqueId(), request);
}
public void unregisterRequest(UUID uuid) {
for (Iterator<Request> iterator = requests.iterator(); iterator.hasNext();) {
Request next = iterator.next();
if (next.getUniqueId().equals(uuid)) {
iterator.remove();
break;
}
}
}
public void unregisterRequest(UUID uuid) {
requests.remove(uuid);
}
public void flushRequests() {
requests.removeIf(Request::isTimedOut);
}
private void flushRequests() {
for (Iterator<Request> iterator = requests.values().iterator(); iterator.hasNext(); ) {
Request next = iterator.next();
if (next.isTimedOut())
iterator.remove();
}
}
}

5
src/main/java/net/Indyuce/mmocore/party/provided/Party.java
View File

@ -145,9 +145,8 @@ public class Party implements AbstractParty {
public void sendInvite(PlayerData inviter, PlayerData target) {
invites.put(target.getUniqueId(), System.currentTimeMillis());
Request request = new PartyInvite(this, inviter, target);
if (inviter.isOnline() && target.isOnline())
new ConfigMessage("party-invite").addPlaceholders("player", inviter.getPlayer().getName(), "uuid", request.getUniqueId().toString())
.sendAsJSon(target.getPlayer());
new ConfigMessage("party-invite").addPlaceholders("player", inviter.getPlayer().getName(), "uuid", request.getUniqueId().toString())
.sendAsJSon(target.getPlayer());
MMOCore.plugin.requestManager.registerRequest(request);
}

63
src/main/java/net/Indyuce/mmocore/party/provided/PartyInvite.java
View File

@ -6,43 +6,38 @@ import net.Indyuce.mmocore.api.player.social.Request;
import net.Indyuce.mmocore.manager.InventoryManager;
public class PartyInvite extends Request {
private final PlayerData target;
private final Party party;
private final Party party;
public PartyInvite(Party party, PlayerData creator, PlayerData target) {
super(creator);
public PartyInvite(Party party, PlayerData creator, PlayerData target) {
super(creator, target);
this.party = party;
this.target = target;
}
this.party = party;
}
public Party getParty() {
return party;
}
public Party getParty() {
return party;
}
public PlayerData getPlayer() {
return target;
}
@Override
public void whenDenied() {
// Nothing
}
public void deny() {
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
public void accept() {
if(party.getMembers().size() >= Math.max(2, MMOCore.plugin.getConfig().getInt("party.max-players", 8))) {
MMOCore.plugin.configManager.getSimpleMessage("party-is-full").send(target.getPlayer());
return;
}
if(getCreator().isOnline())
party.removeLastInvite(getCreator().getPlayer());
party.getMembers().forEach(member -> {
if(member.isOnline() && target.isOnline())
MMOCore.plugin.configManager.getSimpleMessage("party-joined-other", "player", target.getPlayer().getName()).send(member.getPlayer());
});
if(party.getOwner().isOnline() && target.isOnline())
MMOCore.plugin.configManager.getSimpleMessage("party-joined", "owner", party.getOwner().getPlayer().getName()).send(target.getPlayer());
party.addMember(target);
InventoryManager.PARTY_VIEW.newInventory(target).open();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
@Override
public void whenAccepted() {
if (party.getMembers().size() >= Math.max(2, MMOCore.plugin.getConfig().getInt("party.max-players", 8))) {
MMOCore.plugin.configManager.getSimpleMessage("party-is-full").send(getTarget().getPlayer());
return;
}
if (getCreator().isOnline())
party.removeLastInvite(getCreator().getPlayer());
party.getMembers().forEach(member -> {
if (member.isOnline())
MMOCore.plugin.configManager.getSimpleMessage("party-joined-other", "player", getTarget().getPlayer().getName()).send(member.getPlayer());
});
if (party.getOwner().isOnline())
MMOCore.plugin.configManager.getSimpleMessage("party-joined", "owner", party.getOwner().getPlayer().getName()).send(getTarget().getPlayer());
party.addMember(getTarget());
InventoryManager.PARTY_VIEW.newInventory(getTarget()).open();
}
}

13
src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java
View File

@ -90,4 +90,17 @@ public class RegisteredSkill {
public double getModifier(String modifier, int level) {
return defaultModifiers.get(modifier).calculate(level);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
RegisteredSkill that = (RegisteredSkill) o;
return handler.equals(that.handler) && triggerType.equals(that.triggerType);
}
@Override
public int hashCode() {
return Objects.hash(handler, triggerType);
}
}