1.21.1 Support

README.md

@@ -20,7 +20,9 @@ This project is divided in several modules:
 - `sidebar-v_1_20_R2` provides support for 1.20.2 (R2)
 - `sidebar-v_1_20_R3` provides support for 1.20.3 (R3)
 - `sidebar-v_1_20_R4` provides support for 1.20.4 (R4). Requires `sidebar-v_1_20_R3`.
-- `sidebar-v_1_21_R1` provides support for 1.21.1 (R1). Requires `sidebar-cmn1`.
+- `sidebar-v_1_21_R1` provides support for 1.21 and 1.21.1 (R1). Requires `sidebar-cmn1`.
+- `sidebar-v_1_21_R2` provides support for 1.21.3 (R2). Requires `sidebar-cmn1`.
+- `sidebar-v_1_21_R3` provides support for 1.21.4 (R3). Requires `sidebar-cmn1`.
 
 ### IMPORTANT
 It is really important to call Sidebar#remove(player) when a player leaves the server to avoid memory leaks.

pom.xml

@@ -7,9 +7,11 @@
     <groupId>com.andrei1058.spigot.sidebar</groupId>
     <artifactId>sidebar-pom</artifactId>
     <packaging>pom</packaging>
-    <version>25.2.1-SNAPSHOT</version>
+    <version>25.2.2-SNAPSHOT</version>
     <modules>
         <module>sidebar-base</module>
+        <module>sidebar-v1_21_R3</module>
+        <module>sidebar-v1_21_R2</module>
         <module>sidebar-v1_21_R1</module>
         <module>sidebar-v1_20_R4</module>
         <module>sidebar-v1_20_R3</module>

sidebar-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/PAPIAdapter.java

@@ -8,6 +8,9 @@
 import java.util.regex.Pattern;
 
 public class PAPIAdapter implements PAPISupport {
+
+    public PAPIAdapter() {}
+
     @Override
     public String replacePlaceholders(Player p, String s) {
         return PlaceholderAPI.setPlaceholders(p, s);

sidebar-cmn1/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
         <artifactId>sidebar-pom</artifactId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>sidebar-cmn1</artifactId>
@@ -40,24 +40,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>20</source>
-                    <target>20</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

sidebar-v1_12_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_16_R3/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_17_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_18_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_19_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_19_R3/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_20_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_20_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_20_R3/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_20_R4/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_21_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sidebar-pom</artifactId>
         <groupId>com.andrei1058.spigot.sidebar</groupId>
-        <version>25.2.1-SNAPSHOT</version>
+        <version>25.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sidebar-v1_21_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_21_R1/PlayerListImpl.java

@@ -2,11 +2,16 @@
 
 import com.andrei1058.spigot.sidebar.*;
 import dev.andrei1058.spigot.sidebar.cmn1.PlayerListImplCmn1;
+import net.minecraft.network.chat.IChatBaseComponent;
+import net.minecraft.network.chat.IChatMutableComponent;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam;
 import net.minecraft.world.scores.ScoreboardTeam;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -65,7 +70,7 @@ public void sendCreateToPlayer(Player player) {
     public void sendUserCreateToReceivers(@NotNull Player player) {
         // send 3: add entities to team
         PacketPlayOutScoreboardTeam packetPlayOutScoreboardTeam = PacketPlayOutScoreboardTeam.a(
-                this, player.getName(), (PacketPlayOutScoreboardTeam.a) cachedScoreboardActionA);
+                this, player.getName(), cachedScoreboardActionA);
         handle.getSidebar().getReceivers().forEach(
                 r -> sendPacket(r, packetPlayOutScoreboardTeam)
         );
@@ -150,13 +155,25 @@ private static Object getScoreboardAction(String action) {
                     if (action.equals(name)) {
                         return obj;
                     }
-                } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-                    //Bukkit.getConsoleSender().sendMessage(ChatColor.RED+"Could not find ENUM");
+                } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
                 }
             }
-        } catch (Exception exception) {
-//            exception.printStackTrace();
+        } catch (Exception ignored) {
         }
         throw new RuntimeException("Something went wrong... please report this to SidebarLib by andrei1058");
     }
+
+    public @NotNull IChatBaseComponent e() {
+        return handle.getPrefixComp();
+    }
+
+    public @NotNull IChatBaseComponent f() {
+        return handle.getSuffixComp();
+    }
+
+    @Contract(value = "_ -> new", pure = true)
+    @Override
+    public @NotNull IChatMutableComponent d(IChatBaseComponent var0) {
+        return IChatBaseComponent.b(handle.getPrefixComp().toString() + var0.getString() + handle.getSuffixComp().toString());
+    }
 }

sidebar-v1_21_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_21_R1/ProviderImpl.java

@@ -37,8 +37,8 @@ public ScoreLine createScoreLine(WrappedSidebar sidebar, SidebarLine line, int s
     public void sendScore(@NotNull WrappedSidebar sidebar, String playerName, int score) {
         if (sidebar.getHealthObjective() == null) return;
         PacketPlayOutScoreboardScore packetPlayOutScoreboardScore = new PacketPlayOutScoreboardScore(
-                sidebar.getHealthObjective().getName(),
                 playerName,
+                sidebar.getHealthObjective().getName(),
                 score,
                 Optional.empty(),
                 Optional.empty()

sidebar-v1_21_R1/src/main/java/com/andrei1058/spigot/sidebar/v1_21_R1/SidebarImpl.java

@@ -40,7 +40,7 @@ public SidebarObjective createObjective(String name, IScoreboardCriteria iScoreb
     protected class SidebarObjectiveImpl extends ScoreboardObjective implements SidebarObjective {
 
         private SidebarLine displayName;
-        private IChatMutableComponent displayNameComp = IChatBaseComponent.b(" ");
+        private IChatMutableComponent displayNameComp = IChatBaseComponent.b("");
         private final DisplaySlot type;
 
         public SidebarObjectiveImpl(String name, IScoreboardCriteria criteria, SidebarLine displayName, int type) {
@@ -71,7 +71,7 @@ public void sendRemove(Player player) {
 
         @Override
         public String getName() {
-            return this.b();
+            return super.b();
         }
 
         @Override
@@ -227,6 +227,7 @@ public void sendCreate(Player player) {
         @Override
         public void sendRemove(Player player) {
             PlayerConnection conn = ((CraftPlayer) player).getHandle().c;
+            // var1=1 means remove
             PacketPlayOutScoreboardTeam packetPlayOutScoreboardTeam = PacketPlayOutScoreboardTeam.a(team);
             var resetScore = new ClientboundResetScorePacket(team.b(), getSidebarObjective().getName());
             conn.b(resetScore);
@@ -241,6 +242,7 @@ public void sendRemoveToAllReceivers() {
         }
 
         public void sendUpdate(Player player) {
+            // false=2 is for update packet, true=0 for create
             PacketPlayOutScoreboardTeam packetTeamUpdate = PacketPlayOutScoreboardTeam.a(team, false);
             ((CraftPlayer) player).getHandle().c.b(packetTeamUpdate);
         }
@@ -280,6 +282,7 @@ public void setSuffix(@NotNull String secondPart) {
         }
 
         public void sendUpdateToAllReceivers() {
+            // false=2 is for update packet, true=0 for create
             PacketPlayOutScoreboardTeam packetTeamUpdate = PacketPlayOutScoreboardTeam.a(team, false);
             getReceivers().forEach(r -> ((CraftPlayer) r).getHandle().c.b(packetTeamUpdate));
         }

sidebar-v1_21_R2/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>sidebar-pom</artifactId>
+        <groupId>com.andrei1058.spigot.sidebar</groupId>
+        <version>25.2.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>sidebar-v1_21_R2</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>20</source>
+                    <target>20</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>nms</id>
+            <url>https://repo.codemc.io/repository/nms/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-base</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.21.3-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-cmn1</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>