SpaceWalkerRS · Nov 5, 2026 · Nov 5, 2026 · Nov 5, 2026 · Nov 5, 2026 · Nov 5, 2026
diff --git a/build.gradle b/build.gradle
@@ -400,6 +400,11 @@ def setUpModule(project) {
 			} else if (project.hasProperty('entrypoint_server_init')) {
 				entrypoint 'server-init', project.entrypoint_server_init
 			}
+			if (library.hasProperty('entrypoint_registry_init')) {
+				entrypoint 'registry-init', library.entrypoint_registry_init
+			} else if (project.hasProperty('entrypoint_registry_init')) {
+				entrypoint 'registry-init', project.entrypoint_registry_init
+			}
 
 			if (ctfile.exists()) {
 				accessWidener = ctfile.getName()

diff --git a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/resources/fabric.mod.json b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc1.8.2-pre5-mc15w51b",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init"
     ]
   },

diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/resources/fabric.mod.json b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc13w36a-mc1.8.2-pre4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init"
     ]
   },

diff --git a/libraries/biomes/biomes-mc16w02a-mc18w05a/src/main/resources/fabric.mod.json b/libraries/biomes/biomes-mc16w02a-mc18w05a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc16w02a-mc18w05a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init"
     ]
   },

diff --git a/libraries/biomes/biomes-mc18w06a-mc18w31a/src/main/resources/fabric.mod.json b/libraries/biomes/biomes-mc18w06a-mc18w31a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc18w06a-mc18w31a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init"
     ]
   },

diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/fabric.mod.json b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc18w43a-mc1.14.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init"
     ]
   },

diff --git a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/resources/fabric.mod.json b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mcb1.8-pre1-mc1.6.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init"
     ]
   },

diff --git a/libraries/biomes/gradle.properties b/libraries/biomes/gradle.properties
@@ -3,5 +3,5 @@ library_name = Biomes
 library_description = Biomes API and events.
 library_version = 0.1.0
 
-entrypoint_init = net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init
+entrypoint_registry_init = net.ornithemc.osl.biomes.impl.BiomeRegistryImpl::init
 osl_dependencies = core:0.9.0,entrypoints:0.5.0,registries:0.1.0,localization:0.1.2
diff --git a/...aries/blockentities/blockentities-mc1.13-pre5-mc18w31a/src/main/resources/fabric.mod.json b/...aries/blockentities/blockentities-mc1.13-pre5-mc18w31a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc1.13-pre5-mc18w31a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blockentities.impl.BlockEntityTypeRegistryImpl::init"
     ]
   },

diff --git a/...ies/blockentities/blockentities-mc1.14.1-pre1-mc1.14.4/src/main/resources/fabric.mod.json b/...ies/blockentities/blockentities-mc1.14.1-pre1-mc1.14.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc1.14.1-pre1-mc1.14.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blockentities.impl.BlockEntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/blockentities/blockentities-mc16w32a-mc18w01a/src/main/resources/fabric.mod.json b/libraries/blockentities/blockentities-mc16w32a-mc18w01a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc16w32a-mc18w01a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blockentities.impl.BlockEntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/blockentities/blockentities-mc18w32a-mc1.14/src/main/resources/fabric.mod.json b/libraries/blockentities/blockentities-mc18w32a-mc1.14/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mc18w32a-mc1.14",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blockentities.impl.BlockEntityTypeRegistryImpl::init"
     ]
   },

diff --git a/...aries/blockentities/blockentities-mca1.0.1_01-mc1.10.2/src/main/resources/fabric.mod.json b/...aries/blockentities/blockentities-mca1.0.1_01-mc1.10.2/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.0+mca1.0.1_01-mc1.10.2",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blockentities.impl.BlockEntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/blockentities/gradle.properties b/libraries/blockentities/gradle.properties
@@ -3,5 +3,5 @@ library_name = Block Entities
 library_description = Block Entities API and events.
 library_version = 0.1.0
 
-entrypoint_init = net.ornithemc.osl.blockentities.impl.BlockEntityTypeRegistryImpl::init
+entrypoint_registry_init = net.ornithemc.osl.blockentities.impl.BlockEntityTypeRegistryImpl::init
 osl_dependencies = core:0.9.0,entrypoints:0.5.0,registries:0.2.0
diff --git a/libraries/blocks/blocks-mc13w36a-mc14w26c/src/main/resources/fabric.mod.json b/libraries/blocks/blocks-mc13w36a-mc14w26c/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.0+mc13w36a-mc14w26c",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init"
     ]
   },

diff --git a/libraries/blocks/blocks-mc14w27a-mc15w35a/src/main/resources/fabric.mod.json b/libraries/blocks/blocks-mc14w27a-mc15w35a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.0+mc14w27a-mc15w35a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init"
     ]
   },

diff --git a/libraries/blocks/blocks-mc15w36a-mc17w46a/src/main/resources/fabric.mod.json b/libraries/blocks/blocks-mc15w36a-mc17w46a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.0+mc15w36a-mc17w46a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init"
     ]
   },

diff --git a/libraries/blocks/blocks-mc17w47a-mc18w31a/src/main/resources/fabric.mod.json b/libraries/blocks/blocks-mc17w47a-mc18w31a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.0+mc17w47a-mc18w31a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init"
     ]
   },

diff --git a/libraries/blocks/blocks-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json b/libraries/blocks/blocks-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.0+mc18w32a-mc1.13.2",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init"
     ]
   },

diff --git a/libraries/blocks/blocks-mc18w43a-mc1.14.4/src/main/resources/fabric.mod.json b/libraries/blocks/blocks-mc18w43a-mc1.14.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.0+mc18w43a-mc1.14.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init"
     ]
   },

diff --git a/libraries/blocks/blocks-mca1.0.1_01-mc1.6.4/src/main/resources/fabric.mod.json b/libraries/blocks/blocks-mca1.0.1_01-mc1.6.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.0+mca1.0.1_01-mc1.6.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init"
     ]
   },

diff --git a/libraries/blocks/gradle.properties b/libraries/blocks/gradle.properties
@@ -3,5 +3,5 @@ library_name = Blocks
 library_description = Blocks API and events.
 library_version = 0.3.0
 
-entrypoint_init = net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init
+entrypoint_registry_init = net.ornithemc.osl.blocks.impl.BlockRegistryImpl::init
 osl_dependencies = core:0.10.0,entrypoints:0.5.0,blockstates:0.1.0,registries:0.1.0
diff --git a/libraries/entities/entities-mc1.8.2-pre5-mc1.10.2/src/main/resources/fabric.mod.json b/libraries/entities/entities-mc1.8.2-pre5-mc1.10.2/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.2+mc1.8.2-pre5-mc1.10.2",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/entities/entities-mc12w01a-mc1.8.2-pre4/src/main/resources/fabric.mod.json b/libraries/entities/entities-mc12w01a-mc1.8.2-pre4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.2+mc12w01a-mc1.8.2-pre4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/entities/entities-mc16w32a-mc18w01a/src/main/resources/fabric.mod.json b/libraries/entities/entities-mc16w32a-mc18w01a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.2+mc16w32a-mc18w01a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/entities/entities-mc18w19a-mc18w31a/src/main/resources/fabric.mod.json b/libraries/entities/entities-mc18w19a-mc18w31a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.2+mc18w19a-mc18w31a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/entities/entities-mc18w32a-mc19w04b/src/main/resources/fabric.mod.json b/libraries/entities/entities-mc18w32a-mc19w04b/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.2+mc18w32a-mc19w04b",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/entities/entities-mc19w08a-mc1.14.4/src/main/resources/fabric.mod.json b/libraries/entities/entities-mc19w08a-mc1.14.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.2+mc19w08a-mc1.14.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/entities/entities-mca1.0.1_01-mc11w48a/src/main/resources/fabric.mod.json b/libraries/entities/entities-mca1.0.1_01-mc11w48a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.1.2+mca1.0.1_01-mc11w48a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init"
     ]
   },

diff --git a/libraries/entities/gradle.properties b/libraries/entities/gradle.properties
@@ -3,5 +3,5 @@ library_name = Entities
 library_description = Entities API and events.
 library_version = 0.1.2
 
-entrypoint_init = net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init
+entrypoint_registry_init = net.ornithemc.osl.entities.impl.EntityTypeRegistryImpl::init
 osl_dependencies = core:0.9.0,entrypoints:0.5.0,registries:0.2.0
diff --git a/libraries/items/gradle.properties b/libraries/items/gradle.properties
@@ -3,5 +3,5 @@ library_name = Items
 library_description = Items API and events.
 library_version = 0.3.1
 
-entrypoint_init = net.ornithemc.osl.items.impl.ItemRegistryImpl::init
+entrypoint_registry_init = net.ornithemc.osl.items.impl.ItemRegistryImpl::init
 osl_dependencies = core:0.9.0,entrypoints:0.5.0,registries:0.2.0,blocks:0.3.0
diff --git a/libraries/items/items-mc13w36a-mc14w25b/src/main/resources/fabric.mod.json b/libraries/items/items-mc13w36a-mc14w25b/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.1+mc13w36a-mc14w25b",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.items.impl.ItemRegistryImpl::init"
     ]
   },

diff --git a/libraries/items/items-mc14w26a-mc17w46a/src/main/resources/fabric.mod.json b/libraries/items/items-mc14w26a-mc17w46a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.1+mc14w26a-mc17w46a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.items.impl.ItemRegistryImpl::init"
     ]
   },

diff --git a/libraries/items/items-mc17w47a-mc18w31a/src/main/resources/fabric.mod.json b/libraries/items/items-mc17w47a-mc18w31a/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.1+mc17w47a-mc18w31a",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.items.impl.ItemRegistryImpl::init"
     ]
   },

diff --git a/libraries/items/items-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json b/libraries/items/items-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.1+mc18w32a-mc1.13.2",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.items.impl.ItemRegistryImpl::init"
     ]
   },

diff --git a/libraries/items/items-mc18w43a-mc1.14.4/src/main/resources/fabric.mod.json b/libraries/items/items-mc18w43a-mc1.14.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.1+mc18w43a-mc1.14.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.items.impl.ItemRegistryImpl::init"
     ]
   },

diff --git a/libraries/items/items-mca1.0.1_01-mc1.6.4/src/main/resources/fabric.mod.json b/libraries/items/items-mca1.0.1_01-mc1.6.4/src/main/resources/fabric.mod.json
@@ -4,7 +4,7 @@
   "version": "0.3.1+mca1.0.1_01-mc1.6.4",
   "environment": "*",
   "entrypoints": {
-    "init": [
+    "registry-init": [
       "net.ornithemc.osl.items.impl.ItemRegistryImpl::init"
     ]
   },

diff --git a/libraries/registries/README.md b/libraries/registries/README.md
@@ -22,6 +22,8 @@ Block COOKIE = Registry.register(BlockRegistry.REGISTRY, COOKIE_KEY, new CookieB
 
 ## Creating Registries
 
+Registries should be created in a `RegistryInitializer`. You can define this entrypoint in your `mod.json` with the `registry-init` key.
+
 Just like with other resources, you must create a `ResourceKey` that uniquely identifies your registry. The `RegistryKeys` class provides some factory methods for creating resource keys for registries.
 
 ```java
@@ -74,12 +76,12 @@ public class CookieRecipes {
 ```java
 package com.example;
 
-import net.ornithemc.osl.entrypoints.api.ModInitializer;
+import net.ornithemc.osl.registries.api.RegistryInitializer;
 
-public class ExampleInitializer implements ModInitializer {
+public class ExampleInitializer implements RegistryInitializer {
 
 	@Override
-	public void init() {
+	public void initRegistries() {
 		ExampleRegistries.init();
 	}
 }

diff --git a/libraries/registries/build.gradle b/libraries/registries/build.gradle
@@ -1,5 +1,6 @@
 setUpLibrary(project)
 
 dependencies {
-	implementation 'it.unimi.dsi:fastutil:8.5.9'
+	compileOnly 'it.unimi.dsi:fastutil:8.5.9'
+	compileOnly 'com.google.guava:guava:17.0'
 }
diff --git a/...egistries-mc12w18a-mc1.6.4/src/main/java/net/ornithemc/osl/registries/impl/Bootstrap.java b/...egistries-mc12w18a-mc1.6.4/src/main/java/net/ornithemc/osl/registries/impl/Bootstrap.java
@@ -11,6 +11,8 @@ public static void init() {
 		if (!initialized) {
 			initialized = true;
 
+			RegistryEntrypoints.invoke();
+
 			RegistriesImpl.init();
 			SyncedRegistriesImpl.init();
 		}

diff --git a/...mc14w26c/src/main/java/net/ornithemc/osl/registries/impl/mixin/common/BootstrapMixin.java b/...mc14w26c/src/main/java/net/ornithemc/osl/registries/impl/mixin/common/BootstrapMixin.java
@@ -8,6 +8,7 @@
 
 import net.minecraft.Bootstrap;
 
+import net.ornithemc.osl.registries.impl.RegistryEntrypoints;
 import net.ornithemc.osl.registries.impl.registry.RegistriesImpl;
 import net.ornithemc.osl.registries.impl.registry.SyncedRegistriesImpl;
 
@@ -21,6 +22,10 @@ public class BootstrapMixin {
 	private static void osl$registries$initAndLockRegistries(Operation<Void> op) {
 		boolean wasInitialized = initialized;
 
+		if (!wasInitialized) {
+			RegistryEntrypoints.invoke();
+		}
+
 		// we could skip the call if initialized is already true
 		// but let's not mess with the bootstrap too much, eh
 		op.call();