Added BossBar adapter

Lorenzo0111 · Aug 30, 2021 · 6a7786c · 6a7786c
1 parent 77ddbfe
commit 6a7786c
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 21 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 
-rootProject.name = "multilang"
+rootProject.name = "MultiLang"
diff --git a/src/main/java/me/lorenzo0111/multilang/protocol/PacketHandler.java b/src/main/java/me/lorenzo0111/multilang/protocol/PacketHandler.java
@@ -28,6 +28,7 @@
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketListener;
 import me.lorenzo0111.multilang.MultiLangPlugin;
+import me.lorenzo0111.multilang.protocol.adapter.BossBarAdapter;
 import me.lorenzo0111.multilang.protocol.adapter.ChatAdapter;
 import me.lorenzo0111.multilang.protocol.adapter.EntityAdapter;
 import me.lorenzo0111.multilang.protocol.adapter.InventoryAdapter;
@@ -56,6 +57,7 @@ public void init() {
 
         listeners.add(new InventoryAdapter(plugin, ListenerPriority.NORMAL));
         listeners.add(new ChatAdapter(plugin, ListenerPriority.NORMAL));
+        listeners.add(new BossBarAdapter(plugin, ListenerPriority.NORMAL));
 
         listeners.forEach(manager::addPacketListener);
     }

diff --git a/src/main/java/me/lorenzo0111/multilang/protocol/adapter/BaseAdapter.java b/src/main/java/me/lorenzo0111/multilang/protocol/adapter/BaseAdapter.java
@@ -0,0 +1,35 @@
+package me.lorenzo0111.multilang.protocol.adapter;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import me.lorenzo0111.multilang.MultiLangPlugin;
+import me.lorenzo0111.multilang.utils.RegexChecker;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class BaseAdapter extends PacketAdapter {
+
+    public BaseAdapter(MultiLangPlugin plugin, ListenerPriority listenerPriority, PacketType type) {
+        super(plugin, listenerPriority, type);
+    }
+
+    public void handle(Player player, @NotNull WrappedChatComponent component, @NotNull Runnable save) {
+        JsonObject json = new JsonParser().parse(component.getJson()).getAsJsonObject();
+
+        this.update(json, RegexChecker.replace(player, json));
+
+        component.setJson(json.toString());
+
+        save.run();
+    }
+
+    protected void update(@NotNull JsonObject object, String value) {
+        object.remove("text");
+        object.addProperty("text",value);
+    }
+
+}
diff --git a/src/main/java/me/lorenzo0111/multilang/protocol/adapter/BossBarAdapter.java b/src/main/java/me/lorenzo0111/multilang/protocol/adapter/BossBarAdapter.java
@@ -0,0 +1,38 @@
+package me.lorenzo0111.multilang.protocol.adapter;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.utility.MinecraftVersion;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import me.lorenzo0111.multilang.MultiLangPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class BossBarAdapter extends BaseAdapter {
+
+    public BossBarAdapter(MultiLangPlugin plugin, ListenerPriority listenerPriority) {
+        super(plugin, listenerPriority, PacketType.Play.Server.BOSS);
+    }
+
+    @Override
+    public void onPacketSending(@NotNull PacketEvent event) {
+        PacketContainer packet = event.getPacket();
+
+        WrappedChatComponent component;
+
+        if (MinecraftVersion.CAVES_CLIFFS_1.atOrAbove()) {
+            component = packet.getStructures().read(1).getChatComponents().read(0);
+        } else {
+            component = packet.getChatComponents().read(0);
+        }
+
+        this.handle(event.getPlayer(),component, () -> {
+            if (MinecraftVersion.CAVES_CLIFFS_1.atOrAbove()) {
+                packet.getStructures().read(1).getChatComponents().write(0, component);
+            } else {
+                packet.getChatComponents().write(0, component);
+            }
+        });
+    }
+}
diff --git a/src/main/java/me/lorenzo0111/multilang/protocol/adapter/ChatAdapter.java b/src/main/java/me/lorenzo0111/multilang/protocol/adapter/ChatAdapter.java
@@ -26,7 +26,6 @@
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.EnumWrappers;
@@ -38,7 +37,8 @@
 import me.lorenzo0111.multilang.utils.RegexChecker;
 import org.bukkit.entity.Player;
 
-public class ChatAdapter extends PacketAdapter {
+public class ChatAdapter extends BaseAdapter {
+
     public ChatAdapter(MultiLangPlugin plugin, ListenerPriority listenerPriority) {
         super(plugin, listenerPriority, PacketType.Play.Server.CHAT);
     }
@@ -79,11 +79,6 @@ public void onPacketSending(PacketEvent event) {
 
         // Update the component and the packet
         component.setJson(json.toString());
-        packet.getChatComponents().write(0,component);
-    }
 
-    private void update(JsonObject object, String value) {
-        object.remove("text");
-        object.addProperty("text",value);
     }
 }
diff --git a/src/main/java/me/lorenzo0111/multilang/protocol/adapter/InventoryAdapter.java b/src/main/java/me/lorenzo0111/multilang/protocol/adapter/InventoryAdapter.java
@@ -26,18 +26,16 @@
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import me.lorenzo0111.multilang.MultiLangPlugin;
-import me.lorenzo0111.multilang.utils.RegexChecker;
 
 import java.util.logging.Level;
 
-public class InventoryAdapter extends PacketAdapter {
+public class InventoryAdapter extends BaseAdapter {
     private final MultiLangPlugin plugin;
 
     public InventoryAdapter(MultiLangPlugin plugin, ListenerPriority listenerPriority) {
@@ -55,16 +53,8 @@ public void onPacketSending(PacketEvent event) {
 
             if (!json.has("text")) return;
 
-            String text = json.get("text").getAsString();
-            String replaced = RegexChecker.replace(event.getPlayer(), text);
-
-            // Replace the text
-            json.remove("text");
-            json.addProperty("text", replaced);
-            component.setJson(json.toString());
-
             // Edit packet
-            event.getPacket().getChatComponents().write(0,component);
+            this.handle(event.getPlayer(),component, () -> event.getPacket().getChatComponents().write(0,component));
         } catch (Exception e) {
             plugin.getLogger().log(Level.SEVERE, "An error has occurred while handling packets", e);
         }

diff --git a/src/main/java/me/lorenzo0111/multilang/utils/RegexChecker.java b/src/main/java/me/lorenzo0111/multilang/utils/RegexChecker.java
@@ -24,9 +24,11 @@
 
 package me.lorenzo0111.multilang.utils;
 
+import com.google.gson.JsonObject;
 import me.lorenzo0111.multilang.MultiLangPlugin;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -36,7 +38,11 @@ public final class RegexChecker {
 
     private RegexChecker() {}
 
-    public static String replace(Player player, String string) {
+    public static @NotNull String replace(Player player, @NotNull JsonObject json) {
+        return replace(player,json.get("text").getAsString());
+    }
+
+    public static @NotNull String replace(Player player, String string) {
         final Matcher matcher = PATTERN.matcher(string);
 
         final StringBuffer buffer = new StringBuffer();