1.21.5 for Bukkit/Spigot/Paper

.gitignore

@@ -1,11 +1,52 @@
-# Build files
-target/
-bin/
-.gradle/
-build/
-.idea
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+# Kotlin Gradle plugin data, see https://kotlinlang.org/docs/whatsnew20.html#new-directory-for-kotlin-data-in-gradle-projects
+.kotlin/
 
-# IDE files
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
 .project
+# JDT-specific (Eclipse Java Development Tools)
 .classpath
-.settings
+
+.idea
+java_pid11952.hprof

buildSrc/build.gradle.kts

@@ -4,4 +4,4 @@ repositories {
 
 plugins {
 	`kotlin-dsl`
-}
+}

bukkit/build.gradle.kts

@@ -27,7 +27,7 @@ repositories {
 }
 
 val nmsProjects = setOf("1_8_8", "1_17_1", "1_18_2", "1_19_1", "1_19_2", "1_19_3", "1_19_4", "1_20_1", "1_20_2",
-    "1_20_4", "1_20_6", "1_21")
+    "1_20_4", "1_20_6", "1_21", "1_21_3", "1_21_4", "1_21_5")
 
 dependencies {
     implementation(project(":global"))
@@ -44,7 +44,7 @@ dependencies {
     compileOnly(libs.authlib)
     compileOnly("net.luckperms:api:5.4")
 
-    compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT") {
+    compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT") {
         exclude("com.mojang", "authlib")
     }
 
@@ -63,13 +63,15 @@ dependencies {
     compileOnly("com.github.LeonMangler:SuperVanish:6.2.19") {
         isTransitive = false
     }
-
-    compileOnly(files("lib/CMI9.0.0.0API.jar", "lib/PermissionsEx-1.23.4.jar"))
+    compileOnly(files("libs/CMI9.0.0.0API.jar"))
+    compileOnly(files("libs/PermissionsEx-1.23.4.jar"))
     compileOnly(libs.netty.core)
+
+
 }
 
 group = "hu.montlikadani.tablist"
-version = "5.7.7"
+version = "5.7.8-jatc251"
 
 tasks {
     withType<JavaCompile> {

bukkit/src/main/java/hu/montlikadani/tablist/Objects.java

@@ -119,7 +119,7 @@ private void registerHealthTab(Player pl) {
 	@SuppressWarnings("deprecation")
 	private void adjustMaxHealth(Player player, double value) {
 		try {
-			org.bukkit.attribute.AttributeInstance maxHealth = player.getAttribute(org.bukkit.attribute.Attribute.GENERIC_MAX_HEALTH);
+			org.bukkit.attribute.AttributeInstance maxHealth = player.getAttribute(org.bukkit.attribute.Attribute.MAX_HEALTH);
 
 			if (maxHealth != null) {
 				maxHealth.setBaseValue(maxHealth.getBaseValue() + value);

bukkit/src/main/java/hu/montlikadani/tablist/TabList.java

@@ -64,7 +64,7 @@ public void onEnable() {
 		ServerVersion currentVersion = ServerVersion.current();
 
 		if (currentVersion == null) {
-			getLogger().log(Level.SEVERE, "Your server version does not supported " + getServer().getBukkitVersion());
+			getLogger().log(Level.SEVERE, "Your server version is not supported: " + getServer().getBukkitVersion() + " | TabListServerVersion: " + ServerVersion.current().toString());
 			getServer().getPluginManager().disablePlugin(this);
 			return;
 		}
@@ -85,7 +85,7 @@ public void onEnable() {
 		} catch (ClassNotFoundException ignore) {
 		}
 		if (PacketNM.NMS_PACKET == null) {
-			getLogger().log(Level.SEVERE, "Future versions does not supported at the moment " + getServer().getBukkitVersion());
+			getLogger().log(Level.SEVERE, "Future versions is not supported at the moment: " + getServer().getBukkitVersion());
 			getServer().getPluginManager().disablePlugin(this);
 			return;
 		}

bukkit/src/main/java/hu/montlikadani/tablist/utils/ServerVersion.java

@@ -2,7 +2,7 @@
 
 public enum ServerVersion {
 
-	v1_21, v1_21_1(v1_21),
+	v1_21, v1_21_5,
 	v1_20_6, v1_20_5, v1_20_4, v1_20_3, v1_20_2, v1_20_1, v1_20,
 	v1_19_4, v1_19_3, v1_19_2, v1_19_1, v1_19,
 	v1_18_2, v1_18_1, v1_18,

bukkit/src/main/java/hu/montlikadani/tablist/utils/variables/Variables.java

@@ -33,7 +33,7 @@ public Variables(TabList plugin) {
 
 		boolean att;
 		try {
-			Attribute.GENERIC_MAX_HEALTH.name();
+			Attribute.MAX_HEALTH.name();
 			att = true;
 		} catch (Error err) {
 			att = false;
@@ -243,7 +243,7 @@ String setPlayerPlaceholders(Player player, String text) {
 
 		text = Global.replace(text, "%player-max-health%", () -> {
 			if (entityAttributeSupported) {
-				org.bukkit.attribute.AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
+				org.bukkit.attribute.AttributeInstance attribute = player.getAttribute(Attribute.MAX_HEALTH);
 				return attribute == null ? "" : Double.toString(attribute.getDefaultValue());
 			}
 

bukkit/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: TabList
 main: hu.montlikadani.tablist.TabList
-version: 5.7.7
+version: 5.7.8-jatc251
 author: montlikadani
 description: An alternative tablist plugin to replace vanilla empty tab
 softdepend:

bungee/build.gradle.kts

@@ -19,11 +19,11 @@ repositories {
 dependencies {
 	implementation(project(":global"))
 
-	compileOnly("net.md-5:bungeecord-api:1.21-R0.1-SNAPSHOT") {
+	compileOnly("net.md-5:bungeecord-api:1.21-R0.3-SNAPSHOT") {
 		exclude("com.mojang", "brigadier")
 	}
 
-	compileOnly("net.md-5:bungeecord-chat:1.21-R0.1-SNAPSHOT") {
+	compileOnly("net.md-5:bungeecord-chat:1.21-R0.3-SNAPSHOT") {
 		exclude("com.mojang", "brigadier")
 	}
 
@@ -32,7 +32,7 @@ dependencies {
 	}
 }
 
-version = "2.3.5"
+version = "2.3.6-jatc251"
 
 tasks {
 	withType<JavaCompile> {

bungee/src/main/resources/bungee.yml

@@ -1,5 +1,5 @@
 name: TabList
 main: hu.montlikadani.tablist.TabList
-version: 2.3.5
+version: 2.3.6-jatc251
 author: montlikadani
 # DO NOT EDIT ANYTHING ABOVE THIS LINE!

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -9,7 +9,7 @@ dependencyResolutionManagement {
 	versionCatalogs {
 		create("libs") {
 			library("netty-core", "io.netty:netty-all:4.1.114.Final")
-			library("authlib", "com.mojang:authlib:6.0.54")
+			library("authlib", "com.mojang:authlib:6.0.57")
 			plugin("shadow", "io.github.goooler.shadow").version("8.1.8")
 		}
 	}
@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 rootProject.name = "TabList"
 
 include("api", "global",
-	"v1_21",
+	"v1_21_5", "v1_21_4", "v1_21_3", "v1_21",
 	"v1_20_6", "v1_20_4", "v1_20_2", "v1_20_1",
 	"v1_19_4", "v1_19_3", "v1_19_2", "v1_19_1",
 	"v1_18_2",

v1_21_4/build.gradle.kts

@@ -0,0 +1,24 @@
+repositories {
+    maven("https://repo.codemc.org/repository/nms/")
+    maven("https://libraries.minecraft.net/")
+    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    maven("https://oss.sonatype.org/content/groups/public/") // Netty
+}
+
+dependencies {
+    api(project(":api"))
+
+    compileOnly("org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT") {
+        exclude("org.yaml", "snakeyaml")
+    }
+
+    compileOnly(libs.authlib)
+
+    compileOnly("org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT") {
+        exclude("junit", "junit")
+        exclude("org.yaml", "snakeyaml")
+        exclude("com.mojang", "authlib")
+    }
+
+    implementation(libs.netty.core)
+}