Make DeferredHolderCommon work with IForgeRegistry

CyclopsMC · Sep 24, 2024 · f3a4fe8 · f3a4fe8
1 parent 117a0a8
commit f3a4fe8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/loader-common/src/main/java/org/cyclops/cyclopscore/config/DeferredHolderCommon.java b/loader-common/src/main/java/org/cyclops/cyclopscore/config/DeferredHolderCommon.java
@@ -13,6 +13,7 @@
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -26,6 +27,10 @@
  * @param <T> The type of object being held by this DeferredHolder.
  */
 public class DeferredHolderCommon<R, T extends R> implements Holder<R> {
+
+    // Modloaders such as Forge override this, to also gain access to IForgeRegistry's.
+    public static Function<ResourceKey<?>, Holder<?>> BIND_OVERRIDE = null;
+
     /**
      * Creates a new DeferredHolder targeting the value with the specified name in the specified registry.
      *
@@ -137,6 +142,14 @@ protected Registry<R> getRegistry() {
     protected final void bind(boolean throwOnMissingRegistry) {
         if (this.holder != null) return;
 
+        // Check if we have an override for specific mod loaders
+        if (DeferredHolderCommon.BIND_OVERRIDE != null) {
+            this.holder = (Holder<R>) DeferredHolderCommon.BIND_OVERRIDE.apply(this.key);
+            if (this.holder != null) {
+                return;
+            }
+        }
+
         Registry<R> registry = getRegistry();
         if (registry != null) {
             this.holder = registry.getHolder(this.key).orElse(null);

diff --git a/loader-forge/src/main/java/org/cyclops/cyclopscore/CyclopsCoreForge.java b/loader-forge/src/main/java/org/cyclops/cyclopscore/CyclopsCoreForge.java
@@ -4,9 +4,12 @@
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
+import net.minecraft.core.Holder;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.registries.ForgeRegistry;
+import net.minecraftforge.registries.RegistryManager;
 import org.cyclops.cyclopscore.advancement.criterion.GuiContainerOpenTriggerConfig;
 import org.cyclops.cyclopscore.advancement.criterion.GuiContainerOpenTriggerEventHooksForge;
 import org.cyclops.cyclopscore.advancement.criterion.ItemCraftedTriggerConfig;
@@ -24,6 +27,7 @@
 import org.cyclops.cyclopscore.component.DataComponentCapacityConfig;
 import org.cyclops.cyclopscore.component.DataComponentEnergyStorageConfig;
 import org.cyclops.cyclopscore.config.ConfigHandlerCommon;
+import org.cyclops.cyclopscore.config.DeferredHolderCommon;
 import org.cyclops.cyclopscore.helper.CyclopsCoreInstance;
 import org.cyclops.cyclopscore.init.ModBaseForge;
 import org.cyclops.cyclopscore.inventory.IRegistryInventoryLocation;
@@ -54,6 +58,18 @@ public CyclopsCoreForge() {
         });
 
         getRegistryManager().addRegistry(IRegistryInventoryLocation.class, RegistryInventoryLocation.getInstance());
+
+        // Make DeferredHolderCommon compatible with IForgeRegistry's.
+        DeferredHolderCommon.BIND_OVERRIDE = (key) -> {
+            ForgeRegistry<Object> registry = RegistryManager.ACTIVE.getRegistry(key.registry());
+            if (registry != null) {
+                Object value = registry.getValue(key.location());
+                if (value != null) {
+                    return Holder.direct(value);
+                }
+            }
+            return null;
+        };
     }
 
     @Override