Fix reg on fabric

nanite · Dec 9, 2024 · 7eefb66 · 7eefb66
1 parent 946b095
commit 7eefb66
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-### 21.4.0
+### 21.4.1
 
-- Update to Minecraft 1.21.4
+- Fix registration on fabirc
diff --git a/...main/java/com/unrealdinnerbone/trenzalore/api/platform/services/ICreativeTabRegister.java b/...main/java/com/unrealdinnerbone/trenzalore/api/platform/services/ICreativeTabRegister.java
@@ -10,6 +10,9 @@
 
 public interface ICreativeTabRegister {
 
-    @ApiStatus.Internal
     void addItemToCreativeTab(ResourceKey<CreativeModeTab> tabResourceKey, List<Supplier<? extends Item>> item);
+
+    default void addItemToCreativeTab(ResourceKey<CreativeModeTab> tabResourceKey, Supplier<? extends Item> item) {
+        addItemToCreativeTab(tabResourceKey, List.of(item));
+    }
 }
diff --git a/fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java b/fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java
@@ -58,11 +58,12 @@ public void addItemToCreativeTab(ResourceKey<CreativeModeTab> tabResourceKey, Li
     public <T> void registryRegistryObjects(String modId, RegistryObjects<T> registryObjects) {
         ResourceKey<Registry<T>> registryKey = registryObjects.registryKey();
         BuiltInRegistries.REGISTRY.get(registryKey.location()).ifPresentOrElse(registry -> {
-            Registry<T> theRegistry = (Registry<T>) registry;
+            Registry<?> value = registry.value();
+            Registry<T> theRegistry = (Registry<T>) value;
             for (RegistryEntry<? extends T> object : registryObjects.objects()) {
                 ResourceLocation id = RLUtils.rl(modId, object.name());
-                T register = Registry.register(theRegistry, id, object.get());
-                object.setHolder(Holder.direct(register));
+                Holder.Reference<T> register = Registry.registerForHolder(theRegistry, id, object.get());
+                object.setHolder(register);
             }
         }, () -> LOGGER.error("Failed to find registry: {}", registryKey.location()));
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-mod_version=21.4.0
+mod_version=21.4.1
 maven_group=com.unrealdinnerbone
 mod_name=Trenzalore
 mod_author=UnRealDinnerbone