Merge remote-tracking branch 'origin/7.x-1.18' into 7.x-1.18.2

# Conflicts:
#	gradle.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java

84 files changed, 3342 insertions, 2892 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 9c2afe968..07cea7acf 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -41,6 +41,8 @@ body:
       description: Please copy and paste any relevant log output, this will be used to help diagnose the issue. Please do not use any paste services, as they may expire and be deleted.
       placeholder: You can look into `.minecraft/logs` and find the `latest.log` and `rei.log`, you can paste them here.
       render: shell
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Anything else?
@@ -53,4 +55,4 @@ body:
       value: |
         Before submitting a bug report, please make sure that this issue has not already been reported. You can use the search feature to find existing issues.
 
-        Thanks for taking the time to fill out this bug report!
\ No newline at end of file
+        Thanks for taking the time to fill out this bug report!
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
index aa90567ae..dfd8f08f6 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
@@ -50,6 +50,9 @@ public interface ConfigObject {
     
     void setCheating(boolean cheating);
     
+    @ApiStatus.Experimental
+    CheatingMode getCheatingMode();
+    
     EntryPanelOrdering getItemListOrdering();
     
     boolean isItemListAscending();
@@ -86,6 +89,8 @@ public interface ConfigObject {
     
     String getWeatherCommand();
     
+    String getTimeCommand();
+    
     int getMaxRecipePerPage();
     
     int getMaxRecipesPageHeight();
@@ -113,10 +118,14 @@ public interface ConfigObject {
     
     boolean doesFastEntryRendering();
     
+    boolean doesCacheEntryRendering();
+    
     boolean doDebugRenderTimeRequired();
     
     boolean doMergeDisplayUnderOne();
     
+    FavoriteAddWidgetMode getFavoriteAddWidgetMode();
+    
     ModifierKeyCode getFavoriteKeyCode();
     
     ModifierKeyCode getRecipeKeybind();
@@ -188,6 +197,9 @@ public interface ConfigObject {
     @ApiStatus.Experimental
     SyntaxHighlightingMode getSyntaxHighlightingMode();
     
+    @ApiStatus.Experimental
+    boolean isFocusModeZoomed();
+    
     SearchMode getTooltipSearchMode();
     
     SearchMode getTagSearchMode();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
index 62c89edd2..858d43aa5 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
@@ -26,11 +26,11 @@ package me.shedaniel.rei.api.client.favorites;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Vector4f;
 import me.shedaniel.clothconfig2.api.ScissorsHandler;
+import me.shedaniel.clothconfig2.api.animator.NumberAnimator;
+import me.shedaniel.clothconfig2.api.animator.ValueAnimator;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.gui.AbstractRenderer;
 import me.shedaniel.rei.api.client.gui.Renderer;
-import me.shedaniel.rei.api.client.gui.animator.NumberAnimator;
-import me.shedaniel.rei.api.client.gui.animator.ValueAnimator;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.Util;
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
index fe116e744..b0ce0e735 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
@@ -127,6 +127,7 @@ public class SimpleDisplayRenderer extends DisplayRenderer implements WidgetHold
             outputWidget.setZ(getZ() + 50);
             outputWidget.getBounds().setLocation(xx, yy);
             outputWidget.render(matrices, mouseX, mouseY, delta);
+            yy += 18;
         }
     }
     
@@ -146,7 +147,7 @@ public class SimpleDisplayRenderer extends DisplayRenderer implements WidgetHold
     
     @Override
     public int getHeight() {
-        return 4 + getItemsHeight() * 18;
+        return Math.max(4 + getItemsHeight() * 18, 4 + outputWidgets.size() * 18);
     }
     
     public int getItemsHeight() {
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/animator/ConventionValueAnimator.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/animator/ConventionValueAnimator.java
deleted file mode 100644
index 771fe6489..000000000
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/animator/ConventionValueAnimator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This file is licensed under the MIT License, part of Roughly Enough Items.
- * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package me.shedaniel.rei.api.client.gui.animator;
-
-import org.jetbrains.annotations.ApiStatus;
-
-import java.util.Objects;
-import java.util.function.Supplier;
-
-@ApiStatus.Internal
-final class ConventionValueAnimator<T> implements ValueAnimator<T> {
-    private final ValueAnimator<T> parent;
-    private final Supplier<T> convention;
-    private final long duration;
-    
-    ConventionValueAnimator(ValueAnimator<T> parent, Supplier<T> convention, long duration) {
-        this.parent = parent;
-        this.convention = convention;
-        this.duration = duration;
-        setAs(convention.get());
-    }
-    
-    @Override
-    public ValueAnimator<T> setTo(T value, long duration) {
-        return parent.setTo(value, duration);
-    }
-    
-    @Override
-