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

!MMOLib update 2

Browse Source
This commit is contained in:
Indyuce 2019-12-22 19:55:55 +01:00
parent ba164288b1
commit 6fc7d84715
21 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/Indyuce/mmocore/api/item/ConfigItem.java
View File

@ -22,8 +22,8 @@ import com.mojang.authlib.properties.Property;
import net.Indyuce.mmocore.MMOCore;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
import net.mmogroup.mmolib.version.VersionMaterial;
public class ConfigItem {

4
src/main/java/net/Indyuce/mmocore/api/item/CurrencyItem.java
View File

@ -8,8 +8,8 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class CurrencyItem extends ConfigItem {
private final int worth, amount;

3
src/main/java/net/Indyuce/mmocore/api/skill/TargetSkillResult.java
View File

@ -2,6 +2,7 @@ package net.Indyuce.mmocore.api.skill;
import org.bukkit.entity.LivingEntity;
import net.Indyuce.mmocore.MMOCoreUtils;
import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
import net.mmogroup.mmolib.MMOLib;
@ -14,7 +15,7 @@ public class TargetSkillResult extends SkillResult {
super(data, skill);
if (isSuccessful()) {
MMORayTraceResult result = MMOLib.plugin.getVersion().getWrapper().rayTrace(data.getPlayer(), data.getPlayer().getEyeLocation().getDirection(), range);
MMORayTraceResult result = MMOLib.plugin.getVersion().getWrapper().rayTrace(data.getPlayer(), data.getPlayer().getEyeLocation().getDirection(), range, entity -> MMOCoreUtils.canTarget(data.getPlayer(), entity));
if (result == null)
abort(CancelReason.OTHER);
else

2
src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandMap.java
View File

@ -24,7 +24,7 @@ public class ListCommandMap extends CommandEnd {
sender.sendMessage(ChatColor.YELLOW + "----------------------------------------------------");
for (Booster booster : MMOCore.plugin.boosterManager.getBoosters())
if (!booster.isTimedOut())
MMOLib.plugin.getNMS().sendJson((Player) sender, "{\"text\":\"" + ChatColor.YELLOW + "- " + ChatColor.GOLD + MMOCore.plugin.configManager.decimal.format((1 + booster.getExtra())) + "x" + ChatColor.YELLOW + " Booster - " + ChatColor.GOLD + (!booster.hasProfession() ? "Main" : booster.getProfession().getName()) + ChatColor.YELLOW + " - " + ChatColor.GOLD + new DelayFormat().format(booster.getCreationDate() + booster.getLength() - System.currentTimeMillis()) + "\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/mmocore booster remove " + booster.getUniqueId().toString() + "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"Click to remove.\"}}}");
MMOLib.plugin.getNMS().sendJson((Player) sender, "{\"text\":\"" + ChatColor.YELLOW + "- " + ChatColor.GOLD + MMOCore.plugin.configManager.decimal.format((1 + booster.getExtra())) + "x" + ChatColor.YELLOW + " Booster - " + ChatColor.GOLD + (!booster.hasProfession() ? "ExploreAttributesCommand" : booster.getProfession().getName()) + ChatColor.YELLOW + " - " + ChatColor.GOLD + new DelayFormat().format(booster.getCreationDate() + booster.getLength() - System.currentTimeMillis()) + "\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/mmocore booster remove " + booster.getUniqueId().toString() + "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"Click to remove.\"}}}");
sender.sendMessage(ChatColor.YELLOW + "----------------------------------------------------");
return CommandResult.SUCCESS;

2
src/main/java/net/Indyuce/mmocore/comp/mythicmobs/Lootsplosion.java
View File

@ -17,7 +17,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.ItemTier;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.NBTItem;
public class Lootsplosion implements Listener {
private static final Random random = new Random();

4
src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java
View File

@ -15,8 +15,8 @@ import io.lumine.xikage.mythicmobs.io.MythicLineConfig;
import net.Indyuce.mmocore.MMOCoreUtils;
import net.Indyuce.mmocore.api.item.ConfigItem;
import net.Indyuce.mmocore.api.item.CurrencyItem;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class GoldPouchDrop extends Drop implements IMultiDrop {
private int min, max;

4
src/main/java/net/Indyuce/mmocore/gui/ClassSelect.java
View File

@ -24,8 +24,8 @@ import net.Indyuce.mmocore.gui.api.GeneratedInventory;
import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.manager.InventoryManager;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class ClassSelect extends EditableInventory {
public ClassSelect() {

4
src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java
View File

@ -27,8 +27,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class QuestViewer extends EditableInventory {
public QuestViewer() {

4
src/main/java/net/Indyuce/mmocore/gui/SkillList.java
View File

@ -27,8 +27,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class SkillList extends EditableInventory {
public SkillList() {

4
src/main/java/net/Indyuce/mmocore/gui/SubclassSelect.java
View File

@ -21,8 +21,8 @@ import net.Indyuce.mmocore.gui.api.GeneratedInventory;
import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.manager.InventoryManager;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class SubclassSelect extends EditableInventory {
public SubclassSelect() {

4
src/main/java/net/Indyuce/mmocore/gui/WaypointViewer.java
View File

@ -19,8 +19,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class WaypointViewer extends EditableInventory {
public WaypointViewer() {

2
src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java
View File

@ -15,7 +15,7 @@ import net.Indyuce.mmocore.MMOCoreUtils;
import net.Indyuce.mmocore.api.item.ConfigItem;
import net.Indyuce.mmocore.api.item.SmartGive;
import net.Indyuce.mmocore.gui.api.PluginInventory;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.NBTItem;
public class DepositMenu extends PluginInventory {
private ItemStack depositItem;

4
src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java
View File

@ -12,8 +12,8 @@ import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmocore.MMOCoreUtils;
import net.Indyuce.mmocore.gui.api.PluginInventory;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class GoldPouch extends PluginInventory {
private final boolean mob;

4
src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java
View File

@ -26,8 +26,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import net.Indyuce.mmocore.manager.InventoryManager;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class EditableFriendList extends EditableInventory {
public EditableFriendList() {

4
src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java
View File

@ -25,8 +25,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class EditableGuildAdmin extends EditableInventory {
public EditableGuildAdmin() {

4
src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java
View File

@ -26,8 +26,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class EditableGuildView extends EditableInventory {
public EditableGuildView() {

4
src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java
View File

@ -25,8 +25,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem;
import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem;
import net.Indyuce.mmocore.gui.api.item.Placeholders;
import net.mmogroup.mmolib.api.ItemTag;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class EditablePartyView extends EditableInventory {
public EditablePartyView() {

2
src/main/java/net/Indyuce/mmocore/listener/GoldPouchesListener.java
View File

@ -9,7 +9,7 @@ import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmocore.gui.eco.GoldPouch;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.NBTItem;
public class GoldPouchesListener implements Listener {
@EventHandler

9
src/main/java/net/Indyuce/mmocore/listener/event/PlayerAttackEventListener.java
View File

@ -47,8 +47,13 @@ public class PlayerAttackEventListener implements Listener {
* check damage systems from other MMOCore plugins + from MMOCore, and
* register an attack damage for easier plugin calculations
*/
if (damager instanceof Player && !damager.hasMetadata("NPC"))
Bukkit.getPluginManager().callEvent(new PlayerAttackEvent(PlayerData.get((Player) damager), event, MMOLib.plugin.getDamage().findInfo(event.getEntity()).mergeTypes(result)));
if (damager instanceof Player && !damager.hasMetadata("NPC")) {
AttackResult found = MMOLib.plugin.getDamage().findInfo(event.getEntity());
if (found != null)
result.mergeTypes(found);
Bukkit.getPluginManager().callEvent(new PlayerAttackEvent(PlayerData.get((Player) damager), event, result));
}
/*
* checks for killing

2
src/main/java/net/Indyuce/mmocore/listener/profession/Alchemy.java
View File

@ -25,7 +25,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.Type;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.NBTItem;
public class Alchemy implements Listener {
private Set<String> runnables = new HashSet<>();

2
src/main/java/net/Indyuce/mmocore/listener/profession/Smelting.java
View File

@ -19,7 +19,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.Type;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.NBTItem;
import net.mmogroup.mmolib.api.item.NBTItem;
public class Smelting implements Listener {