parsing placeholders in /emojis <category> cmd & 1.6.7

Tanguygab · Oct 11, 2022 · c33008d · c33008d
1 parent 168c200
commit c33008d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'io.github.tanguygab'
-version = '1.6.6'
+version = '1.6.7'
 
 
 repositories {

diff --git a/src/main/java/io/github/tanguygab/tabadditions/bungee/BungeePlatform.java b/src/main/java/io/github/tanguygab/tabadditions/bungee/BungeePlatform.java
@@ -76,7 +76,6 @@ public void sendSound(TabPlayer p, String sound) {
 
 	@Override
 	public void reload() {
-		TABAdditions.getInstance().reload();
 		plugin.getProxy().getPluginManager().unregisterListeners(plugin);
 		plugin.getProxy().getPluginManager().registerListener(plugin, new BungeeEvents());
 	}

diff --git a/src/main/java/io/github/tanguygab/tabadditions/shared/TABAdditions.java b/src/main/java/io/github/tanguygab/tabadditions/shared/TABAdditions.java
@@ -94,7 +94,7 @@ public TranslationFile getMsgs() {
     public void load() {
         enabled = true;
         loadFiles();
-        TabAPI.getInstance().getEventBus().register(TabLoadEvent.class,e->platform.reload());
+        TabAPI.getInstance().getEventBus().register(TabLoadEvent.class,e->reload());
         platform.reload();
     }
 
@@ -130,6 +130,7 @@ public void loadFiles() {
     }
 
     public void reload() {
+        platform.reload();
         loadFiles();
         loadFeatures();
         loadPlaceholders();

diff --git a/src/main/java/io/github/tanguygab/tabadditions/shared/features/chat/ChatCmds.java b/src/main/java/io/github/tanguygab/tabadditions/shared/features/chat/ChatCmds.java
@@ -304,7 +304,7 @@ public void getEmojiCategory(TabPlayer p, String category) {
 
         for (String emoji : emojis.keySet()) {
             if (!canUseEmoji(p,category,emoji)) continue;
-            IChatBaseComponent comp = cm.createComponent("\n" + EnumChatFormat.color(translation.getEmoji(emoji,emojis.get(emoji))),p);
+            IChatBaseComponent comp = cm.createComponent("\n" + TABAdditions.getInstance().parsePlaceholders(translation.getEmoji(emoji,emojis.get(emoji)),p),p);
             comp.getModifier().onClickSuggestCommand(emoji);
             list.add(comp);
         }

diff --git a/src/main/java/io/github/tanguygab/tabadditions/spigot/SpigotPlatform.java b/src/main/java/io/github/tanguygab/tabadditions/spigot/SpigotPlatform.java
@@ -91,8 +91,6 @@ public void sendSound(TabPlayer p, String sound) {
 
 	@Override
 	public void reload() {
-		TABAdditions.getInstance().reload();
-
 		HandlerList.unregisterAll((Plugin) plugin);
 		plugin.getServer().getPluginManager().registerEvents(plugin, plugin);
 

diff --git a/src/main/java/io/github/tanguygab/tabadditions/spigot/TABAdditionsSpigot.java b/src/main/java/io/github/tanguygab/tabadditions/spigot/TABAdditionsSpigot.java
@@ -3,12 +3,10 @@
 import io.github.tanguygab.tabadditions.shared.TABAdditions;
 import io.github.tanguygab.tabadditions.shared.features.chat.ChatManager;
 import me.neznamy.tab.api.TabAPI;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.server.TabCompleteEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 

diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml
@@ -1,5 +1,5 @@
 name: TAB-Additions
-version: 1.6.6
+version: 1.6.7
 main: io.github.tanguygab.tabadditions.bungee.TABAdditionsBungeeCord
 description: More features for the plugin TAB !
 softDepends: [floodgate-bungee,AdvancedBan]

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: TAB-Additions
-version: 1.6.6
+version: 1.6.7
 main: io.github.tanguygab.tabadditions.spigot.TABAdditionsSpigot
 api-version: 1.13
 depend: [TAB]