Minor cleanup & fixes

Author: sarhatabaot

build.gradle.kts

@@ -8,18 +8,6 @@ plugins {
 group = "me.tychsen"
 version  = "1.7.7"
 
-repositories {
-    mavenCentral()
-    maven ("https://repo.aikar.co/content/groups/aikar/")
-    maven ("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
-    maven ("https://nexus.hc.to/content/repositories/pub_releases")
-    maven ("https://oss.sonatype.org/content/groups/public/")
-    maven ("https://repo.codemc.org/repository/maven-public")
-    maven ("https://jitpack.io")
-    maven ("https://repo.rosewooddev.io/repository/public/")
-    maven ("https://repo.mattstudios.me/artifactory/public/")
-}
-
 dependencies {
     compileOnly(libs.spigot.api)
     compileOnly(libs.vault.api)

settings.gradle.kts

@@ -1,6 +1,17 @@
 rootProject.name = "EnchantGUI"
 
 dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        maven ("https://repo.aikar.co/content/groups/aikar/")
+        maven ("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+        maven ("https://nexus.hc.to/content/repositories/pub_releases")
+        maven ("https://oss.sonatype.org/content/groups/public/")
+        maven ("https://repo.codemc.org/repository/maven-public")
+        maven ("https://jitpack.io")
+        maven ("https://repo.rosewooddev.io/repository/public/")
+        maven ("https://repo.mattstudios.me/artifactory/public/")
+    }
     versionCatalogs {
         create("libs") {
             plugin("shadow", "com.github.johnrengelman.shadow").version("8.1.1")

settings.gradle.kts~

@@ -12,7 +12,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 public class EShopConfig {

src/main/java/me/tychsen/enchantgui/config/EShopConfig.java

@@ -16,7 +16,7 @@ public class Enchants {
     private List<ItemStack> enchantList;
 
     public Enchants() {
-        enchantList = new ArrayList<>();
+        this.enchantList = new ArrayList<>();
         createEnchantList();
     }
 
@@ -25,7 +25,7 @@ public List<ItemStack> getEnchantList() {
     }
 
     public void reload() {
-        enchantList = new ArrayList<>();
+        this.enchantList = new ArrayList<>();
         createEnchantList();
     }
 
@@ -86,10 +86,12 @@ private void addItem(Enchantment type, Material mat, String displayName) {
         ItemStack item = new ItemStack(mat);
         item.addEnchantment(type, 1);
         ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(displayName);
-        meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS);
-        item.setItemMeta(meta);
-        enchantList.add(item);
+        if (meta != null) {
+            meta.setDisplayName(displayName);
+            meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS);
+            item.setItemMeta(meta);
+            enchantList.add(item);
+        }
     }
 
 }

src/main/java/me/tychsen/enchantgui/config/EShopConfig.java~

@@ -24,7 +24,9 @@ public void onPlayerInteractEvent(PlayerInteractEvent e) {
             return;
         }
 
-        if (e.getAction() == Action.RIGHT_CLICK_BLOCK && e.getClickedBlock().getType() == Material.ENCHANTING_TABLE) {
+        if (e.getAction() == Action.RIGHT_CLICK_BLOCK &&
+                e.getClickedBlock() != null &&
+                e.getClickedBlock().getType() == Material.ENCHANTING_TABLE) {
             e.setCancelled(true);
             handlePlayerInteractEvent(e);
         }