✨ Added ability to create custom registrars

Ultreon · Jan 24, 2025 · 06d6c22 · 06d6c22
1 parent 28d6bcc
commit 06d6c22
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 3 deletions.
diff --git a/common/src/main/java/dev/ultreon/mods/xinexlib/registrar/RegistrarManager.java b/common/src/main/java/dev/ultreon/mods/xinexlib/registrar/RegistrarManager.java
@@ -13,4 +13,12 @@ public interface RegistrarManager {
     /// @param key The key of the registry
     /// @return The registrar
     <T> Registrar<T> getRegistrar(ResourceKey<Registry<T>> key);
+
+    /// Creates a new registrar for the given class and resource key
+    ///
+    /// @param key The key to use for the registry
+    /// @param clazz The class which represents the type of the registry
+    /// @return The built registrar
+    <T> Registrar<T> createRegistrar(ResourceKey<Registry<T>> key, Class<T> clazz);
+
 }
diff --git a/fabric/src/main/java/dev/ultreon/mods/xinexlib/registrar/FabricRegistrar.java b/fabric/src/main/java/dev/ultreon/mods/xinexlib/registrar/FabricRegistrar.java
@@ -1,5 +1,7 @@
 package dev.ultreon.mods.xinexlib.registrar;
 
+import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
+import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
@@ -14,14 +16,13 @@
 public class FabricRegistrar<T> implements Registrar<T> {
     private final ResourceKey<Registry<T>> key;
     private final String modId;
-    private final Registry<T> registry;
+    private Registry<T> registry;
     private final List<RegistrySupplier<?, T>> suppliers = new ArrayList<>();
 
     @SuppressWarnings("unchecked")
     public FabricRegistrar(ResourceKey<Registry<T>> key, String modId) {
         this.key = key;
         this.modId = modId;
-        this.registry = BuiltInRegistries.REGISTRY.get((ResourceKey) key);
     }
 
     @Override
@@ -59,4 +60,14 @@ public Registry<T> registry() {
     public @NotNull Iterator<RegistrySupplier<?, T>> iterator() {
         return suppliers.iterator();
     }
+
+    public Registrar<T> create() {
+        this.registry = FabricRegistryBuilder.createSimple(key).attribute(RegistryAttribute.MODDED).buildAndRegister();
+        return this;
+    }
+
+    public Registrar<T> retrieve() {
+        this.registry = BuiltInRegistries.REGISTRY.get((ResourceKey) key);
+        return this;
+    }
 }
diff --git a/fabric/src/main/java/dev/ultreon/mods/xinexlib/registrar/FabricRegistrarManager.java b/fabric/src/main/java/dev/ultreon/mods/xinexlib/registrar/FabricRegistrarManager.java
@@ -12,6 +12,11 @@ public FabricRegistrarManager(String modId) {
 
     @Override
     public <T> Registrar<T> getRegistrar(ResourceKey<Registry<T>> key) {
-        return new FabricRegistrar<>(key, modId);
+        return new FabricRegistrar<>(key, modId).retrieve();
+    }
+
+    @Override
+    public <T> Registrar<T> createRegistrar(ResourceKey<Registry<T>> key, Class<T> clazz) {
+        return new FabricRegistrar<>(key, modId).create();
     }
 }
diff --git a/forge/src/main/java/dev/ultreon/mods/xinexlib/registrar/ForgeRegistrar.java b/forge/src/main/java/dev/ultreon/mods/xinexlib/registrar/ForgeRegistrar.java
@@ -6,6 +6,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.RegistryBuilder;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -57,4 +58,16 @@ public Registry<T> registry() {
     public @NotNull Iterator<RegistrySupplier<?, T>> iterator() {
         return registryObjects.iterator();
     }
+
+    public void create() {
+        deferredRegister.makeRegistry(ForgeRegistrar::builder);
+    }
+
+    public void createDefault(Supplier<T> fallback) {
+        deferredRegister.makeRegistry(() -> ForgeRegistrar.<T>builder().missing((key, isNetwork) -> fallback.get()));
+    }
+
+    private static <T> RegistryBuilder<T> builder() {
+        return new RegistryBuilder<T>().disableOverrides().allowModification();
+    }
 }
diff --git a/forge/src/main/java/dev/ultreon/mods/xinexlib/registrar/ForgeRegistrarManager.java b/forge/src/main/java/dev/ultreon/mods/xinexlib/registrar/ForgeRegistrarManager.java
@@ -19,4 +19,12 @@ public ForgeRegistrarManager(String modId) {
     public <T> Registrar<T> getRegistrar(ResourceKey<Registry<T>> key) {
         return new ForgeRegistrar<>(DeferredRegister.create(key, modId), modEventBus, modId);
     }
+
+    @Override
+    public <T> Registrar<T> createRegistrar(ResourceKey<Registry<T>> key, Class<T> clazz) {
+        ForgeRegistrar<T> registrar = new ForgeRegistrar<>(DeferredRegister.create(key, modId), modEventBus, modId);
+        registrar.create();
+        return registrar;
+    }
+
 }
diff --git a/neoforge/src/main/java/dev/ultreon/mods/xinexlib/registrar/NeoForgeRegistrar.java b/neoforge/src/main/java/dev/ultreon/mods/xinexlib/registrar/NeoForgeRegistrar.java
@@ -4,6 +4,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.registries.DeferredRegister;
+import net.neoforged.neoforge.registries.RegistryBuilder;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -45,4 +46,9 @@ public Registry<T> registry() {
     public @NotNull Iterator<RegistrySupplier<?, T>> iterator() {
         return this.values.iterator();
     }
+
+    public NeoForgeRegistrar<T> create() {
+        this.deferredRegister.makeRegistry(RegistryBuilder::create);
+        return this;
+    }
 }
diff --git a/neoforge/src/main/java/dev/ultreon/mods/xinexlib/registrar/NeoForgeRegistrarManager.java b/neoforge/src/main/java/dev/ultreon/mods/xinexlib/registrar/NeoForgeRegistrarManager.java
@@ -18,4 +18,9 @@ public NeoForgeRegistrarManager(String modId, IEventBus modEventBus) {
     public <T> Registrar<T> getRegistrar(ResourceKey<Registry<T>> key) {
         return new NeoForgeRegistrar<>(DeferredRegister.create(key, modId), modEventBus);
     }
+
+    @Override
+    public <T> Registrar<T> createRegistrar(ResourceKey<Registry<T>> key, Class<T> clazz) {
+        return new NeoForgeRegistrar<>(DeferredRegister.create(key, modId), modEventBus).create();
+    }
 }