From 2cd3f0737b2008e37f8eaadf479312c60d36e7bc Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 20 Mar 2021 16:40:39 +0800 Subject: Allow customizing what part of REI should animate, disable config screen animation by default Signed-off-by: shedaniel --- api/src/main/java/me/shedaniel/rei/api/config/ConfigObject.java | 7 ++++++- .../main/java/me/shedaniel/rei/api/gui/widgets/DelegateWidget.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'api') diff --git a/api/src/main/java/me/shedaniel/rei/api/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/config/ConfigObject.java index 32f967fd3..4000844cb 100644 --- a/api/src/main/java/me/shedaniel/rei/api/config/ConfigObject.java +++ b/api/src/main/java/me/shedaniel/rei/api/config/ConfigObject.java @@ -58,7 +58,11 @@ public interface ConfigObject { boolean isGrabbingItems(); - boolean isReducedMotion(); + boolean isConfigScreenAnimated(); + + boolean isCreditsScreenAnimated(); + + boolean isFavoritesAnimated(); boolean isToastDisplayedOnCopyIdentifier(); @@ -98,6 +102,7 @@ public interface ConfigObject { RecipeBorderType getRecipeBorderType(); + boolean doesVillagerScreenHavePermanentScrollBar(); boolean doesRegisterRecipesInAnotherThread(); diff --git a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/DelegateWidget.java b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/DelegateWidget.java index bd22f7e78..ece1ab092 100644 --- a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/DelegateWidget.java +++ b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/DelegateWidget.java @@ -23,6 +23,7 @@ package me.shedaniel.rei.api.gui.widgets; +import com.google.common.base.MoreObjects; import com.mojang.blaze3d.vertex.PoseStack; import me.shedaniel.math.Rectangle; import net.minecraft.client.gui.components.events.GuiEventListener; @@ -75,7 +76,11 @@ public class DelegateWidget extends WidgetWithBounds { @Override public void setFocused(@Nullable GuiEventListener guiEventListener) { - widget.setFocused(guiEventListener); + if (guiEventListener == widget) { + super.setFocused(widget); + } else { + widget.setFocused(guiEventListener); + } } @Override -- cgit