Only cache JEI citizens temporarily (#10489)

Change JEI citizens to only temporarily be cached instead of caching for lifetime of the world session. This further reduces the lifetime of the client level, as a follow-up to Use fake level for JEI #10304.
ldtteam · Dec 22, 2024 · 03f58b5 · 03f58b5
1 parent d1984bb
commit 03f58b5
Showing 1 changed file with 36 additions and 16 deletions.
diff --git a/src/main/java/com/minecolonies/core/compatibility/jei/JobBasedRecipeCategory.java b/src/main/java/com/minecolonies/core/compatibility/jei/JobBasedRecipeCategory.java
@@ -1,5 +1,6 @@
 package com.minecolonies.core.compatibility.jei;
 
+import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -12,6 +13,7 @@
 import com.minecolonies.api.entity.ModEntities;
 import com.minecolonies.api.equipment.ModEquipmentTypes;
 import com.minecolonies.api.equipment.registry.EquipmentTypeEntry;
+import com.minecolonies.api.util.Log;
 import com.minecolonies.api.util.constant.Constants;
 import com.minecolonies.api.util.constant.TranslationConstants;
 import com.minecolonies.core.colony.CitizenData;
@@ -48,7 +50,9 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.time.Duration;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -67,10 +71,13 @@ public abstract class JobBasedRecipeCategory<T> implements IRecipeCategory<T>
     @NotNull private final IDrawable icon;
     @NotNull protected final IDrawableStatic slot;
     @NotNull protected final IDrawableStatic chanceSlot;
-    @NotNull private final EntityCitizen citizen;
     @NotNull private final List<FormattedText> description;
     @NotNull private final LoadingCache<T, List<InfoBlock>> infoBlocksCache;
 
+    private static final Cache<IJob<?>, EntityCitizen> citizenCache = CacheBuilder.newBuilder()
+            .expireAfterAccess(Duration.ofMinutes(2))
+            .build();
+
     protected static final int WIDTH = 167;
     protected static final int HEIGHT = 120;
     protected static final int CITIZEN_X = 2;
@@ -92,8 +99,6 @@ protected JobBasedRecipeCategory(@NotNull final IJob<?> job,
         this.slot = guiHelper.getSlotDrawable();
         this.chanceSlot = guiHelper.createDrawable(TEXTURE, 0, 121, 18, 18);
 
-        this.citizen = createCitizenWithJob(this.job);
-
         this.description = wordWrap(breakLines(translateDescription(
                 TranslationConstants.PARTIAL_JEI_INFO +
                         this.job.getJobRegistryEntry().getKey().getPath())));
@@ -210,12 +215,16 @@ public void draw(@NotNull final T recipe,
         final int citizen_by = CITIZEN_Y + CITIZEN_H;
         final int offsetY = 4;
 
-        final float headYaw = (float) Math.atan((citizen_cx - mouseX) / 40.0F) * 40.0F;
-        final float yaw = (float) Math.atan((citizen_cx - mouseX) / 40.0F) * 20.0F;
-        final float pitch = (float) Math.atan((citizen_cy - offsetY - mouseY) / 40.0F) * 20.0F;
-        Lighting.setupForFlatItems();
-        UiRenderMacros.drawEntity(stack.pose(), citizen_cx, citizen_by - offsetY, scale, headYaw, yaw, pitch, this.citizen);
-        Lighting.setupFor3DItems();
+        final EntityCitizen citizen = createCitizenWithJob(this.job);
+        if (citizen != null)
+        {
+            final float headYaw = (float) Math.atan((citizen_cx - mouseX) / 40.0F) * 40.0F;
+            final float yaw = (float) Math.atan((citizen_cx - mouseX) / 40.0F) * 20.0F;
+            final float pitch = (float) Math.atan((citizen_cy - offsetY - mouseY) / 40.0F) * 20.0F;
+            Lighting.setupForFlatItems();
+            UiRenderMacros.drawEntity(stack.pose(), citizen_cx, citizen_by - offsetY, scale, headYaw, yaw, pitch, citizen);
+            Lighting.setupFor3DItems();
+        }
 
         int y = 0;
         final Minecraft mc = Minecraft.getInstance();
@@ -298,15 +307,26 @@ public InfoBlock(final String text, final String tip, final Rect2i bounds)
         public final Rect2i bounds;
     }
 
-    @NotNull
+    @Nullable
     private static EntityCitizen createCitizenWithJob(@NotNull final IJob<?> job)
     {
-        final EntityCitizen citizen = new EntityCitizen(ModEntities.CITIZEN, FAKE_LEVEL);
-        citizen.setFemale(citizen.getRandom().nextBoolean());
-        citizen.setTextureId(citizen.getRandom().nextInt(255));
-        citizen.getEntityData().set(EntityCitizen.DATA_TEXTURE_SUFFIX, CitizenData.SUFFIXES.get(citizen.getRandom().nextInt(CitizenData.SUFFIXES.size())));
-        citizen.setModelId(job.getModel());
-        return citizen;
+        try
+        {
+            return citizenCache.get(job, () ->
+            {
+                final EntityCitizen citizen = new EntityCitizen(ModEntities.CITIZEN, FAKE_LEVEL);
+                citizen.setFemale(citizen.getRandom().nextBoolean());
+                citizen.setTextureId(citizen.getRandom().nextInt(255));
+                citizen.getEntityData().set(EntityCitizen.DATA_TEXTURE_SUFFIX, CitizenData.SUFFIXES.get(citizen.getRandom().nextInt(CitizenData.SUFFIXES.size())));
+                citizen.setModelId(job.getModel());
+                return citizen;
+            });
+        }
+        catch (final Throwable e)
+        {
+            Log.getLogger().error("Error creating citizen for {}", job.getJobRegistryEntry().getTranslationKey(), e);
+            return null;
+        }
     }
 
     @NotNull