use AlpsHeadsUtils and some code cleanup

ASEAN-Build-The-Earth · Nov 8, 2023 · 40254bb · 40254bb
1 parent 9dd354a
commit 40254bb
Showing 8 changed files with 47 additions and 47 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>li.cinnazeyy</groupId>
     <artifactId>LangLibs</artifactId>
-    <version>1.1</version>
+    <version>1.3</version>
     <packaging>jar</packaging>
 
     <name>LangLibs</name>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -112,6 +112,7 @@
             <groupId>com.github.hamza-cskn.obliviate-invs</groupId>
             <artifactId>core</artifactId>
             <version>4.1.13</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- HeadDatabase-API -->
@@ -125,7 +126,7 @@
         <dependency>
             <groupId>com.alpsbte.alpslib</groupId>
             <artifactId>alpslib-utils</artifactId>
-            <version>1.0.13</version>
+            <version>1.1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/li/cinnazeyy/langlibs/LangLibs.java b/src/main/java/li/cinnazeyy/langlibs/LangLibs.java
@@ -3,6 +3,7 @@
 import li.cinnazeyy.langlibs.commands.CMD_Language;
 import li.cinnazeyy.langlibs.core.DatabaseConnection;
 import li.cinnazeyy.langlibs.core.EventListener;
+import li.cinnazeyy.langlibs.util.LangUtils;
 import mc.obliviate.inventory.InventoryAPI;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -16,7 +17,7 @@
 import java.util.logging.Level;
 
 public final class LangLibs extends JavaPlugin {
-    private static final String VERSION = "1.1";
+    private static final String VERSION = "1.3";
     private static LangLibs plugin;
     private YamlConfiguration config;
     @Override
@@ -26,6 +27,9 @@ public void onEnable() {
         // Create configs
         createConfig();
 
+        // Register language heads
+        LangUtils.registerCustomHeads();
+
         // Initialize database connection
         try {
             DatabaseConnection.InitializeDatabase();

diff --git a/src/main/java/li/cinnazeyy/langlibs/core/EventListener.java b/src/main/java/li/cinnazeyy/langlibs/core/EventListener.java
@@ -2,8 +2,6 @@
 
 import li.cinnazeyy.langlibs.LangLibs;
 import li.cinnazeyy.langlibs.core.language.LangLibAPI;
-import li.cinnazeyy.langlibs.util.HeadUtils;
-import me.arcaniax.hdb.api.DatabaseLoadEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -36,9 +34,4 @@ public void onJoin(PlayerJoinEvent event) {
     public void onDisconnect(PlayerQuitEvent event) {
         LangLibAPI.removePlayerLang(event.getPlayer());
     }
-
-    @EventHandler
-    public void onDatabaseLoad(DatabaseLoadEvent event) {
-        HeadUtils.loadHeadsAsync();
-    }
 }
diff --git a/src/main/java/li/cinnazeyy/langlibs/core/Language.java b/src/main/java/li/cinnazeyy/langlibs/core/Language.java
@@ -9,13 +9,31 @@ public enum Language {
     ru_RU("Русский", "Россия","4406", 2005),
     zh_CN("简体中文", "中国大陆","23238",2006),
     zh_TW("繁體中文", "台灣","11627", 2007);
-    public final String Region, Name, HeadId;
-    public final int ItemModel;
+
+    private final String name, region, headId;
+    private final int itemModel;
+
     Language(String name, String region, String headId, int itemModel) {
-        this.Name = name;
-        this.Region = region;
-        this.HeadId = headId;
-        this.ItemModel = itemModel;
+        this.name = name;
+        this.region = region;
+        this.headId = headId;
+        this.itemModel = itemModel;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getHeadId() {
+        return headId;
+    }
+
+    public int getItemModel() {
+        return itemModel;
     }
 }
 

diff --git a/src/main/java/li/cinnazeyy/langlibs/core/language/LangLibAPI.java b/src/main/java/li/cinnazeyy/langlibs/core/language/LangLibAPI.java
@@ -18,8 +18,8 @@
 
 public class LangLibAPI {
 
-    private static HashMap<Plugin, LanguageFile[]> pluginLangFiles = new HashMap<>();
-    private static HashMap<UUID, String> playerLocale = new HashMap<>();
+    private static final HashMap<Plugin, LanguageFile[]> pluginLangFiles = new HashMap<>();
+    private static final HashMap<UUID, String> playerLocale = new HashMap<>();
 
     public static void register(Plugin plugin, LanguageFile[] langFiles) {
         pluginLangFiles.put(plugin,langFiles);
@@ -88,6 +88,4 @@ public static LanguageFile[] getLanguageFiles(Plugin plugin) {
         if (languageFiles == null) throw new RuntimeException("LanguageAPI has not been registered yet!");
         return languageFiles;
     }
-
-
 }
diff --git a/src/main/java/li/cinnazeyy/langlibs/core/menu/LanguageSelectMenu.java b/src/main/java/li/cinnazeyy/langlibs/core/menu/LanguageSelectMenu.java
@@ -1,21 +1,19 @@
 package li.cinnazeyy.langlibs.core.menu;
 
+import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
 import com.alpsbte.alpslib.utils.item.ItemBuilder;
 import li.cinnazeyy.langlibs.LangLibs;
 import li.cinnazeyy.langlibs.core.Language;
 import li.cinnazeyy.langlibs.core.event.LanguageChangeEvent;
 import li.cinnazeyy.langlibs.core.language.LangLibAPI;
-import li.cinnazeyy.langlibs.util.HeadUtils;
 import mc.obliviate.inventory.Gui;
 import mc.obliviate.inventory.Icon;
-import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 
-import java.awt.*;
 import java.util.Objects;
 
 public class LanguageSelectMenu extends Gui {
@@ -36,9 +34,9 @@ public void onOpen(InventoryOpenEvent event) {
     private Icon getLanguageIcon(Language lang) {
         boolean useHeads = LangLibs.getPlugin().getConfig().getBoolean("languageSelection.useHeads");
         Icon icon = useHeads ?
-                new Icon(new ItemBuilder(HeadUtils.LANGUAGE_HEADS.get(lang).getAsItemStack()).build())
-                : new Icon(new ItemBuilder(Material.PAPER).setItemModel(lang.ItemModel).build());
-        icon.setName("§6§l" + lang.Name + " §r§8(§7" + lang.Region + "§8)"); //TODO: Use Components instead
+                new Icon(new ItemBuilder(AlpsHeadUtils.getCustomHead(lang.getHeadId())).build())
+                : new Icon(new ItemBuilder(Material.PAPER).setItemModel(lang.getItemModel()).build());
+        icon.setName("§6§l" + lang.getName() + " §r§8(§7" + lang.getRegion() + "§8)"); //TODO: Use Components instead
         icon.onClick((event) -> clickLanguageIcon(event, lang));
         return icon;
     }

diff --git a/src/main/java/li/cinnazeyy/langlibs/util/HeadUtils.java b/src/main/java/li/cinnazeyy/langlibs/util/HeadUtils.java
diff --git a/...ava/li/cinnazeyy/langlibs/util/Utils.java → ...li/cinnazeyy/langlibs/util/LangUtils.java b/...ava/li/cinnazeyy/langlibs/util/Utils.java → ...li/cinnazeyy/langlibs/util/LangUtils.java
@@ -1,6 +1,9 @@
 package li.cinnazeyy.langlibs.util;
 
-public class Utils {
+import com.alpsbte.alpslib.utils.head.AlpsHeadUtils;
+import li.cinnazeyy.langlibs.core.Language;
+
+public class LangUtils {
     private static final String messagePrefix = "";
 
     public static String getInfoMessageFormat(String info) {
@@ -10,4 +13,8 @@ public static String getInfoMessageFormat(String info) {
     public static String getErrorMessageFormat(String error) {
         return messagePrefix + "§c" + error;
     }
+
+    public static void registerCustomHeads() {
+        for (Language lang : Language.values()) AlpsHeadUtils.registerCustomHead(lang.getHeadId());
+    }
 }