Update to 1.21

4 files changed, 16 insertions, 7 deletions

diff --git a/neoforge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java b/neoforge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java
index 9a13e0cdc..6486f0aba 100644
--- a/neoforge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java
+++ b/neoforge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java
@@ -28,7 +28,7 @@ import me.shedaniel.rei.impl.init.PrimitivePlatformAdapter;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.fml.loading.moddiscovery.ModAnnotation;
+import net.neoforged.fml.loading.modscan.ModAnnotation;
 import net.neoforged.neoforgespi.language.IModInfo;
 import net.neoforged.neoforgespi.language.ModFileScanData;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
@@ -68,13 +68,13 @@ public class AnnotationUtils {
                     if (value instanceof Dist[]) {
                         enabled = Arrays.asList((Dist[]) value).contains(FMLEnvironment.dist);
                     } else if (value instanceof ModAnnotation.EnumHolder) {
-                        enabled = Objects.equals(((ModAnnotation.EnumHolder) value).getValue(), FMLEnvironment.dist.name());
+                        enabled = Objects.equals(((ModAnnotation.EnumHolder) value).value(), FMLEnvironment.dist.name());
                     } else if (value instanceof List) {
                         List<ModAnnotation.EnumHolder> holders = ((List<?>) value).stream().filter(o -> o instanceof ModAnnotation.EnumHolder)
                                 .map(o -> (ModAnnotation.EnumHolder) o).toList();
                         if (!holders.isEmpty()) {
                             enabled = holders.stream()
-                                    .anyMatch(o -> Objects.equals(o.getValue(), FMLEnvironment.dist.name()));
+                                    .anyMatch(o -> Objects.equals(o.value(), FMLEnvironment.dist.name()));
                         } else {
                             enabled = true;
                         }
diff --git a/neoforge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java b/neoforge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java
index f96f0b409..ae75e9780 100644
--- a/neoforge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java
+++ b/neoforge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java
@@ -39,7 +39,6 @@ import me.shedaniel.rei.plugin.common.forge.DefaultPluginImpl;
 import me.shedaniel.rei.plugin.common.runtime.DefaultRuntimePlugin;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.neoforged.fml.loading.FMLEnvironment;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/neoforge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java b/neoforge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
index 409fc0a35..e61f92b2b 100644
--- a/neoforge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
+++ b/neoforge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
@@ -25,18 +25,27 @@ package me.shedaniel.rei.forge;
 
 import me.shedaniel.rei.impl.init.RoughlyEnoughItemsInitializer;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.neoforge.data.loading.DatagenModLoader;
 import org.jetbrains.annotations.ApiStatus;
 
+import java.util.function.Supplier;
+
 @Mod("roughlyenoughitems")
 @ApiStatus.Internal
 public class RoughlyEnoughItemsForge {
     public RoughlyEnoughItemsForge() {
         if (!DatagenModLoader.isRunningDataGen()) {
             RoughlyEnoughItemsInitializer.onInitialize();
-            DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> RoughlyEnoughItemsInitializer::onInitializeClient);
+            
+            if (FMLEnvironment.dist == Dist.CLIENT) {
+                run(() -> RoughlyEnoughItemsInitializer::onInitializeClient);
+            }
         }
     }
+    
+    public static void run(Supplier<Runnable> runnableSupplier) {
+        runnableSupplier.get().run();
+    }
 }
diff --git a/neoforge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java b/neoforge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java
index 833b885d9..0dc32c207 100644
--- a/neoforge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java
+++ b/neoforge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.mixin.forge;
 import me.shedaniel.rei.plugin.common.displays.tag.TagNodes;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.tags.TagManager;
@@ -42,6 +43,6 @@ public abstract class MixinTagManager<T> {
     @Inject(method = "createLoader", at = @At("HEAD"))
     private void load(ResourceManager resourceManager, Executor executor, RegistryAccess.RegistryEntry<T> registryEntry, CallbackInfoReturnable<CompletableFuture<TagManager.LoadResult<T>>> cir) {
         ResourceKey<? extends Registry<T>> resourceKey = registryEntry.key();
-        TagNodes.TAG_DIR_MAP.put(TagManager.getTagDir(resourceKey), resourceKey);
+        TagNodes.TAG_DIR_MAP.put(Registries.tagsDirPath(resourceKey), resourceKey);
     }
 }