diff --git a/gradle.properties b/gradle.properties
index e0e3aef0..c43bdde4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings=6
 loader_version=0.11.3
 
 # Mod Properties
-mod_version = 0.1.37
+mod_version = 0.1.38
 maven_group = ru.bclib
 archives_base_name = bclib
 
diff --git a/src/main/java/ru/bclib/client/BCLibClient.java b/src/main/java/ru/bclib/client/BCLibClient.java
index 9bbb977c..5b6249d6 100644
--- a/src/main/java/ru/bclib/client/BCLibClient.java
+++ b/src/main/java/ru/bclib/client/BCLibClient.java
@@ -4,6 +4,7 @@ import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.Registry;
+import ru.bclib.api.ModIntegrationAPI;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.registry.BaseBlockEntityRenders;
@@ -11,6 +12,7 @@ import ru.bclib.registry.BaseBlockEntityRenders;
 public class BCLibClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
+		ModIntegrationAPI.registerAll();
 		BaseBlockEntityRenders.register();
 		registerRenderLayers();
 	}
diff --git a/src/main/java/ru/bclib/mixin/common/EntrypointServerMixin.java b/src/main/java/ru/bclib/mixin/common/EntrypointServerMixin.java
deleted file mode 100644
index fb570e48..00000000
--- a/src/main/java/ru/bclib/mixin/common/EntrypointServerMixin.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ru.bclib.mixin.common;
-
-import java.io.File;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.fabricmc.loader.entrypoint.minecraft.hooks.EntrypointServer;
-import ru.bclib.api.ModIntegrationAPI;
-
-@Mixin(value = EntrypointServer.class, remap = false)
-public class EntrypointServerMixin {
-	@Inject(method = "start", at = @At(value = "TAIL"))
-	private static void start(File runDir, Object gameInstance, CallbackInfo info) {
-		ModIntegrationAPI.registerAll();
-	}
-}
diff --git a/src/main/java/ru/bclib/registry/ItemsRegistry.java b/src/main/java/ru/bclib/registry/ItemsRegistry.java
index 8d2c6def..57d884bf 100644
--- a/src/main/java/ru/bclib/registry/ItemsRegistry.java
+++ b/src/main/java/ru/bclib/registry/ItemsRegistry.java
@@ -19,9 +19,9 @@ import net.minecraft.world.item.SpawnEggItem;
 import net.minecraft.world.item.SwordItem;
 import net.minecraft.world.item.TieredItem;
 import net.minecraft.world.level.block.DispenserBlock;
+import ru.bclib.items.BaseDiscItem;
 import ru.bclib.items.BaseDrinkItem;
 import ru.bclib.items.BaseSpawnEggItem;
-import ru.bclib.items.BaseDiscItem;
 import ru.bclib.items.ModelProviderItem;
 import ru.bclib.items.tool.BaseAxeItem;
 import ru.bclib.items.tool.BaseHoeItem;
diff --git a/src/main/java/ru/bclib/server/BCLibServer.java b/src/main/java/ru/bclib/server/BCLibServer.java
new file mode 100644
index 00000000..2fbc8c0b
--- /dev/null
+++ b/src/main/java/ru/bclib/server/BCLibServer.java
@@ -0,0 +1,11 @@
+package ru.bclib.server;
+
+import net.fabricmc.api.DedicatedServerModInitializer;
+import ru.bclib.api.ModIntegrationAPI;
+
+public class BCLibServer implements DedicatedServerModInitializer {
+	@Override
+	public void onInitializeServer() {
+		ModIntegrationAPI.registerAll();
+	}
+}
diff --git a/src/main/resources/bclib.mixins.common.json b/src/main/resources/bclib.mixins.common.json
index b99fbde0..20e03d8d 100644
--- a/src/main/resources/bclib.mixins.common.json
+++ b/src/main/resources/bclib.mixins.common.json
@@ -5,7 +5,6 @@
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 		"ComposterBlockAccessor",
-		"EntrypointServerMixin",
 		"PotionBrewingAccessor",
 		"RecipeManagerAccessor",
 		"EnchantmentMenuMixin",
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0cf6dd3d..d4c9f8f1 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -25,6 +25,9 @@
 		],
 		"client": [
 			"ru.bclib.client.BCLibClient"
+		],
+		"server": [
+			"ru.bclib.server.BCLibServer"
 		]
 	},
 	"mixins": [