i think virtual threads will better

Author: funkyra

patches/minecraft/net/minecraft/tileentity/TileEntitySkull.java.patch

@@ -1,6 +1,6 @@
 --- before/net/minecraft/tileentity/TileEntitySkull.java
 +++ after/net/minecraft/tileentity/TileEntitySkull.java
-@@ -1,14 +1,32 @@
+@@ -1,14 +1,34 @@
  package net.minecraft.tileentity;
 
 +import catserver.server.CatServer;
@@ -16,6 +16,8 @@
 +import com.mojang.authlib.ProfileLookupCallback;
  import com.mojang.authlib.minecraft.MinecraftSessionService;
  import com.mojang.authlib.properties.Property;
++
++import java.util.Locale;
 +import java.util.UUID;
 +import java.util.concurrent.Callable;
 +import java.util.concurrent.ExecutorService;
@@ -33,7 +35,7 @@
  import net.minecraft.server.management.PlayerProfileCache;
  import net.minecraft.util.EnumFacing;
  import net.minecraft.util.ITickable;
-@@ -21,12 +39,65 @@
+@@ -21,12 +41,61 @@
  public class TileEntitySkull extends TileEntity implements ITickable
  {
      private int skullType;
@@ -45,15 +47,11 @@
      private static PlayerProfileCache profileCache;
      private static MinecraftSessionService sessionService;
 +    // Spigot start
-+    public static final ExecutorService executor = Executors.newFixedThreadPool(3,
-+            new ThreadFactoryBuilder()
-+                    .setNameFormat("Head Conversion Thread - %1$d")
-+                    .build()
-+    );
++    public static final ExecutorService executor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("Head Conversion Thread - %1$d").factory());
 +    public static final LoadingCache<String, GameProfile> skinCache = CacheBuilder.newBuilder()
 +            .maximumSize( 5000 )
 +            .expireAfterAccess( 60, TimeUnit.MINUTES )
-+            .build( new CacheLoader<String, GameProfile>()
++            .build( new CacheLoader<>()
 +            {
 +                @Override
 +                public GameProfile load(String key) throws Exception
@@ -100,7 +98,7 @@
 
      public static void setProfileCache(PlayerProfileCache profileCacheIn)
      {
-@@ -89,7 +160,7 @@
+@@ -89,7 +158,7 @@
              if (this.world.isBlockPowered(this.pos))
              {
                  this.dragonAnimated = true;
@@ -109,7 +107,7 @@
              }
              else
              {
-@@ -138,47 +209,88 @@
+@@ -138,47 +207,76 @@
 
      private void updatePlayerProfile()
      {
@@ -118,19 +116,15 @@
 +        // Spigot start
 +        GameProfile profile = this.playerProfile;
 +        setType( 0 ); // Work around client bug
-+        updateGameprofile(profile, new Predicate<GameProfile>() {
-+
-+            @Override
-+            public boolean apply(GameProfile input) {
-+                setType(3); // Work around client bug
-+                playerProfile = input;
-+                markDirty();
-+                if (world != null) {
-+                    world.notifyLightSet(pos); // PAIL: notify
-+                }
-+                return false;
++        updateGameprofile(profile, input -> {
++            setType(3); // Work around client bug
++            playerProfile = input;
++            markDirty();
++            if (world != null) {
++                world.notifyLightSet(pos); // PAIL: notify
 +            }
-+        }, false); 
++            return false;
++        }, false);
 +        // Spigot end
 +
      }
@@ -140,19 +134,20 @@
 +    public static Future<GameProfile> updateGameprofile(final GameProfile input, final Predicate<GameProfile> callback, boolean sync)
      {
          if (input != null && !StringUtils.isNullOrEmpty(input.getName()))
-         {
-             if (input.isComplete() && input.getProperties().containsKey("textures"))
-             {
+-        {
+-            if (input.isComplete() && input.getProperties().containsKey("textures"))
+-            {
 -                return input;
 -            }
 -            else if (profileCache != null && sessionService != null)
 -            {
 -                GameProfile gameprofile = profileCache.getGameProfileForUsername(input.getName());
-+                callback.apply(input);
-+            } else if (MinecraftServer.getServerInst() == null) {
++        { //                                                                             TODO: can server instance be null?
++            if ((input.isComplete() && input.getProperties().containsKey("textures")) || MinecraftServer.getServerInst() == null)
++            {
 +                callback.apply(input);
 +            } else {
-+                GameProfile profile = skinCache.getIfPresent(input.getName().toLowerCase(java.util.Locale.ROOT));
++                GameProfile profile = skinCache.getIfPresent(input.getName().toLowerCase(Locale.ROOT));
 +                if (profile != null && Iterables.getFirst(profile.getProperties().get("textures"), (Object) null) != null) {
 +                    callback.apply(profile);
 
@@ -168,22 +163,16 @@
 -                    if (property == null)
 -                    {
 -                        gameprofile = sessionService.fillProfileProperties(gameprofile, true);
-+                    Callable<GameProfile> callable = new Callable<GameProfile>() {
-+                        @Override
-+                        public GameProfile call() {
-+                            final GameProfile profile = skinCache.getUnchecked(input.getName().toLowerCase(java.util.Locale.ROOT));
-+                            MinecraftServer.getServerInst().processQueue.add(new Runnable() {
-+                                @Override
-+                                public void run() {
-+                                    if (profile == null) {
-+                                        callback.apply(input);
-+                                    } else {
-+                                        callback.apply(profile);
-+                                    }
-+                                }
-+                            });
-+                            return profile;
-+                        }
++                    Callable<GameProfile> callable = () -> {
++                        final GameProfile profile1 = skinCache.getUnchecked(input.getName().toLowerCase(Locale.ROOT));
++                        MinecraftServer.getServerInst().processQueue.add(() -> {
++                            if (profile1 == null) {
++                                callback.apply(input);
++                            } else {
++                                callback.apply(profile1);
++                            }
++                        });
++                        return profile1;
 +                    };
 +                    if (sync) {
 +                        try {

src/main/java/catserver/server/threads/AsyncTaskThread.java

@@ -7,7 +7,7 @@
 import java.util.concurrent.TimeUnit;
 
 public class AsyncTaskThread {
-    private static final ExecutorService asyncExecutor = Executors.newFixedThreadPool(2, new ThreadFactoryBuilder().setNameFormat("CatServer Async Task Handler Thread - %1$d").build()); // CatRoom - Sync Paper changes
+    private static final ExecutorService asyncExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("CatServer Async Task Handler Thread - %1$d").factory()); // CatRoom - Sync Paper changes
 
     public static void shutdown() {
         try {