Merge pull request #12 from Orphey98/quality-updates

Forge support prerelease

Author: Orphey98

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.orphey</groupId>
     <artifactId>TypingInChat-spigot</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
     <packaging>jar</packaging>
 
     <name>TypingInChat-spigot</name>
@@ -67,6 +67,11 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>evoke-snapshots</id>
+            <name>EvokeGames Maven</name>
+            <url>https://maven.evokegames.gg/snapshots</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -91,7 +96,7 @@
         <dependency>
             <groupId>com.github.max1mde</groupId>
             <artifactId>HologramLib</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.4</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

src/main/java/me/orphey/typinginchat/ConfigLoader.java

@@ -22,7 +22,7 @@ private ConfigLoader() {
     }
     private static final File file = new File(TypingInChat.getInstance().getDataFolder(), "config.yml");
     private static final String bukkitVersion = Bukkit.getBukkitVersion().split("-")[0];
-    private static final int bukkitComparison = compareVersions(bukkitVersion, "1.20.5");
+    private static final int bukkitComparison = compareVersions(bukkitVersion, "1.20.4");
     private static final ConfigLoader instance = new ConfigLoader();
     private static final YamlConfiguration config = new YamlConfiguration();
     private static final Map<String, Boolean> booleanParameters = new HashMap<>(Map.ofEntries(

src/main/java/me/orphey/typinginchat/PacketEventsListener.java

@@ -30,6 +30,7 @@ private WrapperPlayClientPluginMessage verifyPacket(PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.PLUGIN_MESSAGE) {
             WrapperPlayClientPluginMessage packet = new WrapperPlayClientPluginMessage(event);
             String channel = packet.getChannelName(); // Get the channel name
+            //System.out.println("Received packet " + channel);
             if (channel.equals("typinginchatmod:typing_status")) {
                 return packet;
             } else {
@@ -42,11 +43,19 @@ private WrapperPlayClientPluginMessage verifyPacket(PacketReceiveEvent event) {
 
     private byte readPacket(WrapperPlayClientPluginMessage packet) {
         byte[] data = packet.getData();
-        if (data.length == 1) {
+        //System.out.println("Data Length: " + data.length);
+        if (data.length == 2) { //Forge
+            //System.out.println("Forge " + data[1]);
+            return data[1];
+        } else if (data.length == 1) { //Fabric
+            //System.out.println("Fabric " + data[0]);
             return data[0];
         } else {
+            //System.out.println("Empty");
             return 0;
         }
+
+
     }
 
     private void manageHolo(Player player, byte b) {

target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
 artifactId=TypingInChat-spigot
 groupId=me.orphey
-version=1.1
+version=1.2