Allow customizing what part of REI should animate, disable config screen animation by default

Signed-off-by: shedaniel <daniel@shedaniel.me>

3 files changed, 7 insertions, 8 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java b/runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java
index 9eec7c84c..9a06211a2 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java
+++ b/runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java
@@ -80,11 +80,11 @@ public class OverlaySearchField extends TextFieldWidget implements TextFieldWidg
         return TextTransformations.forwardWithTransformation(text, (s, charIndex, c) -> {
             byte arg = highlighter.highlighted[charIndex + index];
             Style style = Style.EMPTY;
+            if (isMain && ContainerScreenOverlay.getEntryListWidget().getAllStacks().isEmpty() && !getText().isEmpty()) {
+                style = ERROR_STYLE;
+            }
             if (arg > 0) {
                 Argument<?, ?> argument = ArgumentsRegistry.ARGUMENT_LIST.get((arg - 1) / 2);
-                if (isMain && ContainerScreenOverlay.getEntryListWidget().getAllStacks().isEmpty() && !getText().isEmpty()) {
-                    style = ERROR_STYLE;
-                }
                 if (!isPlain) {
                     style = argument.getHighlightedStyle();
                 }
@@ -130,7 +130,6 @@ public class OverlaySearchField extends TextFieldWidget implements TextFieldWidg
     
     public void laterRender(PoseStack matrices, int int_1, int int_2, float float_1) {
         RenderSystem.disableDepthTest();
-        setEditableColor(isMain && ContainerScreenOverlay.getEntryListWidget().getAllStacks().isEmpty() && !getText().isEmpty() ? 16733525 : isHighlighting && isMain ? -852212 : (containsMouse(PointHelper.ofMouse()) || isFocused()) ? (REIHelper.getInstance().isDarkThemeEnabled() ? -17587 : -1) : -6250336);
         setSuggestion(!isFocused() && getText().isEmpty() ? I18n.get("text.rei.search.field.suggestion") : null);
         super.render(matrices, int_1, int_2, float_1);
         RenderSystem.enableDepthTest();
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/runtime/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java
index ccbfa51b3..798c3ac24 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java
@@ -125,7 +125,7 @@ public class CreditsScreen extends Screen {
         MutableLong current = new MutableLong(0);
         Minecraft.getInstance().setScreen(new TransformingScreen(true, parent,
                 this,
-                () -> current.setValue(current.getValue() == 0 ? Util.getMillis() + (ConfigObject.getInstance().isReducedMotion() ? -3000 : 0) : current.getValue()),
+                () -> current.setValue(current.getValue() == 0 ? Util.getMillis() + (!ConfigObject.getInstance().isCreditsScreenAnimated() ? -3000 : 0) : current.getValue()),
                 () -> EasingMethod.EasingMethodImpl.EXPO.apply(Mth.clamp((Util.getMillis() - current.getValue()) / 750.0, 0, 1))
                       * Minecraft.getInstance().getWindow().getGuiScaledWidth(),
                 () -> 0,
diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java b/runtime/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java
index db383eda7..7a6851619 100644
--- a/runtime/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java
@@ -322,7 +322,7 @@ public class FavoritesListWidget extends WidgetWithBounds implements DraggableSt
                 entry = new Entry(favorite, entrySize);
             }
             
-            if (ConfigObject.getInstance().isReducedMotion()) entry.size.setAs(entrySize * 100);
+            if (!ConfigObject.getInstance().isFavoritesAnimated()) entry.size.setAs(entrySize * 100);
             else entry.size.setTo(entrySize * 100, 300);
             entries.put(entry.hashIgnoreAmount(), entry);
         }
@@ -530,7 +530,7 @@ public class FavoritesListWidget extends WidgetWithBounds implements DraggableSt
         public void remove() {
             if (!hidden) {
                 this.hidden = true;
-                if (ConfigObject.getInstance().isReducedMotion()) this.size.setAs(0);
+                if (!ConfigObject.getInstance().isFavoritesAnimated()) this.size.setAs(0);
                 else this.size.setTo(0, 300);
             }
         }
@@ -562,7 +562,7 @@ public class FavoritesListWidget extends WidgetWithBounds implements DraggableSt
         }
         
         public void moveTo(boolean animated, int xPos, int yPos) {
-            if (animated && !ConfigObject.getInstance().isReducedMotion()) {
+            if (animated && ConfigObject.getInstance().isFavoritesAnimated()) {
                 x.setTo(xPos, 200);
                 y.setTo(yPos, 200);
             } else {