From 147805da02e253a15dd0ce9b922ab3439370f455 Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Wed, 3 May 2023 05:17:41 +0100 Subject: [PATCH] remove more unused stuff --- .../listeners/InventoryListener.java | 29 ------- .../utility/inventory/ZInventory.java | 47 ----------- .../utility/inventory/ZInventoryCallback.java | 7 -- .../utility/inventory/ZInventoryHolder.java | 20 ----- .../utility/inventory/ZInventoryItem.java | 33 -------- .../utility/inventory/ZInventoryPage.java | 79 ------------------- .../utility/itemstack/ItemStackBuilder.java | 46 ----------- .../itemstack/ItemStackSerializer.java | 36 --------- .../java/lol/pyr/znpcsplus/ZNPCsPlus.java | 2 - 9 files changed, 299 deletions(-) delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/listeners/InventoryListener.java delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventory.java delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryCallback.java delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryHolder.java delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryItem.java delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryPage.java delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackBuilder.java delete mode 100644 spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackSerializer.java diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/listeners/InventoryListener.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/listeners/InventoryListener.java deleted file mode 100644 index bb39d20..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/listeners/InventoryListener.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.github.znetworkw.znpcservers.listeners; - -import io.github.znetworkw.znpcservers.utility.inventory.ZInventoryHolder; -import io.github.znetworkw.znpcservers.utility.inventory.ZInventoryPage; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.plugin.Plugin; - -public class InventoryListener implements Listener { - public InventoryListener(Plugin serversNPC) { - serversNPC.getServer().getPluginManager().registerEvents(this, serversNPC); - } - - @EventHandler - public void onClick(InventoryClickEvent event) { - if (!(event.getWhoClicked() instanceof Player player)) return; - if (event.getCurrentItem() == null) return; - if (!(event.getInventory().getHolder() instanceof ZInventoryHolder holder)) return; - event.setCancelled(true); - - ZInventoryPage page = holder.getzInventory().getPage(); - if (!page.containsItem(event.getRawSlot())) return; - - page.findItem(event.getRawSlot()).getInventoryCallback().onClick(event); - player.updateInventory(); - } -} diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventory.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventory.java deleted file mode 100644 index e9b66fe..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventory.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.github.znetworkw.znpcservers.utility.inventory; - -import io.github.znetworkw.znpcservers.utility.Utils; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; - -public class ZInventory { - private final Player player; - private ZInventoryPage page; - private Inventory inventory; - - public ZInventory(Player player) { - this.player = player; - } - - public Player getPlayer() { - return this.player; - } - - public ZInventoryPage getPage() { - return this.page; - } - - public Inventory getInventory() { - return this.inventory; - } - - public void setCurrentPage(ZInventoryPage page) { - this.page = page; - } - - public Inventory build(ZInventoryPage page) { - if (page == null) throw new IllegalStateException("page is null"); - if (page.getRows() / 9 > 6) throw new IllegalArgumentException(String.format("Unexpected rows size. Has %d, max %d", page.getRows(), 6)); - setCurrentPage(page); - page.getInventoryItems().removeIf(zInventoryItem -> !zInventoryItem.isDefault()); - page.update(); - this.inventory = Bukkit.createInventory(new ZInventoryHolder(this), page.getRows(), Utils.toColor(page.getPageName())); - page.getInventoryItems().forEach(zInventoryItem -> this.inventory.setItem(zInventoryItem.getSlot(), zInventoryItem.getItemStack())); - return this.inventory; - } - - public Inventory build() { - return build(this.page); - } -} diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryCallback.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryCallback.java deleted file mode 100644 index e7cec79..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryCallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.znetworkw.znpcservers.utility.inventory; - -import org.bukkit.event.inventory.InventoryClickEvent; - -public interface ZInventoryCallback { - void onClick(InventoryClickEvent paramInventoryClickEvent); -} diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryHolder.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryHolder.java deleted file mode 100644 index 022075c..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryHolder.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.github.znetworkw.znpcservers.utility.inventory; - -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryHolder; - -public class ZInventoryHolder implements InventoryHolder { - private final ZInventory zInventory; - - public ZInventoryHolder(ZInventory zInventory) { - this.zInventory = zInventory; - } - - public ZInventory getzInventory() { - return this.zInventory; - } - - public Inventory getInventory() { - return this.zInventory.getInventory(); - } -} diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryItem.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryItem.java deleted file mode 100644 index 5e86af8..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryItem.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.github.znetworkw.znpcservers.utility.inventory; - -import org.bukkit.inventory.ItemStack; - -public class ZInventoryItem { - private final ItemStack itemStack; - private final int slot; - private final boolean isDefault; - private final ZInventoryCallback clickCallback; - - public ZInventoryItem(ItemStack itemStack, int slot, boolean isDefault, ZInventoryCallback zInventoryCallback) { - this.itemStack = itemStack; - this.slot = slot; - this.isDefault = isDefault; - this.clickCallback = zInventoryCallback; - } - - public ItemStack getItemStack() { - return this.itemStack; - } - - public int getSlot() { - return this.slot; - } - - public boolean isDefault() { - return this.isDefault; - } - - public ZInventoryCallback getInventoryCallback() { - return this.clickCallback; - } -} diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryPage.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryPage.java deleted file mode 100644 index ab9ff36..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/inventory/ZInventoryPage.java +++ /dev/null @@ -1,79 +0,0 @@ -package io.github.znetworkw.znpcservers.utility.inventory; - -import io.github.znetworkw.znpcservers.utility.itemstack.ItemStackBuilder; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import java.util.ArrayList; -import java.util.List; - -public abstract class ZInventoryPage { - private final ZInventory zInventory; - private final String pageName; - private final int rows; - private final List inventoryItems; - - public ZInventoryPage(ZInventory zInventory, String inventoryName, int rows) { - this.zInventory = zInventory; - this.pageName = inventoryName; - this.rows = rows * 9; - this.inventoryItems = new ArrayList<>(); - if (zInventory.getInventory() != null) { - ZInventoryPage zInventoryPage = zInventory.getPage(); - addItem(ItemStackBuilder.forMaterial(Material.ARROW) - .setName(ChatColor.GREEN + "Go back") - .setLore(ChatColor.GRAY + "click here...").build(), this.rows - 9, true, event -> { - zInventory.setCurrentPage(zInventoryPage); - openInventory(); - }); - } - zInventory.setCurrentPage(this); - } - - public ZInventory getInventory() { - return this.zInventory; - } - - public String getPageName() { - return this.pageName; - } - - public int getRows() { - return this.rows; - } - - public List getInventoryItems() { - return this.inventoryItems; - } - - public boolean containsItem(int slot) { - return this.inventoryItems.stream().anyMatch(zInventoryItem -> (zInventoryItem.getSlot() == slot)); - } - - public ZInventoryItem findItem(int slot) { - return this.inventoryItems.stream() - .filter(zInventoryItem -> (zInventoryItem.getSlot() == slot)) - .findFirst() - .orElseThrow(() -> new IllegalStateException("can't find item for slot " + slot)); - } - - public void addItem(ItemStack itemStack, int slot, boolean isDefault, ZInventoryCallback callback) { - this.inventoryItems.add(new ZInventoryItem(itemStack, slot, isDefault, callback)); - } - - public void addItem(ItemStack itemStack, int slot, ZInventoryCallback callback) { - addItem(itemStack, slot, false, callback); - } - - public Player getPlayer() { - return this.zInventory.getPlayer(); - } - - public void openInventory() { - this.zInventory.getPlayer().openInventory(this.zInventory.build()); - } - - public abstract void update(); -} diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackBuilder.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackBuilder.java deleted file mode 100644 index 560ff6c..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackBuilder.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.github.znetworkw.znpcservers.utility.itemstack; - -import io.github.znetworkw.znpcservers.utility.Utils; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; - -import java.util.Arrays; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - -public class ItemStackBuilder { - private final ItemStack itemStack; - - private final ItemMeta itemMeta; - - protected ItemStackBuilder(ItemStack stack) { - this.itemStack = stack; - this.itemMeta = stack.getItemMeta(); - } - - public static ItemStackBuilder forMaterial(Material material) { - if (material == null || material == Material.AIR) throw new IllegalStateException("can't create builder for a NULL material."); - return new ItemStackBuilder(new ItemStack(material, 1)); - } - - public ItemStackBuilder setName(String name) { - this.itemMeta.setDisplayName(Utils.toColor(name)); - return this; - } - - public ItemStackBuilder setLore(Iterable lore) { - this.itemMeta.setLore(StreamSupport.stream(lore.spliterator(), false).map(Utils::toColor).collect(Collectors.toList())); - this.itemStack.setItemMeta(this.itemMeta); - return this; - } - - public ItemStackBuilder setLore(String... lore) { - return setLore(Arrays.asList(lore)); - } - - public ItemStack build() { - this.itemStack.setItemMeta(this.itemMeta); - return this.itemStack; - } -} diff --git a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackSerializer.java b/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackSerializer.java deleted file mode 100644 index f68490e..0000000 --- a/spigot/src/main/java/io/github/znetworkw/znpcservers/utility/itemstack/ItemStackSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.github.znetworkw.znpcservers.utility.itemstack; - -import com.google.gson.*; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; -import org.bukkit.util.io.BukkitObjectInputStream; -import org.bukkit.util.io.BukkitObjectOutputStream; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.Base64; - -public class ItemStackSerializer implements JsonSerializer, JsonDeserializer { - private static final ItemStack DEFAULT = new ItemStack(Material.AIR); - - public ItemStack deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(Base64.getDecoder().decode(json.getAsString())); - try (BukkitObjectInputStream bukkitObjectOutputStream = new BukkitObjectInputStream(byteArrayInputStream)) { - return (ItemStack) bukkitObjectOutputStream.readObject(); - } catch (IOException | ClassNotFoundException e) { - return DEFAULT; - } - } - - public JsonElement serialize(ItemStack src, Type typeOfSrc, JsonSerializationContext context) { - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - try (BukkitObjectOutputStream bukkitObjectOutputStream = new BukkitObjectOutputStream(byteArrayOutputStream)) { - bukkitObjectOutputStream.writeObject(src); - return new JsonPrimitive(Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray())); - } catch (IOException e) { - throw new JsonParseException("Cannot serialize itemstack", e); - } - } -} diff --git a/spigot/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java b/spigot/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java index 96ebb7d..be2689c 100644 --- a/spigot/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java +++ b/spigot/src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java @@ -4,7 +4,6 @@ import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.PacketListenerPriority; import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes; import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder; -import io.github.znetworkw.znpcservers.listeners.InventoryListener; import io.github.znetworkw.znpcservers.utility.BungeeUtils; import lol.pyr.znpcsplus.api.ZApiProvider; import lol.pyr.znpcsplus.api.entity.EntityProperty; @@ -125,7 +124,6 @@ public class ZNPCsPlus extends JavaPlugin { log(ChatColor.WHITE + " * Starting tasks..."); new NPCVisibilityTask(); - new InventoryListener(this); new SkinCacheCleanTask(); new UserListener(this); if (Configs.config().checkForUpdates()) new UpdateNotificationListener(this, new UpdateChecker(this));