build(modkit): 1.1.1

amblelabs · Feb 12, 2025 · 5bc014b · 5bc014b
1 parent 34f2138
commit 5bc014b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 45 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -24,4 +24,4 @@ modmenu_version = 7.0.1
 multidim_version = v2.0.0
 scheduler_version = main-SNAPSHOT
 queue_version = v1.0.2-1.20
-ablekit_version = v1.1.0-1.20
+ablekit_version = v1.1.1-1.20
diff --git a/src/main/java/dev/amble/ait/AITMod.java b/src/main/java/dev/amble/ait/AITMod.java
@@ -6,7 +6,16 @@
 import java.util.Random;
 import java.util.UUID;
 
+import dev.amble.ait.core.engine.registry.SubSystemRegistry;
+import dev.amble.ait.core.likes.ItemOpinionRegistry;
+import dev.amble.ait.core.lock.LockedDimensionRegistry;
+import dev.amble.ait.core.sounds.flight.FlightSoundRegistry;
+import dev.amble.ait.core.sounds.travel.TravelSoundRegistry;
+import dev.amble.ait.core.tardis.vortex.reference.VortexReferenceRegistry;
+import dev.amble.ait.registry.impl.console.variant.ConsoleVariantRegistry;
+import dev.amble.ait.registry.impl.exterior.ExteriorVariantRegistry;
 import dev.amble.lib.container.RegistryContainer;
+import dev.amble.lib.register.AmbleRegistries;
 import dev.amble.lib.util.ServerLifecycleHooks;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
@@ -157,6 +166,24 @@ public void onInitialize() {
 
         Registry.register(net.minecraft.registry.Registries.FEATURE, CRATER_ID, CRATER);
 
+        AmbleRegistries.getInstance().registerAll(
+                SonicRegistry.getInstance(),
+                DesktopRegistry.getInstance(),
+                ConsoleVariantRegistry.getInstance(),
+                MachineRecipeRegistry.getInstance(),
+                TravelSoundRegistry.getInstance(),
+                FlightSoundRegistry.getInstance(),
+                VortexReferenceRegistry.getInstance(),
+                BlueprintRegistry.getInstance(),
+                ExteriorVariantRegistry.getInstance(),
+                CategoryRegistry.getInstance(),
+                TardisComponentRegistry.getInstance(),
+                LockedDimensionRegistry.getInstance(),
+                HumRegistry.getInstance(),
+                SubSystemRegistry.getInstance(),
+                ItemOpinionRegistry.getInstance()
+        );
+
         CommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess, environment) -> {
             TeleportInteriorCommand.register(dispatcher);
             SummonTardisCommand.register(dispatcher);

diff --git a/src/main/java/dev/amble/ait/client/AITModClient.java b/src/main/java/dev/amble/ait/client/AITModClient.java
@@ -7,6 +7,9 @@
 import java.util.Collection;
 import java.util.UUID;
 
+import dev.amble.ait.registry.impl.console.variant.ClientConsoleVariantRegistry;
+import dev.amble.ait.registry.impl.exterior.ClientExteriorVariantRegistry;
+import dev.amble.lib.register.AmbleRegistries;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -229,6 +232,9 @@ public void onInitializeClient() {
 
         WorldRenderEvents.END.register((context) -> SonicRendering.getInstance().renderWorld(context));
         HudRenderCallback.EVENT.register((context, delta) -> SonicRendering.getInstance().renderGui(context, delta));
+
+        AmbleRegistries.getInstance().registerAll(SonicRegistry.getInstance(), ClientExteriorVariantRegistry.getInstance(), ClientConsoleVariantRegistry.getInstance());
+        sonicModelPredicate();
     }
 
     /**

diff --git a/src/main/java/dev/amble/ait/init/AmbleInitializer.java b/src/main/java/dev/amble/ait/init/AmbleInitializer.java
@@ -1,40 +1,10 @@
 package dev.amble.ait.init;
 
 import dev.amble.lib.api.AmbleKitInitializer;
-import dev.amble.lib.register.api.RegistryEvents;
-
-import dev.amble.ait.core.engine.registry.SubSystemRegistry;
-import dev.amble.ait.core.item.blueprint.BlueprintRegistry;
-import dev.amble.ait.core.likes.ItemOpinionRegistry;
-import dev.amble.ait.core.lock.LockedDimensionRegistry;
-import dev.amble.ait.core.sounds.flight.FlightSoundRegistry;
-import dev.amble.ait.core.sounds.travel.TravelSoundRegistry;
-import dev.amble.ait.core.tardis.vortex.reference.VortexReferenceRegistry;
-import dev.amble.ait.registry.impl.*;
-import dev.amble.ait.registry.impl.console.variant.ConsoleVariantRegistry;
-import dev.amble.ait.registry.impl.exterior.ExteriorVariantRegistry;
 
 public class AmbleInitializer implements AmbleKitInitializer {
     @Override
     public void onInitialize() {
-        RegistryEvents.INIT.register((registries, isClient) -> {
-            if (isClient) return;
 
-            registries.register(SonicRegistry.getInstance());
-            registries.register(DesktopRegistry.getInstance());
-            registries.register(ConsoleVariantRegistry.getInstance());
-            registries.register(MachineRecipeRegistry.getInstance());
-            registries.register(TravelSoundRegistry.getInstance());
-            registries.register(FlightSoundRegistry.getInstance());
-            registries.register(VortexReferenceRegistry.getInstance());
-            registries.register(BlueprintRegistry.getInstance());
-            registries.register(ExteriorVariantRegistry.getInstance());
-            registries.register(CategoryRegistry.getInstance());
-            registries.register(TardisComponentRegistry.getInstance());
-            registries.register(LockedDimensionRegistry.getInstance());
-            registries.register(HumRegistry.getInstance());
-            registries.register(SubSystemRegistry.getInstance());
-            registries.register(ItemOpinionRegistry.getInstance());
-        });
     }
 }
diff --git a/src/main/java/dev/amble/ait/init/client/AmbleClientInitializer.java b/src/main/java/dev/amble/ait/init/client/AmbleClientInitializer.java
@@ -1,24 +1,10 @@
 package dev.amble.ait.init.client;
 
 import dev.amble.lib.api.AmbleKitClientInitializer;
-import dev.amble.lib.register.api.RegistryEvents;
-
-import dev.amble.ait.client.AITModClient;
-import dev.amble.ait.registry.impl.SonicRegistry;
-import dev.amble.ait.registry.impl.console.variant.ClientConsoleVariantRegistry;
-import dev.amble.ait.registry.impl.exterior.ClientExteriorVariantRegistry;
 
 public class AmbleClientInitializer implements AmbleKitClientInitializer {
     @Override
     public void onInitialize() {
-        RegistryEvents.INIT.register((registries, isClient) -> {
-            if (!isClient) return;
-
-            registries.register(SonicRegistry.getInstance(), true);
-            registries.register(ClientExteriorVariantRegistry.getInstance(), true);
-            registries.register(ClientConsoleVariantRegistry.getInstance(), true);
-        });
 
-        AITModClient.sonicModelPredicate();
     }
 }