From 758292b9f53d25191528f1ff29037b8fd1b97e38 Mon Sep 17 00:00:00 2001 From: someaddons <38401808+someaddons@users.noreply.github.com> Date: Sun, 9 Jun 2024 11:05:43 +0200 Subject: [PATCH] avoid nearby colony lookup on each frame (#9972) Avoid nearby colony lookup on each frame --- .../client/render/worldevent/WorldEventContext.java | 12 +++++++++++- .../minecolonies/core/event/ClientEventHandler.java | 11 +++++++++++ 2 files changed, 22 insertions(+), 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 index 01cb75dad26..2bcb76bd0ef 100644 --- 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 index 1e13a82687b..12a3ac1bc20 100644 --- 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) {