From 8cc2f0ea48f400f1329b1e2bccf8e51bf14ff574 Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 26 Jun 2024 21:12:28 +0800 Subject: [PATCH] Use new inventoryview abstraction --- main/src/main/java/net/citizensnpcs/Citizens.java | 14 +++++++------- main/src/main/java/net/citizensnpcs/util/NMS.java | 3 ++- .../main/java/net/citizensnpcs/util/NMSBridge.java | 3 ++- pom.xml | 1 + .../citizensnpcs/nms/v1_10_R1/util/NMSImpl.java | 3 ++- .../citizensnpcs/nms/v1_11_R1/util/NMSImpl.java | 3 ++- .../citizensnpcs/nms/v1_12_R1/util/NMSImpl.java | 3 ++- .../citizensnpcs/nms/v1_13_R2/util/NMSImpl.java | 3 ++- .../citizensnpcs/nms/v1_14_R1/util/NMSImpl.java | 3 ++- .../citizensnpcs/nms/v1_15_R1/util/NMSImpl.java | 3 ++- .../citizensnpcs/nms/v1_16_R3/util/NMSImpl.java | 3 ++- v1_17_R1/pom.xml | 2 +- .../citizensnpcs/nms/v1_17_R1/util/NMSImpl.java | 3 ++- v1_18_R2/pom.xml | 2 +- .../citizensnpcs/nms/v1_18_R2/util/NMSImpl.java | 3 ++- v1_19_R3/pom.xml | 2 +- .../citizensnpcs/nms/v1_19_R3/util/NMSImpl.java | 3 ++- v1_20_R4/pom.xml | 2 +- .../citizensnpcs/nms/v1_20_R4/util/NMSImpl.java | 3 ++- v1_21_R1/pom.xml | 2 +- .../citizensnpcs/nms/v1_21_R1/util/NMSImpl.java | 3 ++- .../net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java | 3 ++- 22 files changed, 43 insertions(+), 27 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java index 271c66522..ec11e2d61 100644 --- a/main/src/main/java/net/citizensnpcs/Citizens.java +++ b/main/src/main/java/net/citizensnpcs/Citizens.java @@ -17,7 +17,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredServiceProvider; @@ -60,6 +59,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.api.util.Placeholders; import net.citizensnpcs.api.util.SpigotUtil; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.api.util.Storage; import net.citizensnpcs.api.util.Translator; import net.citizensnpcs.api.util.YamlStorage; @@ -106,8 +106,8 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { } @Override - public InventoryView openAnvilInventory(Player player, Inventory inventory, String title) { - return NMS.openAnvilInventory(player, inventory, title); + public InventoryViewAPI openAnvilInventory(Player player, Inventory inventory, String title) { + return new InventoryViewAPI(NMS.openAnvilInventory(player, inventory, title)); } @Override @@ -132,10 +132,10 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { - if (view.getTopInventory().getType() == InventoryType.CRAFTING - || view.getTopInventory().getType() == InventoryType.CREATIVE - || view.getTopInventory().getType() == InventoryType.PLAYER) + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { + Inventory top = view.getTopInventory(); + if (top.getType() == InventoryType.CRAFTING || top.getType() == InventoryType.CREATIVE + || top.getType() == InventoryType.PLAYER) return; NMS.updateInventoryTitle(player, view, newTitle); } diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java index bc678bb60..7da35f9b5 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMS.java +++ b/main/src/main/java/net/citizensnpcs/util/NMS.java @@ -56,6 +56,7 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator; import net.citizensnpcs.npc.ai.MCTargetStrategy.TargetNavigator; import net.citizensnpcs.npc.ai.NPCHolder; @@ -959,7 +960,7 @@ public class NMS { BRIDGE.trySwim(entity, power); } - public static void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public static void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { BRIDGE.updateInventoryTitle(player, view, newTitle); } diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java index 618965b53..9522aab9a 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java +++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java @@ -38,6 +38,7 @@ import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator; import net.citizensnpcs.npc.ai.MCTargetStrategy.TargetNavigator; import net.citizensnpcs.npc.ai.NPCHolder; @@ -306,7 +307,7 @@ public interface NMSBridge { public void trySwim(Entity entity, float power); - public void updateInventoryTitle(Player player, InventoryView view, String newTitle); + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle); public void updateNavigationWorld(Entity entity, World world); diff --git a/pom.xml b/pom.xml index 55739b7e3..ba16e0ea2 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ 3.13.0 3.4.1 3.5.2 + 2.0.3 diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index cf0144fa7..e0cdcae80 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java @@ -85,6 +85,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_10_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_10_R1.entity.BatController; import net.citizensnpcs.nms.v1_10_R1.entity.BlazeController; @@ -1415,7 +1416,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Container active = handle.activeContainer; InventoryType type = view.getTopInventory().getType(); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java index bc4e58889..7b82b5b79 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java @@ -85,6 +85,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_11_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_11_R1.entity.BatController; import net.citizensnpcs.nms.v1_11_R1.entity.BlazeController; @@ -1475,7 +1476,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Container active = handle.activeContainer; InventoryType type = view.getTopInventory().getType(); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java index 29bb1790a..58afb413e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java @@ -86,6 +86,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_12_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_12_R1.entity.BatController; import net.citizensnpcs.nms.v1_12_R1.entity.BlazeController; @@ -1483,7 +1484,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Container active = handle.activeContainer; InventoryType type = view.getTopInventory().getType(); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index 796c75a2a..f58beb7ba 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -86,6 +86,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_13_R2.entity.ArmorStandController; import net.citizensnpcs.nms.v1_13_R2.entity.BatController; import net.citizensnpcs.nms.v1_13_R2.entity.BlazeController; @@ -1522,7 +1523,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Container active = handle.activeContainer; InventoryType type = view.getTopInventory().getType(); diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index 5e7e4bc23..0e0446eff 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -83,6 +83,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_14_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_14_R1.entity.BatController; import net.citizensnpcs.nms.v1_14_R1.entity.BlazeController; @@ -1536,7 +1537,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Containers menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index 3356217e9..b05f21ac4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -83,6 +83,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_15_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_15_R1.entity.BatController; import net.citizensnpcs.nms.v1_15_R1.entity.BeeController; @@ -1585,7 +1586,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Containers menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index e526e5cc0..393f7748e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -85,6 +85,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_16_R3.entity.ArmorStandController; import net.citizensnpcs.nms.v1_16_R3.entity.BatController; import net.citizensnpcs.nms.v1_16_R3.entity.BeeController; @@ -1604,7 +1605,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Containers menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_17_R1/pom.xml b/v1_17_R1/pom.xml index 7c863cbc6..c5799d8e7 100644 --- a/v1_17_R1/pom.xml +++ b/v1_17_R1/pom.xml @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 1.2.4 + ${special-source-plugin.version} package diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index 7707688e4..e26a23abc 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -80,6 +80,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_17_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_17_R1.entity.AxolotlController; import net.citizensnpcs.nms.v1_17_R1.entity.BatController; @@ -1599,7 +1600,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { ServerPlayer handle = (ServerPlayer) getHandle(player); MenuType menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_18_R2/pom.xml b/v1_18_R2/pom.xml index e05535d45..0ef34839a 100644 --- a/v1_18_R2/pom.xml +++ b/v1_18_R2/pom.xml @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 1.2.4 + ${special-source-plugin.version} package diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index 6991a25f8..d82e51d91 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -81,6 +81,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_18_R2.entity.ArmorStandController; import net.citizensnpcs.nms.v1_18_R2.entity.AxolotlController; import net.citizensnpcs.nms.v1_18_R2.entity.BatController; @@ -1609,7 +1610,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { ServerPlayer handle = (ServerPlayer) getHandle(player); MenuType menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_19_R3/pom.xml b/v1_19_R3/pom.xml index 2379cea2f..045001567 100644 --- a/v1_19_R3/pom.xml +++ b/v1_19_R3/pom.xml @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 1.2.4 + ${special-source-plugin.version} package diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java index a28e9e9cb..47be89f35 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java @@ -88,6 +88,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_19_R3.entity.AllayController; import net.citizensnpcs.nms.v1_19_R3.entity.ArmorStandController; import net.citizensnpcs.nms.v1_19_R3.entity.AxolotlController; @@ -1805,7 +1806,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { ServerPlayer handle = (ServerPlayer) getHandle(player); MenuType menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_20_R4/pom.xml b/v1_20_R4/pom.xml index 8d97643d1..1c0ab862b 100644 --- a/v1_20_R4/pom.xml +++ b/v1_20_R4/pom.xml @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + ${special-source-plugin.version} package diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java index 89c99756a..c2485459f 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java @@ -78,6 +78,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_20_R4.entity.AllayController; import net.citizensnpcs.nms.v1_20_R4.entity.ArmadilloController; import net.citizensnpcs.nms.v1_20_R4.entity.ArmorStandController; @@ -1801,7 +1802,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { ServerPlayer handle = (ServerPlayer) getHandle(player); MenuType menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_21_R1/pom.xml b/v1_21_R1/pom.xml index 4da53dd93..3050fc4ea 100644 --- a/v1_21_R1/pom.xml +++ b/v1_21_R1/pom.xml @@ -55,7 +55,7 @@ net.md-5 specialsource-maven-plugin - 2.0.2 + ${special-source-plugin.version} package diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java index d2f56acb1..a8343f4ff 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java @@ -78,6 +78,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_21_R1.entity.AllayController; import net.citizensnpcs.nms.v1_21_R1.entity.ArmadilloController; import net.citizensnpcs.nms.v1_21_R1.entity.ArmorStandController; @@ -1780,7 +1781,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { ServerPlayer handle = (ServerPlayer) getHandle(player); MenuType menuType = null; switch (view.getTopInventory().getType()) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java index fa4bac367..f5e31fd0e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java @@ -81,6 +81,7 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; import net.citizensnpcs.nms.v1_8_R3.entity.ArmorStandController; import net.citizensnpcs.nms.v1_8_R3.entity.BatController; import net.citizensnpcs.nms.v1_8_R3.entity.BlazeController; @@ -1340,7 +1341,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void updateInventoryTitle(Player player, InventoryView view, String newTitle) { + public void updateInventoryTitle(Player player, InventoryViewAPI view, String newTitle) { EntityPlayer handle = (EntityPlayer) getHandle(player); Container active = handle.activeContainer; InventoryType type = view.getTopInventory().getType();