From b9ab61fe8a1c10f5adb61814ad9328b29727a37a Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 2 Nov 2021 16:06:10 +0800
Subject: Refactor MenuInfoProvider to give more concrete info

---
 forge/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'forge')

diff --git a/forge/build.gradle b/forge/build.gradle
index 251f6fd54..119091b3d 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -57,12 +57,12 @@ dependencies {
     modApi("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}")
     modApi("dev.architectury:architectury-forge:${architectury_version}")
 
-    common(project(path: ":jei-compatibility-layer", configuration: "dev")) { transitive false }
-    shadowCommon(project(path: ":jei-compatibility-layer", configuration: "dev")) { transitive false }
-    runtimeClasspath(project(path: ":jei-internals-workaround", configuration: "dev")) { transitive = false }
+    common(project(path: ":jei-compatibility-layer", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":jei-compatibility-layer", configuration: "namedElements")) { transitive false }
+    runtimeClasspath(project(path: ":jei-internals-workaround", configuration: "namedElements")) { transitive false }
 
     depProjects.forEach {
-        common(project(path: it, configuration: "dev")) { transitive false }
+        common(project(path: it, configuration: "namedElements")) { transitive false }
         shadowCommon(project(path: it, configuration: "transformProductionForge")) { transitive false }
     }
 
-- 
cgit 


From 07f4f783e72a1a149685833e504bd7a7689d46f3 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 2 Nov 2021 16:07:07 +0800
Subject: Fix #649

---
 forge/build.gradle                                       | 16 +++++++++-------
 .../me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'forge')

diff --git a/forge/build.gradle b/forge/build.gradle
index 119091b3d..bf48468ae 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -66,7 +66,7 @@ dependencies {
         shadowCommon(project(path: it, configuration: "transformProductionForge")) { transitive false }
     }
 
-    // modRuntime("curse.maven:chiselsbits-231095:3176033")
+    modRuntime("curse.maven:chiselsbits-231095:3492889")
     // modRuntime("curse.maven:jumbofurnace-390880:3120970")
     // modRuntime("curse.maven:cyclic-239286:3221427")
     // modRuntime("curse.maven:mekanism-268560:3206392")
@@ -74,15 +74,15 @@ dependencies {
     // modRuntime("curse.maven:autoreglib-250363:3326041")
     // modRuntime("curse.maven:ars-nouveau-401955:3442387")
     // modRuntime("curse.maven:patchouli-306770:3374063")
-    // modRuntime("curse.maven:curios-309927:3343065")
-    // modRuntime("curse.maven:geckolib-388172:3428832")
+    modRuntime("curse.maven:curios-309927:3457073")
+    modRuntime("curse.maven:geckolib-388172:3502639")
     // modRuntime("curse.maven:refined-storage-243076:3196167")
     // modRuntime("appeng:appliedenergistics2:8.2.0")
     // modRuntime("curse.maven:tcon-74072:3273213")
     // modRuntime("curse.maven:mantle-74924:3273201")
-    // modRuntime("curse.maven:jer-240630:3066754")
-    // modRuntime("curse.maven:jep-417645:3198370")
-    // modRuntime("curse.maven:simple-storage-network-268495:3257204")
+    modRuntime("curse.maven:jer-240630:3489131")
+    modRuntime("curse.maven:jep-417645:3478254")
+    modRuntime("curse.maven:simple-storage-network-268495:3476722")
     // modRuntime("curse.maven:create-328085:3278516")
     // modRuntime("curse.maven:industrial-foregoing-266515:3446262")
     // modRuntime("curse.maven:titanium-287342:3346366")
@@ -90,7 +90,9 @@ dependencies {
     // modRuntime("curse.maven:cucumber-272335:3349690")
     // modRuntime("curse.maven:crafttweaker-239197:3494644")
     // modRuntime("curse.maven:jeitweaker-368718:3468722")
-    modRuntime("curse.maven:eidolon-429625:3157832")
+    // modRuntime("curse.maven:eidolon-429625:3157832")
+    modRuntime("curse.maven:token-enchanter-444421:3449483")
+    modRuntime("curse.maven:silent-lib-242998:3400030")
 }
 
 shadowJar {
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
index dd5824c70..e6b2390db 100644
--- a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
+++ b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
@@ -66,7 +66,7 @@ public class RoughlyEnoughItemsForge {
                     .map(IModInfo::getModId)
                     .collect(Collectors.toList());
             for (ModFileScanData.AnnotationData annotation : data.getAnnotations()) {
-                if (annotationType.equals(annotation.targetType())) {
+                if (annotationType.equals(annotation.annotationType())) {
                     try {
                         Class<T> clazz = (Class<T>) Class.forName(annotation.memberName());
                         if (predicate.test(clazz)) {
-- 
cgit