From 306c2c747bfc4b7824f87499a94c731924c11357 Mon Sep 17 00:00:00 2001
From: TexTrue <65154269+TexBlock@users.noreply.github.com>
Date: Thu, 23 Nov 2023 18:42:56 +0800
Subject: [PATCH] fixed rei display issues

---
 FABRIC_CHANGELOG.txt                                       | 7 +++----
 README.md                                                  | 1 +
 build.gradle                                               | 4 ++++
 gradle.properties                                          | 2 +-
 .../simibubi/create/compat/rei/display/CreateDisplay.java  | 4 ++++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/FABRIC_CHANGELOG.txt b/FABRIC_CHANGELOG.txt
index c69dbe5436..fd786be77e 100644
--- a/FABRIC_CHANGELOG.txt
+++ b/FABRIC_CHANGELOG.txt
@@ -5,7 +5,6 @@ No formatting, just plain text. CurseForge support for it is terrible.
 
 Change logging starts below:
 ----------
-- update Porting-Lib version to `2.1.1158+1.20-entity-refactor`
-- fix cogwheels don't make any sounds when placed normally issue ([#6](https://github.com/DM-Earth/create-fabric-dme-edition/issues/6))
-- fix contraptions invisible issue ([#8](https://github.com/DM-Earth/create-fabric-dme-edition/issues/8))
-- fix fluid pipes can't connect to fluid containers issue ([#11](https://github.com/DM-Earth/create-fabric-dme-edition/issues/11))
+- Fixed Ingredients and results of recipes in sequenced assembly can't be looked up by REI.
+- Fixed REI will throw an exception if sequenced assembly contains more than one filling step.
+- Fixed Fluid tag ingredient of basin recipe only shows its first type of fluid in REI.
diff --git a/README.md b/README.md
index af74ad2cf4..f5a267e284 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ this is the only solution for 1.20.1 with [Create Fabric](https://modrinth.com/m
 ### This fork fixes the following issues
 - Fixed a crash that occurred when installing with [Hephaestus](https://modrinth.com/mod/hephaestus). **(This was due to a problem with the version of `PortingLib` used by Create Fabric.)**
 - Fixed compatibility with [Sodium](https://modrinth.com/mod/sodium) 0.5.x **(this issue was caused by Flywheel Fabric)**.
+- Fixed
 
 ### Development to compatible
 See [issue#4](https://github.com/DM-Earth/create-fabric-dme-edition/issues/4)
diff --git a/build.gradle b/build.gradle
index 316675379f..987782b620 100644
--- a/build.gradle
+++ b/build.gradle
@@ -123,6 +123,10 @@ def compat(DependencyHandler deps) {
     deps.modCompileOnly("dev.onyxstudios.cardinal-components-api:cardinal-components-base:$cca_version")
     deps.modCompileOnly("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:$cca_version")
 
+    deps.modImplementation(deps.include("com.github.DM-Earth:CreateFabricREIBugFixDMEEdition:0.1.2-mc1.20.1")) {
+        exclude(group: "me.shedaniel")
+    }
+
     recipeViewers(deps)
 }
 
diff --git a/gradle.properties b/gradle.properties
index 6e6e8ce58b..d0c8415077 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -69,6 +69,6 @@ cca_version = 5.2.2
 # Whether CC: Tweaked should be enabled in dev or not
 cc_enabled = false
 # What recipe viewer to use ('emi', 'rei', or 'jei'. if you change it, don't push it)
-recipe_viewer = emi
+recipe_viewer = rei
 # comma-separated list of test mods to enable in dev. 'none' to use none.
 test_mods = none
diff --git a/src/main/java/com/simibubi/create/compat/rei/display/CreateDisplay.java b/src/main/java/com/simibubi/create/compat/rei/display/CreateDisplay.java
index 70f5e8a150..62e01507a8 100644
--- a/src/main/java/com/simibubi/create/compat/rei/display/CreateDisplay.java
+++ b/src/main/java/com/simibubi/create/compat/rei/display/CreateDisplay.java
@@ -4,11 +4,15 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
 
 public class CreateDisplay<R extends Recipe<?>> implements Display {