Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-22 04:37:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Jules 2023-07-12 19:28:24 +02:00
commit 4f88d6094a
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MMOItems-Dist/pom.xml
View File

@ -19,6 +19,7 @@
<!-- Dependencies -->
<dependencies>
<!-- Spigot API -->
<dependency>
<groupId>org.spigotmc</groupId>
@ -26,6 +27,7 @@
<version>1.18-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- MMOItems API -->
<dependency>
<groupId>net.Indyuce</groupId>
@ -33,6 +35,15 @@
<version>6.9.5-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<!-- Profile API -->
<dependency>
<groupId>fr.phoenixdevt</groupId>
<artifactId>Profile-API</artifactId>
<version>1.0</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
<!-- Build -->

5
MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/MMOItemsBukkit.java
View File

@ -1,5 +1,6 @@
package net.Indyuce.mmoitems;
import io.lumine.mythic.lib.MythicLib;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.comp.PhatLootsHook;
import net.Indyuce.mmoitems.gui.listener.GuiListener;
@ -32,6 +33,10 @@ public class MMOItemsBukkit {
if (plugin.getLanguage().disableRemovedItems)
Bukkit.getPluginManager().registerEvents(new DisabledItemsListener(plugin), plugin);
// Profile support
if (MythicLib.plugin.hasProfiles())
Bukkit.getPluginManager().registerEvents(new ProfileSupportListener(), plugin);
Bukkit.getScheduler().runTaskTimer(plugin, () -> Bukkit.getOnlinePlayers().forEach(player -> PlayerData.get(player).updateStats()), 100, 20);
}
}

15
MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/ItemListener.java
View File

@ -1,5 +1,6 @@
package net.Indyuce.mmoitems.listener;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.item.NBTItem;
import io.lumine.mythic.lib.api.util.ui.SilentNumbers;
import net.Indyuce.mmoitems.ItemStats;
@ -24,7 +25,6 @@ import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.inventory.CraftingInventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.Damageable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -131,7 +131,8 @@ public class ItemListener implements Listener {
@EventHandler(ignoreCancelled = true)
private void inventoryMove(InventoryClickEvent event) {
if (event.getInventory().getType() != InventoryType.CRAFTING || !(event.getWhoClicked() instanceof Player)) return;
if (event.getInventory().getType() != InventoryType.CRAFTING || !(event.getWhoClicked() instanceof Player))
return;
ItemStack newItem = modifyItem(event.getCurrentItem(), (Player) event.getWhoClicked(), ReforgeReason.CLICK);
if (newItem != null) event.setCurrentItem(newItem);
}
@ -143,10 +144,12 @@ public class ItemListener implements Listener {
event.setCancelled(true);
}
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void playerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
if (!MythicLib.plugin.hasProfiles()) updateInventory(event.getPlayer());
}
public static void updateInventory(Player player) {
ItemStack newItem = modifyItem(player.getEquipment().getHelmet(), player, ReforgeReason.JOIN);
if (newItem != null) player.getEquipment().setHelmet(newItem);
newItem = modifyItem(player.getEquipment().getChestplate(), player, ReforgeReason.JOIN);
@ -166,7 +169,7 @@ public class ItemListener implements Listener {
}
@Nullable
private ItemStack modifyItem(@Nullable ItemStack stack, @NotNull Player player, @NotNull ReforgeReason reason) {
private static ItemStack modifyItem(@Nullable ItemStack stack, @NotNull Player player, @NotNull ReforgeReason reason) {
// Sleep on metaless stacks
if (stack == null || !stack.hasItemMeta())
@ -186,7 +189,7 @@ public class ItemListener implements Listener {
return null;
// Greater RevID in template? Go ahead, update!
int templateRevision =mod. getTemplate().getRevisionId();
int templateRevision = mod.getTemplate().getRevisionId();
int mmoitemRevision = (mod.getNBTItem().hasTag(ItemStats.REVISION_ID.getNBTPath()) ? mod.getNBTItem().getInteger(ItemStats.REVISION_ID.getNBTPath()) : 1);
if (templateRevision <= mmoitemRevision)
return null;

14
MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/ProfileSupportListener.java Normal file
View File

@ -0,0 +1,14 @@
package net.Indyuce.mmoitems.listener;
import fr.phoenixdevt.profile.event.ProfileSelectEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
public class ProfileSupportListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void a(ProfileSelectEvent event) {
ItemListener.updateInventory(event.getPlayer());
}
}