Merge remote-tracking branch 'origin/9.x-1.19' into 12.x-1.20

# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java
shedaniel · Apr 29, 2024 · ee6aa88 · ee6aa88
2 parents 9cb2883 + c037d7b
commit ee6aa88
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...e/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java b/...e/src/main/java/me/shedaniel/rei/impl/client/gui/config/components/ConfigGroupWidget.java
@@ -25,6 +25,7 @@
 
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
+import me.shedaniel.rei.api.client.REIRuntime;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
 import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds;
 import me.shedaniel.rei.api.client.gui.widgets.Widgets;
@@ -37,6 +38,7 @@
 import me.shedaniel.rei.impl.client.gui.config.options.preview.InterfacePreviewer;
 import me.shedaniel.rei.impl.client.gui.config.options.preview.TooltipPreviewer;
 import me.shedaniel.rei.impl.client.gui.text.TextTransformations;
+import net.minecraft.client.Minecraft;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
@@ -65,6 +67,10 @@ public static WidgetWithBounds create(ConfigAccess access, OptionGroup entry, in
                 .withPadding(0, 0, 0, 6);
         WidgetWithBounds contents;
 
+        if (applyPreview) {
+            applyPreview = REIRuntime.getInstance().getPreviousContainerScreen() != null && Minecraft.getInstance().getConnection() != null && Minecraft.getInstance().getConnection().getRecipeManager() != null;
+        }
+
         if (applyPreview && SPECIAL_GROUPS.containsKey(entry.getId())) {
             Pair<PreviewLocation, SpecialGroupConstructor> pair = SPECIAL_GROUPS.get(entry.getId());
             PreviewLocation location = pair.getLeft();

diff --git a/...main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java b/...main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java
@@ -115,6 +115,10 @@ protected void renderEntries(boolean fastEntryRendering, GuiGraphics graphics, i
     }
 
     public int getTotalPages() {
+        return getTotalPages(entries);
+    }
+
+    public int getTotalPages(List<?> entries) {
         return Mth.ceil(stacks.size() / (float) entries.size());
     }
 
@@ -133,7 +137,7 @@ protected void updateEntries(int entrySize, boolean zoomed) {
                 }
             }
         }
-        page = Math.max(Math.min(page, getTotalPages() - 1), 0);
+        page = Mth.clamp(page, 0, getTotalPages(entries) - 1);
         int skip = Math.max(0, page * entries.size());
         List</*EntryStack<?> | List<EntryStack<?>>*/ Object> subList = stacks.subList(skip, Math.min(stacks.size(), skip + entries.size()));
         Int2ObjectMap<CollapsedStack> indexedCollapsedStack = getCollapsedStackIndexed();