From 5296049d81a7d201eeb1f535b4223bd0ba21febb Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 1 Sep 2023 17:37:03 +0800
Subject: Update to 23w35a

---
 .../shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java  | 2 +-
 .../rei/impl/client/registry/display/DisplayRegistryImpl.java     | 5 +++--
 .../rei/impl/common/registry/RecipeManagerContextImpl.java        | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'runtime/src/main/java')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java
index eeaf59ce7..0f8c96c2d 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java
@@ -128,7 +128,7 @@ public class ChangelogLoader {
                             builder.add(width -> new ErrorsEntryListWidget.EmptyEntry(6));
                         }
                     }
-                } catch (IOException e) {
+                } catch (Exception e) {
                     builder.add(Component.translatable("rei.changelog.error.failedToReadChangelogFile"));
                 }
             }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
index f8f303408..a68be8db2 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
@@ -39,6 +39,7 @@ import me.shedaniel.rei.api.common.plugins.PluginManager;
 import me.shedaniel.rei.impl.common.InternalLogger;
 import me.shedaniel.rei.impl.common.registry.RecipeManagerContextImpl;
 import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeHolder;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -169,9 +170,9 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi
     @Override
     public void endReload() {
         if (!fillers.isEmpty()) {
-            List<Recipe<?>> allSortedRecipes = getAllSortedRecipes();
+            List<RecipeHolder<?>> allSortedRecipes = getAllSortedRecipes();
             for (int i = allSortedRecipes.size() - 1; i >= 0; i--) {
-                Recipe<?> recipe = allSortedRecipes.get(i);
+                RecipeHolder<?> recipe = allSortedRecipes.get(i);
                 addWithReason(recipe, DisplayAdditionReason.RECIPE_MANAGER);
             }
         }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java
index da48a31ae..c9ba75aa5 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java
@@ -28,7 +28,7 @@ import dev.architectury.utils.GameInstance;
 import me.shedaniel.rei.api.common.plugins.REIPlugin;
 import me.shedaniel.rei.api.common.registry.RecipeManagerContext;
 import net.minecraft.client.Minecraft;
-import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.RecipeManager;
 
 import java.util.Collections;
@@ -38,9 +38,9 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class RecipeManagerContextImpl<P extends REIPlugin<?>> implements RecipeManagerContext<P> {
-    private static final Comparator<Recipe<?>> RECIPE_COMPARATOR = Comparator.comparing((Recipe<?> o) -> o.getId().getNamespace()).thenComparing(o -> o.getId().getPath());
+    private static final Comparator<RecipeHolder<?>> RECIPE_COMPARATOR = Comparator.comparing((RecipeHolder<?> o) -> o.id().getNamespace()).thenComparing(o -> o.id().getPath());
     private final Supplier<RecipeManager> recipeManager;
-    private List<Recipe<?>> sortedRecipes = null;
+    private List<RecipeHolder<?>> sortedRecipes = null;
     
     public RecipeManagerContextImpl(Supplier<RecipeManager> recipeManager) {
         this.recipeManager = recipeManager;
@@ -52,7 +52,7 @@ public class RecipeManagerContextImpl<P extends REIPlugin<?>> implements RecipeM
     }
     
     @Override
-    public List<Recipe<?>> getAllSortedRecipes() {
+    public List<RecipeHolder<?>> getAllSortedRecipes() {
         if (sortedRecipes == null) {
             this.sortedRecipes = getRecipeManager().getRecipes().parallelStream().sorted(RECIPE_COMPARATOR).collect(Collectors.toList());
         }
-- 
cgit