organisation and hologram interaction

src/main/java/me/night/nullvalkyrie/Main.java

@@ -2,12 +2,14 @@ package me.night.nullvalkyrie;
 
 import com.mongodb.client.MongoDatabase;
 import io.github.cdimascio.dotenv.Dotenv;
+import me.night.nullvalkyrie.events.listeners.CustomItemEvents;
+import me.night.nullvalkyrie.events.listeners.DamageEffectEvents;
+import me.night.nullvalkyrie.events.listeners.NPCEvents;
+import me.night.nullvalkyrie.events.listeners.ServerEvents;
 import me.night.nullvalkyrie.ui.inventory.InventoryListener;
 import me.night.nullvalkyrie.database.NPCDataManager;
 import me.night.nullvalkyrie.discord.DiscordClientManager;
 import me.night.nullvalkyrie.enchantments.EnchantmentManager;
-import me.night.nullvalkyrie.events.*;
-import me.night.nullvalkyrie.npc.*;
 import me.night.nullvalkyrie.ui.ScoreboardListener;
 import me.night.nullvalkyrie.util.*;
 import me.night.nullvalkyrie.commands.*;

src/main/java/me/night/nullvalkyrie/commands/RankCommand.java

@@ -1,7 +1,7 @@
 package me.night.nullvalkyrie.commands;
 
 import me.night.nullvalkyrie.database.RankDataManager;
-import me.night.nullvalkyrie.ui.Rank;
+import me.night.nullvalkyrie.enums.Rank;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;

src/main/java/me/night/nullvalkyrie/database/NPCDataManager.java

@@ -15,7 +15,7 @@ import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
 
 import java.util.UUID;
 
-import static me.night.nullvalkyrie.npc.NPCManager.*;
+import static me.night.nullvalkyrie.entities.npcs.NPCManager.*;
 
 
 public class NPCDataManager {

src/main/java/me/night/nullvalkyrie/database/RankDataManager.java

@@ -2,7 +2,7 @@ package me.night.nullvalkyrie.database;
 
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.model.Filters;
-import me.night.nullvalkyrie.ui.Rank;
+import me.night.nullvalkyrie.enums.Rank;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.bukkit.Bukkit;

src/main/java/me/night/nullvalkyrie/entities/npcs/NPCManager.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.npc;
+package me.night.nullvalkyrie.entities.npcs;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;

src/main/java/me/night/nullvalkyrie/entities/npcs/Skin.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.npc;
+package me.night.nullvalkyrie.entities.npcs;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -11,8 +11,8 @@ import java.io.InputStreamReader;
 import java.net.URL;
 
 public class Skin {
-    private String texture;
+    private final String texture;
-    private String signature;
+    private final String signature;
     public Skin(String texture, String signature) {
         this.texture = texture;
         this.signature = signature;

src/main/java/me/night/nullvalkyrie/enums/Rank.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.ui;
+package me.night.nullvalkyrie.enums;
 
 import org.bukkit.ChatColor;
 

src/main/java/me/night/nullvalkyrie/enums/Rarity.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.items;
+package me.night.nullvalkyrie.enums;
 
 import org.bukkit.ChatColor;
 public enum Rarity {
@@ -23,25 +23,16 @@ public enum Rarity {
         return color;
     }
     public static Rarity getRarity(String str) {
-        switch(str) {
+        return switch (str) {
-            case "COMMON":
+            case "COMMON" -> COMMON;
-                return COMMON;
+            case "UNCOMMON" -> UNCOMMON;
-            case "UNCOMMON":
+            case "RARE" -> RARE;
-                return UNCOMMON;
+            case "EPIC" -> EPIC;
-            case "RARE":
+            case "LEGENDARY" -> LEGENDARY;
-                return RARE;
+            case "MYTHIC" -> MYTHIC;
-            case "EPIC":
+            case "ULTRA" -> ULTRA;
-                return EPIC;
+            case "GRAND" -> GRAND;
-            case "LEGENDARY":
+            default -> COMMON;
-                return LEGENDARY;
+        };
-            case "MYTHIC":
-                return MYTHIC;
-            case "ULTRA":
-                return ULTRA;
-            case "GRAND":
-                return GRAND;
-            default:
-                return COMMON;
-        }
     }
 }

src/main/java/me/night/nullvalkyrie/events/custom/InteractHologramEvent.java

@@ -0,0 +1,41 @@
+package me.night.nullvalkyrie.events.custom;
+
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+public class InteractHologramEvent extends Event implements Cancellable {
+    private boolean isCancelled;
+    public Player player;
+    public ArmorStand hologram;
+    private static final HandlerList HANDLERS = new HandlerList();
+    public InteractHologramEvent(Player player, ArmorStand hologram) {
+        this.player = player;
+        this.hologram = hologram;
+    }
+    public Player getPlayer() {
+        return player;
+    }
+    public ArmorStand getHologram() {
+        return hologram;
+    }
+    @Override
+    public boolean isCancelled() {
+        return isCancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        isCancelled = cancel;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    public static HandlerList getHandlerList() { return HANDLERS; }
+}

src/main/java/me/night/nullvalkyrie/events/custom/RightClickNPCEvent.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.npc;
+package me.night.nullvalkyrie.events.custom;
 
 import net.minecraft.server.level.EntityPlayer;
 import org.bukkit.entity.Player;
@@ -7,12 +7,12 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class RightClickNPC extends Event implements Cancellable {
+public class RightClickNPCEvent extends Event implements Cancellable {
     private final Player player;
     private final EntityPlayer npc;
     private boolean isCancelled;
     private static final HandlerList HANDLERS = new HandlerList();
-    public RightClickNPC(Player player, EntityPlayer npc) {
+    public RightClickNPCEvent(Player player, EntityPlayer npc) {
         this.player = player;
         this.npc = npc;
     }

src/main/java/me/night/nullvalkyrie/events/listeners/CustomItemEvents.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.events;
+package me.night.nullvalkyrie.events.listeners;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
@@ -7,7 +7,7 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.BlockPosition;
 import me.night.nullvalkyrie.items.CustomItemManager;
 import me.night.nullvalkyrie.items.Pickaxe;
-import me.night.nullvalkyrie.items.Rarity;
+import me.night.nullvalkyrie.enums.Rarity;
 import me.night.nullvalkyrie.Main;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -158,8 +158,7 @@ public class CustomItemEvents implements Listener {
     @EventHandler
     public void onEntityShoot(EntityShootBowEvent e) {
         if (e.getProjectile() instanceof Arrow) {
-            if (e.getEntity() instanceof Player) {
+            if (e.getEntity() instanceof Player player) {
-                Player player = (Player) e.getEntity();
                 if (player.getInventory().getItemInMainHand().getItemMeta() != null) {
                     String name = player.getInventory().getItemInMainHand().getItemMeta().getDisplayName();
                     if (name.equalsIgnoreCase(Rarity.MYTHIC.getColor() + "Terminator")) {
@@ -174,8 +173,7 @@ public class CustomItemEvents implements Listener {
 
     @EventHandler
     public void onProjectileHit(ProjectileHitEvent e) {
-        if (e.getEntity().getShooter() instanceof Player) {
+        if (e.getEntity().getShooter() instanceof Player shooter) {
-            Player shooter = (Player) e.getEntity().getShooter();
             if (shooter.getInventory().getItemInMainHand().getItemMeta() != null) {
                 String name = shooter.getInventory().getItemInMainHand().getItemMeta().getDisplayName();
                 if (name.equalsIgnoreCase(Rarity.LEGENDARY.getColor() + "Frag Grenade")) {
@@ -207,8 +205,7 @@ public class CustomItemEvents implements Listener {
 
     @EventHandler
     public void Projectile(ProjectileLaunchEvent e) {
-        if (e.getEntity().getShooter() instanceof Player) {
+        if (e.getEntity().getShooter() instanceof Player player) {
-            Player player = (Player) e.getEntity().getShooter();
             if (player.getInventory().getItemInMainHand().getItemMeta() != null) {
                 String name = player.getInventory().getItemInMainHand().getItemMeta().getDisplayName();
                 if (name.equalsIgnoreCase(Rarity.LEGENDARY.getColor() + "Frag Grenade")) {
@@ -312,13 +309,6 @@ public class CustomItemEvents implements Listener {
             p.openMerchant(merchant, true);
         }
     }
-
-    //    For hologram clicks to change page
-//    @EventHandler
-//    public void onEntityInteract(EntityInteractEvent e) {
-//        System.out.println(e.getEntity().getLocation());
-//        e.getEntity().setCustomName(ChatColor.RED + "Changed name since you ust clicked lol");
-//    }
     private final HashMap<Location, Integer> blockStages = new HashMap<>();
     private final HashMap<UUID, Long> miningCooldown = new HashMap<>();
     @EventHandler

src/main/java/me/night/nullvalkyrie/events/listeners/DamageEffectEvents.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.events;
+package me.night.nullvalkyrie.events.listeners;
 
 import me.night.nullvalkyrie.Main;
 import me.night.nullvalkyrie.util.Util;

src/main/java/me/night/nullvalkyrie/events/listeners/NPCEvents.java

@@ -1,5 +1,7 @@
-package me.night.nullvalkyrie.npc;
+package me.night.nullvalkyrie.events.listeners;
 
+import me.night.nullvalkyrie.events.custom.RightClickNPCEvent;
+import me.night.nullvalkyrie.entities.npcs.NPCManager;
 import me.night.nullvalkyrie.util.Util;
 import net.minecraft.network.protocol.game.PacketPlayOutEntity;
 import net.minecraft.network.protocol.game.PacketPlayOutEntityHeadRotation;
@@ -13,7 +15,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
 
 public class NPCEvents implements Listener {
     @EventHandler
-    public void onClick(RightClickNPC e) {
+    public void onClick(RightClickNPCEvent e) {
         Player player = e.getPlayer();
         if (e.getNPC().getBukkitEntity().getName().equalsIgnoreCase(Util.color("&1&lRB18"))) {
             player.sendMessage(Util.color("Hi"));

src/main/java/me/night/nullvalkyrie/events/listeners/ServerEvents.java

@@ -1,6 +1,7 @@
-package me.night.nullvalkyrie.events;
+package me.night.nullvalkyrie.events.listeners;
 
-import me.night.nullvalkyrie.npc.PacketInjector;
+import me.night.nullvalkyrie.events.custom.InteractHologramEvent;
+import me.night.nullvalkyrie.packets.PacketInjector;
 import me.night.nullvalkyrie.util.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -37,6 +38,11 @@ public class ServerEvents implements Listener {
         } catch (Exception ee) {
             ee.printStackTrace();
         }
-
+    }
+    @EventHandler
+    public void onClickHologram(InteractHologramEvent e) {
+        if (e.getHologram().getCustomName().equals(ChatColor.GOLD + "Click me to change!!!")) {
+            System.out.println(true);
+        }
     }
 }

src/main/java/me/night/nullvalkyrie/items/CustomItemManager.java

@@ -1,6 +1,7 @@
 package me.night.nullvalkyrie.items;
 
 import me.night.nullvalkyrie.Main;
+import me.night.nullvalkyrie.enums.Rarity;
 import me.night.nullvalkyrie.util.Util;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -13,8 +14,6 @@ import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
 
 import java.io.File;
 import java.io.IOException;
@@ -102,7 +101,6 @@ public class CustomItemManager {
         return item;
     }
 
-
     public static void setItemRecipe(NamespacedKey key, ItemStack i, int ingredient, String shape1, String shape2, String shape3, List<Material> ingredients) {
 //        ShapedRecipe wither_sword_recipe = new ShapedRecipe(new NamespacedKey(main, "widow_sword"), widow_sword);
 //        wither_sword_recipe.shape(" A ", " A "," B ");
@@ -111,20 +109,6 @@ public class CustomItemManager {
 //        Bukkit.addRecipe(wither_sword_recipe);
     }
 
-    public static YamlConfiguration loadConfig(String path) {
-        File f = new File(Main.getPlugin(Main.class).getDataFolder(), path);
-        if (!f.exists()) {
-            try {
-                f.createNewFile();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        }
-        return YamlConfiguration.loadConfiguration(f);
-    }
-
-
     public static void updateYamlFilesToPlugin(String path) {
         File file = new File(Main.getPlugin(Main.class).getDataFolder(), path);
         if (!file.exists()) Main.getPlugin(Main.class).saveResource(path, true);

src/main/java/me/night/nullvalkyrie/packets/PacketHandler.java

@@ -1,47 +1,70 @@
-package me.night.nullvalkyrie.npc;
+package me.night.nullvalkyrie.packets;
 
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import me.night.nullvalkyrie.Main;
+import me.night.nullvalkyrie.entities.npcs.NPCManager;
+import me.night.nullvalkyrie.events.custom.InteractHologramEvent;
+import me.night.nullvalkyrie.events.custom.RightClickNPCEvent;
 import net.minecraft.network.protocol.game.PacketPlayInUseEntity;
 import net.minecraft.server.level.EntityPlayer;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
 import java.lang.reflect.Field;
 
 public class PacketHandler extends ChannelDuplexHandler {
     private final Player player;
+
     public PacketHandler(Player player) {
         this.player = player;
     }
+
     @Override
     public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
         super.write(ctx, msg, promise);
     }
+
     @Override
     public void channelRead(ChannelHandlerContext c, Object packet) throws Exception {
         if (packet.getClass().getSimpleName().equalsIgnoreCase("PacketPlayInUseEntity")) {
             PacketPlayInUseEntity pk = (PacketPlayInUseEntity) packet;
             int entityID = (int) PacketInjector.getFieldValue(packet, "a");
             boolean sneak = (boolean) PacketInjector.getFieldValue(packet, "c");
+            Bukkit.getScheduler().scheduleSyncDelayedTask(Main.getPlugin(Main.class), new Runnable() {
+                @Override
+                public void run() {
+                    for (Entity entity : Bukkit.getWorld("world").getEntities()) {
+                        if (entity.getEntityId() == entityID && entity.getType() == EntityType.ARMOR_STAND){
+                            Bukkit.getPluginManager().callEvent(new InteractHologramEvent(player, (ArmorStand) entity));
+                        }
+                    }
+                }
+            }, 0);
 
             Field type = pk.getClass().getDeclaredField("b");
             type.setAccessible(true);
             Object data = type.get(pk);
-            if (data.toString().split("\\$")[1].charAt(0) == 'e') { return; }
+            if (data.toString().split("\\$")[1].charAt(0) == 'e') {
+                return;
+            }
             try {
                 Field hand = data.getClass().getDeclaredField("a");
                 hand.setAccessible(true);
-                if (!hand.get(data).toString().equals("MAIN_HAND")) { return; }
+                if (!hand.get(data).toString().equals("MAIN_HAND")) {
+                    return;
+                }
                 //Right Click
                 for (EntityPlayer npcs : NPCManager.getNPCs()) {
                     if (npcs.ae() == entityID && sneak) {
                         Bukkit.getScheduler().scheduleSyncDelayedTask(Main.getPlugin(Main.class), new Runnable() {
                             @Override
                             public void run() {
-                                Bukkit.getPluginManager().callEvent(new RightClickNPC(player, npcs));
+                                Bukkit.getPluginManager().callEvent(new RightClickNPCEvent(player, npcs));
                             }
                         }, 0);
 

src/main/java/me/night/nullvalkyrie/packets/PacketInjector.java

@@ -1,4 +1,4 @@
-package me.night.nullvalkyrie.npc;
+package me.night.nullvalkyrie.packets;
 
 import io.netty.channel.Channel;
 import net.minecraft.server.level.EntityPlayer;

src/main/java/me/night/nullvalkyrie/ui/NameTagManager.java

@@ -1,6 +1,7 @@
 package me.night.nullvalkyrie.ui;
 
 import me.night.nullvalkyrie.database.RankDataManager;
+import me.night.nullvalkyrie.enums.Rank;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.*;

src/main/java/me/night/nullvalkyrie/ui/ScoreboardListener.java

@@ -2,7 +2,8 @@ package me.night.nullvalkyrie.ui;
 
 import me.night.nullvalkyrie.Main;
 import me.night.nullvalkyrie.database.RankDataManager;
-import me.night.nullvalkyrie.npc.NPCManager;
+import me.night.nullvalkyrie.enums.Rank;
+import me.night.nullvalkyrie.entities.npcs.NPCManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;