Fix v26.2 lookup for UnsafeValues#nextEntityId

Author: Tofaa2

build.gradle.kts

@@ -1,4 +1,4 @@
-val fullVersion = "3.3.3"
+val fullVersion = "3.3.4"
 val snapshot = true
 
 group = "io.github.tofaa2"

flake.lock

@@ -2,7 +2,7 @@
 adventure = "4.25.0"
 jetbrains-annotations = "26.0.2"
 gson = "2.13.1"
-packetevents = "2.11.0"
+packetevents = "2.13.0"
 paper = "1.21-R0.1-SNAPSHOT"
 velocity = "3.4.0-SNAPSHOT"
 run-paper = "3.0.2"

gradle/libs.versions.toml

@@ -1,6 +1,8 @@
 package me.tofaa.entitylib.spigot;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -9,6 +11,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.UnsafeValues;
+import org.bukkit.World;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
@@ -49,7 +52,8 @@ public int provide(@NotNull UUID entityUUID, @NotNull EntityType entityType) {
      * and platform.
      * Logic:
      * <ul>
-     *   <li>Paper (1.16+): Use `{@link UnsafeValues#nextEntityId()}`. (Paper API)</li>
+     *   <li>Paper (1.16 until 26.1): Use `{@link UnsafeValues#nextEntityId()}`. (Paper API)</li>
+     *   <li>Paper 26.2 and ab ove: Uses the updated signature of `{@link UnsafeValues#nextEntityId()}` with the first World in `{@link Bukkit#getWorlds()}` which should be overworld </li>
      *   <li>1.14+: Access `AtomicInteger` field ("entityCount", "d", "c").</li>
      *   <li>1.8+: Access legacy `int` field "entityCount".</li>
      * </ul>
@@ -62,10 +66,36 @@ private Supplier<Integer> detectIdSupplier() {
 
         final ServerVersion serverVersion = platform.getAPI().getPacketEvents().getServerManager().getVersion();
 
-        if (isPaper() && serverVersion.isNewerThanOrEquals(ServerVersion.V_1_16)) {
-            return Bukkit.getUnsafe()::nextEntityId; // Paper API
+        if (isPaper()) {
+            if (serverVersion.isNewerThanOrEquals(ServerVersion.V_1_16)) {
+                if (serverVersion.isOlderThanOrEquals(ServerVersion.V_26_1)) {
+                    return Bukkit.getUnsafe()::nextEntityId; // Paper API Before unsafe values change
+                }
+                else {
+                    // Please do not look at this branch
+                    Class<UnsafeValues> unsafeValuesClass = UnsafeValues.class;
+                    try {
+                        Method method = unsafeValuesClass.getMethod("nextEntityId", World.class);
+                        UnsafeValues unsafe = Bukkit.getUnsafe();
+                        return () -> {
+                            try {
+                                World overworld = Bukkit.getWorlds().get(0); // There is a chance the server has no worlds but at that point we have bigger issues to worry about
+                                return (Integer) method.invoke(unsafe, overworld);
+                            } catch (IllegalAccessException | InvocationTargetException e) {
+                                throw new RuntimeException(e);
+                            }
+                        };
+                    } catch (NoSuchMethodException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
         }
 
+//        if (isPaper() && serverVersion.isNewerThanOrEquals(ServerVersion.V_1_16)) {
+//            return Bukkit.getUnsafe()::nextEntityId; // Paper API
+//        }
+
         final Class<?> entityClass = getEntityClass();
         if (serverVersion.isNewerThanOrEquals(ServerVersion.V_1_14)) {
             final Supplier<Integer> modernSupplier = resolveAtomicSupplier(entityClass);

platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityIdProvider.java

@@ -18,7 +18,7 @@ include(":movement-engine")
 include(":platforms:movement")
 include(":spaceNPC")
 
-if (System.getenv("PRIVATE").toBoolean()) {
+if (System.getenv("ENTITYLIB_PRIVATE").toBoolean()) {
     include("discord-bot")
     include(":code-gen")
     include(":test-plugin")

settings.gradle.kts

@@ -5,20 +5,18 @@ plugins {
 }
 
 repositories {
-    maven("https://maven.evokegames.gg/snapshots")
     maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
     compileOnly(libs.paper)
     compileOnly(libs.packetevents.spigot)
     implementation(project(":platforms:spigot"))
-//    implementation(project(":platforms:spigot"))
-}
+2}
 
 tasks {
-    val version = "1.21.3"
-    val javaVersion = JavaLanguageVersion.of(21)
+    val version = "26.2"
+    val javaVersion = JavaLanguageVersion.of(25)
 
     val jvmArgsExternal = listOf(
         "-Dcom.mojang.eula.agree=true"

test-plugin/build.gradle.kts

@@ -15,7 +15,6 @@ public class TestEntityLibPlugin extends JavaPlugin {
 
     @Override
     public void onEnable() {
-        DateFormat.getDateTimeInstance().format(new java.util.Date(timestamp));
 
         SpigotEntityLibPlatform platform = new SpigotEntityLibPlatform(this);
         APIConfig settings = new APIConfig(PacketEvents.getAPI())