From ff8cd3e6fb20fffd1d05d59fd34db519e42a0e38 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 5 Nov 2022 19:08:04 +0800 Subject: Make auto crafting not evaluate every frame for pinned displays --- .../client/gui/widget/favorites/history/DisplayEntry.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'runtime') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java index 90919e2de..279c95940 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java @@ -23,6 +23,7 @@ package me.shedaniel.rei.impl.client.gui.widget.favorites.history; +import com.google.common.base.Suppliers; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector4f; import me.shedaniel.clothconfig2.api.LazyResettable; @@ -47,12 +48,16 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; public class DisplayEntry extends WidgetWithBounds { private final LazyResettable> widgets = new LazyResettable<>(this::setupWidgets); private final DisplayHistoryWidget parent; private final Display display; private final Dimension size = new Dimension(1, 1); + private final Supplier autoCraftingResult = + Suppliers.memoizeWithExpiration(this::evaluateAutoCrafting, 1000, TimeUnit.MILLISECONDS); private boolean hasInitialBounds; private final ValueAnimator bounds = ValueAnimator.ofFloatingRectangle(); private final Button plusButton; @@ -72,6 +77,11 @@ public class DisplayEntry extends WidgetWithBounds { } } + private AutoCraftingEvaluator.AutoCraftingResult evaluateAutoCrafting() { + if (this.display == null) return new AutoCraftingEvaluator.AutoCraftingResult(); + return AutoCraftingEvaluator.evaluateAutoCrafting(false, false, this.display, this.display::provideInternalDisplayIds); + } + public UUID getUuid() { return uuid; } @@ -171,7 +181,7 @@ public class DisplayEntry extends WidgetWithBounds { Vector4f mouse = new Vector4f((float) mouseX, (float) mouseY, 0, 1); mouse.transform(poses.last().pose()); - AutoCraftingEvaluator.AutoCraftingResult result = AutoCraftingEvaluator.evaluateAutoCrafting(false, false, display, display::provideInternalDisplayIds); + AutoCraftingEvaluator.AutoCraftingResult result = this.autoCraftingResult.get(); plusButton.setEnabled(result.successful); plusButton.setTint(result.tint); -- cgit