diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleProviderRegistryImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleProviderRegistryImpl.java
index c6a95e31..a520e199 100644
--- a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleProviderRegistryImpl.java
+++ b/forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleProviderRegistryImpl.java
@@ -30,6 +30,7 @@ import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.core.particles.ParticleType;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -38,7 +39,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-@Mod.EventBusSubscriber(modid = ArchitecturyForge.MOD_ID)
+@Mod.EventBusSubscriber(modid = ArchitecturyForge.MOD_ID, value = Dist.CLIENT)
 public class ParticleProviderRegistryImpl {
     private static final class ExtendedSpriteSetImpl implements ParticleProviderRegistry.ExtendedSpriteSet {
         private final ParticleEngine engine;
diff --git a/forge/src/main/resources/architectury.mixins.json b/forge/src/main/resources/architectury.mixins.json
index 4277a9aa..434336c0 100644
--- a/forge/src/main/resources/architectury.mixins.json
+++ b/forge/src/main/resources/architectury.mixins.json
@@ -5,7 +5,9 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.8",
   "client": [
-    "MixinClientLevel"
+    "MixinClientLevel",
+    "ParticleEngineAccessor",
+    "ParticleEngineAccessor$MutableSpriteSetAccessor"
   ],
   "mixins": [
     "BiomeGenerationSettingsBuilderAccessor",
@@ -20,9 +22,7 @@
     "MixinItemExtension",
     "MixinRegistryEntry",
     "MixinWorldEvent",
-    "MobSpawnSettingsBuilderAccessor",
-    "ParticleEngineAccessor",
-    "ParticleEngineAccessor$MutableSpriteSetAccessor"
+    "MobSpawnSettingsBuilderAccessor"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/gradle.properties b/gradle.properties
index b047092e..98035ce3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ supported_version=1.16.4/5
 
 archives_base_name=architectury
 archives_base_name_snapshot=architectury-snapshot
-base_version=1.17
+base_version=1.18
 maven_group=me.shedaniel
 
 fabric_loader_version=0.11.1