avoid nearby colony lookup on each frame (#9972)

Avoid nearby colony lookup on each frame
ldtteam · Jun 9, 2024 · 758292b · 758292b
1 parent cadb39a
commit 758292b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/main/java/com/minecolonies/core/client/render/worldevent/WorldEventContext.java b/src/main/java/com/minecolonies/core/client/render/worldevent/WorldEventContext.java
@@ -9,6 +9,7 @@
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.MultiBufferSource.BufferSource;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 
 import net.minecraftforge.client.event.RenderLevelStageEvent;
@@ -51,7 +52,6 @@ public void renderWorldLastEvent(final RenderLevelStageEvent event)
         clientLevel = Minecraft.getInstance().level;
         clientPlayer = Minecraft.getInstance().player;
         mainHandItem = clientPlayer.getMainHandItem();
-        nearestColony = IColonyManager.getInstance().getClosestColonyView(clientLevel, clientPlayer.blockPosition());
         clientRenderDist = Minecraft.getInstance().options.renderDistance().get();
 
         final Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition();
@@ -85,4 +85,14 @@ boolean hasNearestColony()
     {
         return nearestColony != null;
     }
+
+    /**
+     * Checks for a nearby colony
+     *
+     * @param level
+     */
+    public void checkNearbyColony(final Level level)
+    {
+        nearestColony = IColonyManager.getInstance().getClosestColonyView(level, clientPlayer.blockPosition());
+    }
 }
diff --git a/src/main/java/com/minecolonies/core/event/ClientEventHandler.java b/src/main/java/com/minecolonies/core/event/ClientEventHandler.java
@@ -13,6 +13,7 @@
 import com.minecolonies.api.colony.buildings.registry.BuildingEntry;
 import com.minecolonies.api.research.IGlobalResearch;
 import com.minecolonies.api.util.InventoryUtils;
+import com.minecolonies.api.util.constant.ColonyConstants;
 import com.minecolonies.api.util.constant.Constants;
 import com.minecolonies.api.util.constant.TranslationConstants;
 import com.minecolonies.core.client.gui.WindowBuildingBrowser;
@@ -44,6 +45,7 @@
 import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.client.event.sound.PlaySoundEvent;
 import net.minecraftforge.common.util.Lazy;
+import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
@@ -77,6 +79,15 @@ public static void renderWorldLastEvent(@NotNull final RenderLevelStageEvent eve
         WorldEventContext.INSTANCE.renderWorldLastEvent(event);
     }
 
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    public static void onwWorldTick(@NotNull final TickEvent.LevelTickEvent event)
+    {
+        if (event.level.isClientSide && event.phase == TickEvent.Phase.END && ColonyConstants.rand.nextInt(20) == 0)
+        {
+            WorldEventContext.INSTANCE.checkNearbyColony(event.level);
+        }
+    }
+
     @SubscribeEvent
     public static void onPlayerLogout(@NotNull final ClientPlayerNetworkEvent.LoggingOut event)
     {