Fix support for Enchantment Descriptions

4 files changed, 11 insertions, 3 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java
index b4d206910..4dc125974 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java
@@ -34,6 +34,7 @@ import net.minecraft.core.Registry;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
@@ -150,6 +151,10 @@ public interface EntryRegistry extends Reloadable<REIClientPlugin> {
         addEntriesAfter(null, stacks);
     }
     
+    // TODO Re-evaluate the need for this
+    @ApiStatus.Internal
+    Collection<EntryStack<?>> refilterNew(Collection<EntryStack<?>> entries);
+    
     /**
      * Checks if a stack is already registered.
      *
diff --git a/forge/build.gradle b/forge/build.gradle
index 7382006df..008abfcdc 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -106,6 +106,7 @@ dependencies {
     // modRuntime("curse.maven:bookshelf-228525:3474499")
     // modRuntime("curse.maven:kubejs-238086:3533307")
     // modRuntime("curse.maven:rhino-416294:3525704")
+    modRuntime("curse.maven:enchantment-descriptions-250419:3566741")
 }
 
 shadowJar {
diff --git a/gradle.properties b/gradle.properties
index 252d31092..42bb81b2b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx3G
 base_version=7.1
 unstable=false
 supported_version=1.18.x
-minecraft_version=1.18
+minecraft_version=1.18.1
 forgeEnabled=true
-forge_version=38.0.8
+forge_version=39.0.5
 fabricloader_version=0.12.8
 cloth_config_version=6.0.43
 modmenu_version=3.0.0
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
index 136429680..95504c6a6 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
@@ -233,7 +233,9 @@ public class EntryRegistryImpl implements EntryRegistry {
     
     private MutableLong lastRefilterWarning = new MutableLong(-1);
     
-    private Collection<EntryStack<?>> refilterNew(Collection<EntryStack<?>> entries) {
+    @ApiStatus.Internal
+    @Override
+    public Collection<EntryStack<?>> refilterNew(Collection<EntryStack<?>> entries) {
         if (lastRefilterWarning != null) {
             if (lastRefilterWarning.getValue() > 0 && System.currentTimeMillis() - lastRefilterWarning.getValue() > 5000) {
                 RoughlyEnoughItemsCore.LOGGER.warn("Detected runtime EntryRegistry modification, this can be extremely dangerous, or be extremely inefficient!");