diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml
index 3a0687c12..472fc16a6 100644
--- a/.checkstyle/checkstyle.xml
+++ b/.checkstyle/checkstyle.xml
@@ -19,9 +19,14 @@
 <module name="Checker">
     <property name="charset" value="UTF-8"/>
 
-    <property name="severity" value="warning"/>
+    <property name="severity" value="error"/>
 
     <property name="fileExtensions" value="java, properties, xml"/>
+
+    <!-- VS CUSTOM RULES -->
+    <module name="NewlineAtEndOfFile"/>
+    <!-- END VS CUSTOM RULES -->
+
     <!-- Excludes all 'module-info.java' files              -->
     <!-- See https://checkstyle.org/config_filefilters.html -->
     <module name="BeforeExecutionExclusionFileFilter">
@@ -48,6 +53,12 @@
     </module>
 
     <module name="TreeWalker">
+        <!-- VS CUSTOM RULES -->
+        <module name="FinalLocalVariable">
+            <property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
+            <property name="validateEnhancedForLoopVariable" value="true"/>
+        </module>
+        <!-- END VS CUSTOM RULES -->
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
             <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
diff --git a/.editorconfig b/.editorconfig
index eda1d4348..ed0f1111a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,5 @@
 [*]
-insert_final_newline = true
+insert_final_newline=true
 
 [*.{kt,kts,java}]
 indent_size=4
diff --git a/.gitignore b/.gitignore
index e8f81fb11..31e176a4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,8 +18,8 @@ out
 !.idea/codeStyles/
 # inspection profile
 !.idea/inspectionProfiles/
-# checkstyle config
-!.idea/checkstyle-idea.xml
+# saveactions config
+!.idea/saveactions_settings.xml
 # recommended plugins
 !.idea/externalDependencies.xml
 
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
deleted file mode 100644
index a5b445612..000000000
--- a/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="active-configuration" value="PROJECT_RELATIVE:$PROJECT_DIR$/.checkstyle/checkstyle.xml:Valkyrien Skies" />
-        <entry key="checkstyle-version" value="8.40" />
-        <entry key="copy-libs" value="true" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="location-2" value="PROJECT_RELATIVE:$PROJECT_DIR$/.checkstyle/checkstyle.xml:Valkyrien Skies" />
-        <entry key="property-2.org.checkstyle.google.suppressionfilter.config" value="" />
-        <entry key="property-2.org.checkstyle.google.suppressionxpathfilter.config" value="" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="JavaOnly" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 5142cbc17..acbcca3ad 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -32,6 +32,7 @@
     </codeStyleSettings>
     <codeStyleSettings language="EditorConfig">
       <option name="SPACE_AROUND_ASSIGNMENT_OPERATORS" value="false" />
+      <option name="SPACE_AFTER_COMMA" value="false" />
     </codeStyleSettings>
     <codeStyleSettings language="Groovy">
       <indentOptions>
@@ -77,6 +78,8 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
index bfc82139a..ae2ff77ca 100644
--- a/.idea/externalDependencies.xml
+++ b/.idea/externalDependencies.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalDependencies">
-    <plugin id="CheckStyle-IDEA" />
     <plugin id="com.demonwav.minecraft-dev" />
+    <plugin id="com.dubreuia" />
     <plugin id="org.jetbrains.kotlin" />
     <plugin id="org.toml.lang" />
   </component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 8f8648a47..009d50572 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,7 +2,12 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="KotlinUnusedImport" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="REPORT_VARIABLES" value="true" />
+      <option name="REPORT_PARAMETERS" value="true" />
+    </inspection_tool>
     <inspection_tool class="MultipleVariablesInDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="OnDemandImport" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="UNUSED_IMPORT" enabled="true" level="ERROR" enabled_by_default="true" />
   </profile>
diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml
new file mode 100644
index 000000000..23f60c853
--- /dev/null
+++ b/.idea/saveactions_settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SaveActionSettings">
+    <option name="actions">
+      <set>
+        <option value="activate" />
+        <option value="activateOnBatch" />
+        <option value="noActionIfCompileErrors" />
+        <option value="organizeImports" />
+        <option value="reformat" />
+        <option value="localCanBeFinal" />
+        <option value="localCanBeFinalExceptImplicit" />
+        <option value="useBlocks" />
+        <option value="explicitTypeCanBeDiamond" />
+      </set>
+    </option>
+    <option name="configurationPath" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index f523ade1c..2603f63ed 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # Physics-and-Ships
+
 Valkyrien Skies remake part 3
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/accessors/client/render/WorldRendererChunkInfoAccessor.java b/common/src/main/java/org/valkyrienskies/mod/mixin/accessors/client/render/WorldRendererChunkInfoAccessor.java
index e6ae0bf23..16a7f1bb4 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/accessors/client/render/WorldRendererChunkInfoAccessor.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/accessors/client/render/WorldRendererChunkInfoAccessor.java
@@ -24,8 +24,8 @@ public interface WorldRendererChunkInfoAccessor {
      * <p>The easy fix for this problem is to use a wildcard target.
      */
     @Invoker(value = "<init>")
-    static WorldRenderer.ChunkInfo vs$new(WorldRenderer worldRenderer, ChunkBuilder.BuiltChunk chunk,
-        @Nullable Direction direction, int propagationLevel) {
+    static WorldRenderer.ChunkInfo vs$new(final WorldRenderer worldRenderer, final ChunkBuilder.BuiltChunk chunk,
+        @Nullable final Direction direction, final int propagationLevel) {
         throw new AssertionError("MixinWorldRendererChunkInfo failed to apply");
     }
 }
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/block/MixinBlock.java b/common/src/main/java/org/valkyrienskies/mod/mixin/block/MixinBlock.java
new file mode 100644
index 000000000..fb1545eaf
--- /dev/null
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/block/MixinBlock.java
@@ -0,0 +1,52 @@
+package org.valkyrienskies.mod.mixin.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.joml.Vector3d;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.valkyrienskies.core.game.ships.ShipData;
+import org.valkyrienskies.mod.common.VSGameUtilsKt;
+
+@Mixin(Block.class)
+public class MixinBlock {
+
+    /**
+     * Ensure that items drop in the world and not in the shipyard.
+     */
+    @Redirect(
+        method = "dropStack",
+        at = @At(
+            value = "NEW",
+            target = "net/minecraft/entity/ItemEntity",
+            ordinal = 0
+        )
+    )
+    private static ItemEntity moveItemDrops(
+        // Constructor arguments
+        final World world, final double x, final double y, final double z, final ItemStack stack,
+        // dropStack arguments
+        final World ignore, final BlockPos pos, final ItemStack ignore2
+    ) {
+        final ShipData ship = VSGameUtilsKt.getShipManagingPos(world, pos);
+        if (ship == null) {
+            // Vanilla behaviour
+            return new ItemEntity(world, x, y, z, stack);
+        }
+
+        // Extract random offset
+        final double dx = x - pos.getX();
+        final double dy = y - pos.getY();
+        final double dz = z - pos.getZ();
+
+        // Real position of item drop in world
+        final Vector3d p = VSGameUtilsKt.toWorldCoordinates(ship, pos);
+
+        return new ItemEntity(world, p.x + dx, p.y + dy, p.z + dz, stack);
+    }
+
+}
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/particle/ParticleMixin.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/particle/ParticleMixin.java
new file mode 100644
index 000000000..39dfe80fa
--- /dev/null
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/client/particle/ParticleMixin.java
@@ -0,0 +1,81 @@
+package org.valkyrienskies.mod.mixin.client.particle;
+
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.world.ClientWorld;
+import org.joml.Matrix4dc;
+import org.joml.Vector3d;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.valkyrienskies.core.game.ships.ShipObject;
+import org.valkyrienskies.mod.common.VSGameUtilsKt;
+
+@Mixin(Particle.class)
+public abstract class ParticleMixin {
+
+    @Shadow
+    public abstract void setPos(double x, double y, double z);
+
+    @Shadow
+    protected double velocityX;
+
+    @Shadow
+    protected double velocityY;
+
+    @Shadow
+    protected double velocityZ;
+
+    /**
+     * See also {@link org.valkyrienskies.mod.mixin.client.render.MixinWorldRenderer}
+     */
+    @Inject(
+        method = "Lnet/minecraft/client/particle/Particle;<init>(Lnet/minecraft/client/world/ClientWorld;DDD)V",
+        at = @At("TAIL")
+    )
+    public void checkShipCoords(final ClientWorld world, final double x, final double y, final double z,
+        final CallbackInfo ci) {
+        final ShipObject ship = VSGameUtilsKt.getShipObjectManagingPos(world, (int) x >> 4, (int) z >> 4);
+        if (ship == null) {
+            return;
+        }
+
+        // in-world position
+        final Vector3d p = ship.getRenderTransform().getShipToWorldMatrix().transformPosition(new Vector3d(x, y, z));
+        this.setPos(p.x, p.y, p.z);
+    }
+
+    /**
+     * See also {@link org.valkyrienskies.mod.mixin.client.render.MixinWorldRenderer}
+     */
+    @Inject(
+        method = "Lnet/minecraft/client/particle/Particle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDD)V",
+        at = @At("TAIL")
+    )
+    public void checkShipPosAndVelocity(final ClientWorld world, final double x, final double y, final double z,
+        final double velocityX,
+        final double velocityY, final double velocityZ, final CallbackInfo ci) {
+
+        final ShipObject ship = VSGameUtilsKt.getShipObjectManagingPos(world, (int) x >> 4, (int) z >> 4);
+        if (ship == null) {
+            return;
+        }
+
+        final Matrix4dc transform = ship.getRenderTransform().getShipToWorldMatrix();
+        // in-world position
+        final Vector3d p = transform.transformPosition(new Vector3d(x, y, z));
+        // in-world velocity
+        final Vector3d v = transform
+            // Rotate velocity wrt ship transform
+            .transformDirection(new Vector3d(this.velocityX, this.velocityY, this.velocityZ))
+            // Tack on the ships linear velocity (no angular velocity param unfortunately)
+            .add(ship.getShipData().getPhysicsData().getLinearVelocity());
+
+        this.setPos(p.x, p.y, p.z);
+        this.velocityX = v.x;
+        this.velocityY = v.y;
+        this.velocityZ = v.z;
+    }
+
+}
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinBuiltChunkStorage.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinBuiltChunkStorage.java
index 77029de79..d922cf801 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinBuiltChunkStorage.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinBuiltChunkStorage.java
@@ -40,8 +40,9 @@ public class MixinBuiltChunkStorage {
      * This mixin stores the [chunkBuilder] object from the constructor. It is used to create new render chunks.
      */
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void postInit(ChunkBuilder chunkBuilder, World world, int viewDistance, WorldRenderer worldRenderer,
-        CallbackInfo callbackInfo) {
+    private void postInit(final ChunkBuilder chunkBuilder, final World world, final int viewDistance,
+        final WorldRenderer worldRenderer, final CallbackInfo callbackInfo) {
+
         this.vs$chunkBuilder = chunkBuilder;
     }
 
@@ -49,7 +50,9 @@ private void postInit(ChunkBuilder chunkBuilder, World world, int viewDistance,
      * This mixin creates render chunks for ship chunks.
      */
     @Inject(method = "scheduleRebuild", at = @At("HEAD"), cancellable = true)
-    private void preScheduleRebuild(int x, int y, int z, boolean important, CallbackInfo callbackInfo) {
+    private void preScheduleRebuild(final int x, final int y, final int z, final boolean important,
+        final CallbackInfo callbackInfo) {
+
         if (y < 0 || y >= sizeY) {
             return; // Weird, but just ignore it
         }
@@ -74,8 +77,8 @@ private void preScheduleRebuild(int x, int y, int z, boolean important, Callback
      * This mixin allows {@link BuiltChunkStorage} to return the render chunks for ships.
      */
     @Inject(method = "getRenderedChunk", at = @At("HEAD"), cancellable = true)
-    private void preGetRenderedChunk(BlockPos pos,
-        CallbackInfoReturnable<ChunkBuilder.BuiltChunk> callbackInfoReturnable) {
+    private void preGetRenderedChunk(final BlockPos pos,
+        final CallbackInfoReturnable<ChunkBuilder.BuiltChunk> callbackInfoReturnable) {
         final int chunkX = MathHelper.floorDiv(pos.getX(), 16);
         final int chunkY = MathHelper.floorDiv(pos.getY(), 16);
         final int chunkZ = MathHelper.floorDiv(pos.getZ(), 16);
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinWorldRenderer.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinWorldRenderer.java
index d1b007dd0..0e1689a8b 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinWorldRenderer.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/MixinWorldRenderer.java
@@ -6,6 +6,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.VertexBuffer;
+import net.minecraft.client.particle.Particle;
 import net.minecraft.client.render.BufferBuilderStorage;
 import net.minecraft.client.render.BuiltChunkStorage;
 import net.minecraft.client.render.Camera;
@@ -21,13 +22,16 @@
 import net.minecraft.client.render.chunk.ChunkBuilder;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.particle.ParticleEffect;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Matrix3f;
 import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.BlockRenderView;
+import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4d;
 import org.joml.Matrix4dc;
+import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -38,6 +42,7 @@
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import org.valkyrienskies.core.game.ships.ShipObject;
 import org.valkyrienskies.core.game.ships.ShipTransform;
@@ -52,7 +57,7 @@
  * This mixin allows {@link WorldRenderer} to render ship chunks.
  */
 @Mixin(WorldRenderer.class)
-public class MixinWorldRenderer {
+public abstract class MixinWorldRenderer {
 
     @Shadow
     @Final
@@ -68,6 +73,51 @@ public class MixinWorldRenderer {
     @Final
     private BufferBuilderStorage bufferBuilders;
 
+    @Shadow
+    @Nullable
+    protected abstract Particle spawnParticle(ParticleEffect parameters, boolean alwaysSpawn, boolean canSpawnOnMinimal,
+        double x,
+        double y, double z, double velocityX, double velocityY, double velocityZ);
+
+    /**
+     * Render particles in-world. The {@link org.valkyrienskies.mod.mixin.client.particle.ParticleMixin} is not
+     * sufficient because this method includes a distance check, but this mixin is also not sufficient because not every
+     * particle is spawned using this method.
+     */
+    @Inject(
+        method = "spawnParticle(Lnet/minecraft/particle/ParticleEffect;ZZDDDDDD)Lnet/minecraft/client/particle/Particle;",
+        at = @At("HEAD"),
+        cancellable = true
+    )
+    private void spawnParticleInWorld(final ParticleEffect parameters, final boolean alwaysSpawn,
+        final boolean canSpawnOnMinimal,
+        final double x, final double y, final double z, final double velocityX, final double velocityY,
+        final double velocityZ,
+        final CallbackInfoReturnable<Particle> cir
+    ) {
+        final ShipObject ship = VSGameUtilsKt.getShipObjectManagingPos(world, (int) x >> 4, (int) z >> 4);
+
+        if (ship == null) {
+            // vanilla behaviour
+            return;
+        }
+
+        final Matrix4dc transform = ship.getRenderTransform().getShipToWorldMatrix();
+        // in-world position
+        final Vector3d p = transform.transformPosition(new Vector3d(x, y, z));
+
+        // in-world velocity
+        final Vector3d v = transform
+            // Rotate velocity wrt ship transform
+            .transformDirection(new Vector3d(velocityX, velocityY, velocityZ))
+            // Tack on the ships linear velocity (no angular velocity param unfortunately)
+            .add(ship.getShipData().getPhysicsData().getLinearVelocity());
+
+        // Return and re-call this method with new coords
+        cir.setReturnValue(spawnParticle(parameters, alwaysSpawn, canSpawnOnMinimal, p.x, p.y, p.z, v.x, v.y, v.z));
+        cir.cancel();
+    }
+
     /**
      * This mixin tells the {@link WorldRenderer} to render ship chunks.
      */
@@ -78,12 +128,13 @@ public class MixinWorldRenderer {
             target = "Lit/unimi/dsi/fastutil/objects/ObjectList;iterator()Lit/unimi/dsi/fastutil/objects/ObjectListIterator;"
         )
     )
-    private void addShipVisibleChunks(Camera camera, Frustum frustum, boolean hasForcedFrustum, int frame,
-        boolean spectator, CallbackInfo ci) {
+    private void addShipVisibleChunks(
+        final Camera camera, final Frustum frustum, final boolean hasForcedFrustum, final int frame,
+        final boolean spectator, final CallbackInfo ci) {
         final WorldRenderer self = WorldRenderer.class.cast(this);
         final BlockPos.Mutable tempPos = new BlockPos.Mutable();
         final BuiltChunkStorageAccessor chunkStorageAccessor = (BuiltChunkStorageAccessor) chunks;
-        for (ShipObject shipObject : VSGameUtilsKt.getShipObjectWorld(world).getUuidToShipObjectMap().values()) {
+        for (final ShipObject shipObject : VSGameUtilsKt.getShipObjectWorld(world).getUuidToShipObjectMap().values()) {
             shipObject.getShipData().getShipActiveChunksSet().iterateChunkPos((x, z) -> {
                 for (int y = 0; y < 16; y++) {
                     tempPos.set(x << 4, y << 4, z << 4);
@@ -108,7 +159,7 @@ private void addShipVisibleChunks(Camera camera, Frustum frustum, boolean hasFor
             doubleValue = 1024,
             ordinal = 0
         ))
-    private double disableBlockDamageDistanceCheck(double originalBlockDamageDistanceConstant) {
+    private double disableBlockDamageDistanceCheck(final double originalBlockDamageDistanceConstant) {
         return Double.MAX_VALUE;
     }
 
@@ -117,11 +168,14 @@ private double disableBlockDamageDistanceCheck(double originalBlockDamageDistanc
      */
     @Redirect(method = "render", at = @At(value = "INVOKE",
         target = "Lnet/minecraft/client/render/block/BlockRenderManager;renderDamage(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;)V"))
-    private void renderBlockDamage(BlockRenderManager blockRenderManager, BlockState state, BlockPos blockPos,
-        BlockRenderView blockRenderWorld, MatrixStack matrix, VertexConsumer vertexConsumer,
-        MatrixStack matrixStack, float methodTickDelta, long methodLimitTime, boolean methodRenderBlockOutline,
-        Camera methodCamera, GameRenderer methodGameRenderer, LightmapTextureManager methodLightmapTextureManager,
-        Matrix4f methodMatrix4f) {
+    private void renderBlockDamage(final BlockRenderManager blockRenderManager, final BlockState state,
+        final BlockPos blockPos,
+        final BlockRenderView blockRenderWorld, final MatrixStack matrix, final VertexConsumer vertexConsumer,
+        final MatrixStack matrixStack, final float methodTickDelta, final long methodLimitTime,
+        final boolean methodRenderBlockOutline,
+        final Camera methodCamera, final GameRenderer methodGameRenderer,
+        final LightmapTextureManager methodLightmapTextureManager,
+        final Matrix4f methodMatrix4f) {
         final ShipObject ship = VSGameUtils.getShipObjectManagingPos(world, blockPos);
         if (ship != null) {
             // Remove the vanilla render transform
@@ -144,7 +198,8 @@ private void renderBlockDamage(BlockRenderManager blockRenderManager, BlockState
             VectorConversionsMCKt
                 .multiply(matrixStack, renderMatrix, renderTransform.getShipCoordinatesToWorldCoordinatesRotation());
 
-            // Then update the matrices in vertexConsumer (I'm guessing vertexConsumer is responsible for mapping textures, so we need to update its matrices otherwise the block damage texture looks wrong)
+            // Then update the matrices in vertexConsumer (I'm guessing vertexConsumer is responsible for mapping
+            // textures, so we need to update its matrices otherwise the block damage texture looks wrong)
             final OverlayVertexConsumerAccessor vertexConsumerAccessor = (OverlayVertexConsumerAccessor) vertexConsumer;
 
             final Matrix3f newNormalMatrix = matrixStack.peek().getNormal().copy();
@@ -173,10 +228,11 @@ private void renderBlockDamage(BlockRenderManager blockRenderManager, BlockState
     @Inject(method = "renderLayer",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gl/VertexBuffer;bind()V"),
         locals = LocalCapture.CAPTURE_FAILHARD)
-    private void renderShipChunk(RenderLayer renderLayer, MatrixStack matrixStack, double playerCameraX,
-        double playerCameraY, double playerCameraZ, CallbackInfo ci,
-        boolean bl, ObjectListIterator<?> objectListIterator, WorldRenderer.ChunkInfo chunkInfo2,
-        ChunkBuilder.BuiltChunk builtChunk, VertexBuffer vertexBuffer) {
+    private void renderShipChunk(final RenderLayer renderLayer, final MatrixStack matrixStack,
+        final double playerCameraX,
+        final double playerCameraY, final double playerCameraZ, final CallbackInfo ci,
+        final boolean bl, final ObjectListIterator<?> objectListIterator, final WorldRenderer.ChunkInfo chunkInfo2,
+        final ChunkBuilder.BuiltChunk builtChunk, final VertexBuffer vertexBuffer) {
         final BlockPos renderChunkOrigin = builtChunk.getOrigin();
         final ShipObject shipObject = VSGameUtils.getShipObjectManagingPos(world, renderChunkOrigin);
         if (shipObject != null) {
@@ -194,7 +250,7 @@ private void renderShipChunk(RenderLayer renderLayer, MatrixStack matrixStack, d
      */
     @Redirect(method = "renderLayer",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(DDD)V"))
-    private void cancelDefaultTransform(MatrixStack matrixStack, double x, double y, double z) {
+    private void cancelDefaultTransform(final MatrixStack matrixStack, final double x, final double y, final double z) {
         // Do nothing
     }
 
@@ -203,11 +259,14 @@ private void cancelDefaultTransform(MatrixStack matrixStack, double x, double y,
      */
     @Redirect(method = "render", at = @At(value = "INVOKE",
         target = "Lnet/minecraft/client/render/block/entity/BlockEntityRenderDispatcher;render(Lnet/minecraft/block/entity/BlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;)V"))
-    private void renderShipChunkBlockEntity(BlockEntityRenderDispatcher blockEntityRenderDispatcher,
-        BlockEntity blockEntity, float tickDelta, MatrixStack matrix, VertexConsumerProvider vertexConsumerProvider,
-        MatrixStack methodMatrices, float methodTickDelta, long methodLimitTime, boolean methodRenderBlockOutline,
-        Camera methodCamera, GameRenderer methodGameRenderer, LightmapTextureManager methodLightmapTextureManager,
-        Matrix4f methodMatrix4f) {
+    private void renderShipChunkBlockEntity(final BlockEntityRenderDispatcher blockEntityRenderDispatcher,
+        final BlockEntity blockEntity, final float tickDelta, final MatrixStack matrix,
+        final VertexConsumerProvider vertexConsumerProvider,
+        final MatrixStack methodMatrices, final float methodTickDelta, final long methodLimitTime,
+        final boolean methodRenderBlockOutline,
+        final Camera methodCamera, final GameRenderer methodGameRenderer,
+        final LightmapTextureManager methodLightmapTextureManager,
+        final Matrix4f methodMatrix4f) {
         final BlockPos blockEntityPos = blockEntity.getPos();
         final ShipObject shipObject = VSGameUtils.getShipObjectManagingPos(world, blockEntityPos);
         if (shipObject != null) {
@@ -227,8 +286,9 @@ private void renderShipChunkBlockEntity(BlockEntityRenderDispatcher blockEntityR
      * @param camZ            Player camera Z
      */
     @Unique
-    private void transformRenderWithShip(ShipTransform renderTransform, MatrixStack matrix, BlockPos blockPos,
-        double camX, double camY, double camZ) {
+    private void transformRenderWithShip(final ShipTransform renderTransform, final MatrixStack matrix,
+        final BlockPos blockPos,
+        final double camX, final double camY, final double camZ) {
         final ShipObject shipObject = VSGameUtils.getShipObjectManagingPos(world, blockPos);
         if (shipObject != null) {
             // Remove the vanilla render transform
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/block/entity/MixinBlockEntityRenderDispatcher.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/block/entity/MixinBlockEntityRenderDispatcher.java
index 866e46976..c8b19317e 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/block/entity/MixinBlockEntityRenderDispatcher.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/block/entity/MixinBlockEntityRenderDispatcher.java
@@ -38,9 +38,10 @@ public class MixinBlockEntityRenderDispatcher {
             target = "Lnet/minecraft/util/math/Vec3d;isInRange(Lnet/minecraft/util/math/Position;D)Z"
         )
     )
-    private boolean isTileEntityInRenderRange(Vec3d tileEntityPos, Position cameraPos, double radiusSquared,
-        BlockEntity methodBlockEntity, float methodTickDelta, MatrixStack methodMatrix,
-        VertexConsumerProvider methodVertexConsumerProvider) {
+    private boolean isTileEntityInRenderRange(final Vec3d tileEntityPos, final Position cameraPos,
+        final double radiusSquared, final BlockEntity methodBlockEntity, final float methodTickDelta,
+        final MatrixStack methodMatrix, final VertexConsumerProvider methodVertexConsumerProvider) {
+        
         final boolean defaultResult = tileEntityPos.isInRange(cameraPos, radiusSquared);
         if (defaultResult) {
             return true;
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/chunk/MixinChunkBuilderBuiltChunk.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/chunk/MixinChunkBuilderBuiltChunk.java
index d3988a6d9..12faba7d3 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/chunk/MixinChunkBuilderBuiltChunk.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/client/render/chunk/MixinChunkBuilderBuiltChunk.java
@@ -34,7 +34,7 @@ public class MixinChunkBuilderBuiltChunk {
      * makes the ship chunks render in the correct order.
      */
     @Inject(method = "getSquaredCameraDistance", at = @At("HEAD"), cancellable = true)
-    private void preGetSquaredCameraDistance(CallbackInfoReturnable<Double> cir) {
+    private void preGetSquaredCameraDistance(final CallbackInfoReturnable<Double> cir) {
         final World world = MinecraftClient.getInstance().world;
         if (world == null) {
             return;
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientChunkManager.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientChunkManager.java
index 6fa640d9c..8bb7bbbda 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientChunkManager.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientChunkManager.java
@@ -38,24 +38,25 @@ public abstract class MixinClientChunkManager {
     private final LongObjectMap<WorldChunk> shipChunks = new LongObjectHashMap<>();
 
     @Inject(method = "loadChunkFromPacket", at = @At("HEAD"), cancellable = true)
-    private void preLoadChunkFromPacket(int x, int z, BiomeArray biomes, PacketByteBuf buf, CompoundTag tag,
-        int verticalStripBitmask, boolean complete, CallbackInfoReturnable<WorldChunk> cir) {
+    private void preLoadChunkFromPacket(final int x, final int z, final BiomeArray biomes, final PacketByteBuf buf,
+        final CompoundTag tag,
+        final int verticalStripBitmask, final boolean complete, final CallbackInfoReturnable<WorldChunk> cir) {
         final ClientChunkManagerClientChunkMapAccessor clientChunkMapAccessor =
             ClientChunkManagerClientChunkMapAccessor.class.cast(chunks);
         if (!clientChunkMapAccessor.callIsInRadius(x, z)) {
             if (VSGameUtilsKt.getShipObjectWorld(world).getChunkAllocator().isChunkInShipyard(x, z)) {
                 final long chunkPosLong = ChunkPos.toLong(x, z);
 
-                WorldChunk worldChunk = new WorldChunk(this.world, new ChunkPos(x, z), biomes);
+                final WorldChunk worldChunk = new WorldChunk(this.world, new ChunkPos(x, z), biomes);
                 worldChunk.loadFromPacket(biomes, buf, tag, verticalStripBitmask);
                 shipChunks.put(chunkPosLong, worldChunk);
 
-                ChunkSection[] chunkSections = worldChunk.getSectionArray();
-                LightingProvider lightingProvider = this.getLightingProvider();
+                final ChunkSection[] chunkSections = worldChunk.getSectionArray();
+                final LightingProvider lightingProvider = this.getLightingProvider();
                 lightingProvider.setColumnEnabled(new ChunkPos(x, z), true);
 
                 for (int j = 0; j < chunkSections.length; ++j) {
-                    ChunkSection chunkSection = chunkSections[j];
+                    final ChunkSection chunkSection = chunkSections[j];
                     lightingProvider
                         .setSectionStatus(ChunkSectionPos.from(x, j, z), ChunkSection.isEmpty(chunkSection));
                 }
@@ -67,14 +68,14 @@ private void preLoadChunkFromPacket(int x, int z, BiomeArray biomes, PacketByteB
     }
 
     @Inject(method = "unload", at = @At("HEAD"), cancellable = true)
-    public void preUnload(int chunkX, int chunkZ, CallbackInfo ci) {
+    public void preUnload(final int chunkX, final int chunkZ, final CallbackInfo ci) {
         shipChunks.remove(ChunkPos.toLong(chunkX, chunkZ));
         ci.cancel();
     }
 
     @Inject(method = "getChunk", at = @At("HEAD"), cancellable = true)
-    public void preGetChunk(int chunkX, int chunkZ, ChunkStatus chunkStatus, boolean bl,
-        CallbackInfoReturnable<WorldChunk> cir) {
+    public void preGetChunk(final int chunkX, final int chunkZ, final ChunkStatus chunkStatus, final boolean bl,
+        final CallbackInfoReturnable<WorldChunk> cir) {
         final WorldChunk shipChunk = shipChunks.get(ChunkPos.toLong(chunkX, chunkZ));
         if (shipChunk != null) {
             cir.setReturnValue(shipChunk);
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientWorld.java b/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientWorld.java
index 502e44c6b..fbe6ba50e 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientWorld.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientWorld.java
@@ -32,7 +32,7 @@ public ShipObjectWorld getShipObjectWorld() {
     }
 
     @Inject(method = "tick", at = @At("TAIL"))
-    private void postTick(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
+    private void postTick(final BooleanSupplier shouldKeepTicking, final CallbackInfo ci) {
         // Tick the ship world
         shipObjectWorld.tickShips();
     }
@@ -42,15 +42,17 @@ private void postTick(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
         at = @At("HEAD"),
         cancellable = true
     )
-    private void onPlaySound(double x, double y, double z, SoundEvent sound, SoundCategory category,
-        float volume, float pitch, boolean bl, CallbackInfo ci) {
+    private void onPlaySound(final double x, final double y, final double z, final SoundEvent sound,
+        final SoundCategory category,
+        final float volume, final float pitch, final boolean bl, final CallbackInfo ci) {
         final ClientWorld self = ClientWorld.class.cast(this);
         final ShipObject shipObject = VSGameUtils.getShipObjectManagingPos(self, (int) x >> 4, (int) z >> 4);
         if (shipObject != null) {
-            Vector3d newPosition = shipObject.getRenderTransform().getShipToWorldMatrix()
-                .transformPosition(new Vector3d(x, y, z));
+            // in-world position
+            final Vector3d p = shipObject.getRenderTransform()
+                .getShipToWorldMatrix().transformPosition(new Vector3d(x, y, z));
 
-            playSound(newPosition.x, newPosition.y, newPosition.z, sound, category, volume, pitch, bl);
+            playSound(p.x, p.y, p.z, sound, category, volume, pitch, bl);
             ci.cancel();
         }
     }
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java b/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java
index 28e6990ad..51bcbea6a 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java
@@ -19,7 +19,7 @@ public class MixinEntity {
             target = "Lnet/minecraft/world/World;raycast(Lnet/minecraft/world/RaycastContext;)Lnet/minecraft/util/hit/BlockHitResult;"
         )
     )
-    public BlockHitResult addShipsToRaycast(World receiver, RaycastContext ctx) {
+    public BlockHitResult addShipsToRaycast(final World receiver, final RaycastContext ctx) {
         return RaycastUtilsKt.raycastIncludeShips(receiver, ctx);
     }
 
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/server/PlayerManagerMixin.java b/common/src/main/java/org/valkyrienskies/mod/mixin/server/PlayerManagerMixin.java
new file mode 100644
index 000000000..d15284345
--- /dev/null
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/server/PlayerManagerMixin.java
@@ -0,0 +1,65 @@
+package org.valkyrienskies.mod.mixin.server;
+
+import java.util.List;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.Packet;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3d;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.valkyrienskies.core.game.ships.ShipObject;
+import org.valkyrienskies.mod.common.VSGameUtilsKt;
+
+@Mixin(PlayerManager.class)
+public abstract class PlayerManagerMixin {
+
+    @Shadow
+    @Final
+    private List<ServerPlayerEntity> players;
+
+    @Shadow
+    @Final
+    private MinecraftServer server;
+
+    @Shadow
+    public abstract void sendToAround(@Nullable PlayerEntity player, double x, double y, double z, double distance,
+        RegistryKey<World> worldKey, Packet<?> packet);
+
+    /**
+     * Transform x, y, z in sendToAround if they are in ship space.
+     */
+    @Inject(
+        method = "sendToAround",
+        at = @At("HEAD"),
+        cancellable = true
+    )
+    private void sendToAround(@Nullable final PlayerEntity player, final double x, final double y, final double z,
+        final double distance, final RegistryKey<World> worldKey, final Packet<?> packet, final CallbackInfo ci) {
+        final World world = server.getWorld(worldKey);
+        if (world == null) {
+            return;
+        }
+
+        final ShipObject ship = VSGameUtilsKt.getShipObjectManagingPos(world, (int) x >> 4, (int) z >> 4);
+        if (ship == null) {
+            return;
+        }
+
+        // position in-world
+        final Vector3d p = VSGameUtilsKt.toWorldCoordinates(ship.getShipData(), x, y, z);
+
+        // re-call with correct x, y, z and return
+        sendToAround(player, p.x, p.y, p.z, distance, worldKey, packet);
+        ci.cancel();
+    }
+
+}
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayNetworkHandlerMixin.java b/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayNetworkHandlerMixin.java
index 3238793e9..fa6d4ad0f 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayNetworkHandlerMixin.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayNetworkHandlerMixin.java
@@ -26,8 +26,10 @@ public class ServerPlayNetworkHandlerMixin {
             target = "Lnet/minecraft/server/network/ServerPlayerEntity;squaredDistanceTo(DDD)D"
         )
     )
-    public double includeShipsInBlockInteractDistanceCheck(ServerPlayerEntity receiver, double x, double y, double z) {
-        Vector3d inWorld = VSGameUtils.getWorldCoordinates(this.player.getServerWorld(), new Vector3d(x, y, z));
+    public double includeShipsInBlockInteractDistanceCheck(final ServerPlayerEntity receiver, final double x,
+        final double y, final double z) {
+        
+        final Vector3d inWorld = VSGameUtils.getWorldCoordinates(this.player.getServerWorld(), new Vector3d(x, y, z));
         return inWorld.distanceSquared(receiver.getX(), receiver.getY(), receiver.getZ());
     }
 
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayerInteractionManagerMixin.java b/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayerInteractionManagerMixin.java
index a25cfa43b..590c65ee3 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayerInteractionManagerMixin.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/server/network/ServerPlayerInteractionManagerMixin.java
@@ -31,10 +31,10 @@ public class ServerPlayerInteractionManagerMixin {
         at = @At("STORE"),
         index = 11
     )
-    public double includeShipsInBlockBreakDistanceCheck(double g, BlockPos pos,
-        PlayerActionC2SPacket.Action action,
-        Direction direction, int worldHeight) {
-        Vector3d blockCenter = VectorConversionsMCKt.toJOMLD(pos).add(0.5, 0.5, 0.5);
+    public double includeShipsInBlockBreakDistanceCheck(final double g, final BlockPos pos,
+        final PlayerActionC2SPacket.Action action,
+        final Direction direction, final int worldHeight) {
+        final Vector3d blockCenter = VectorConversionsMCKt.toJOMLD(pos).add(0.5, 0.5, 0.5);
         return VSGameUtils.getWorldCoordinates(world, pos, blockCenter)
             .distanceSquared(player.getX(), player.getY() + 1.5, player.getZ());
     }
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinServerWorld.java b/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinServerWorld.java
index 198e313bb..caaca2e76 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinServerWorld.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinServerWorld.java
@@ -14,25 +14,33 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerChunkManager;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.math.Position;
 import net.minecraft.world.PersistentStateManager;
 import org.jetbrains.annotations.NotNull;
+import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.valkyrienskies.core.chunk_tracking.ChunkUnwatchTask;
 import org.valkyrienskies.core.chunk_tracking.ChunkWatchTask;
 import org.valkyrienskies.core.game.IPlayer;
+import org.valkyrienskies.core.game.ships.ShipObject;
 import org.valkyrienskies.core.game.ships.ShipObjectWorld;
 import org.valkyrienskies.core.networking.IVSPacket;
 import org.valkyrienskies.core.networking.impl.VSPacketShipDataList;
 import org.valkyrienskies.mod.common.IShipObjectWorldProvider;
 import org.valkyrienskies.mod.common.ShipSavedData;
+import org.valkyrienskies.mod.common.VSGameUtilsKt;
 import org.valkyrienskies.mod.common.VSNetworking;
 import org.valkyrienskies.mod.common.util.MinecraftPlayer;
+import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
 import org.valkyrienskies.mod.mixin.accessors.server.world.ThreadedAnvilChunkStorageAccessor;
 
 @Mixin(ServerWorld.class)
@@ -57,7 +65,7 @@ public abstract class MixinServerWorld implements IShipObjectWorldProvider {
         at = @At("TAIL"),
         method = "<init>"
     )
-    private void postConstructor(CallbackInfo info) {
+    private void postConstructor(final CallbackInfo info) {
         // Load ship data from the world storage
         shipSavedData = getPersistentStateManager()
             .getOrCreate(ShipSavedData.Companion::createEmpty, ShipSavedData.SAVED_DATA_ID);
@@ -71,8 +79,37 @@ public ShipObjectWorld getShipObjectWorld() {
         return shipObjectWorld;
     }
 
+    /**
+     * Include ships in particle distance check. Seems to only be used by /particle
+     */
+    @Redirect(
+        method = "sendToPlayerIfNearby",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/util/math/BlockPos;isWithinDistance(Lnet/minecraft/util/math/Position;D)Z"
+        )
+    )
+    private boolean includeShipsInParticleDistanceCheck(
+        final BlockPos player, final Position particle, final double distance) {
+
+        final ServerWorld self = ServerWorld.class.cast(this);
+        final ShipObject ship = VSGameUtilsKt.getShipObjectManagingPos(
+            self, (int) particle.getX() >> 4, (int) particle.getZ() >> 4);
+
+        if (ship == null) {
+            // vanilla behaviour
+            return player.isWithinDistance(particle, distance);
+        }
+
+        // in-world position
+        final Vector3d posInWorld = ship.getShipData().getShipTransform().getShipToWorldMatrix()
+            .transformPosition(VectorConversionsMCKt.toJOML(particle));
+        
+        return posInWorld.distanceSquared(player.getX(), player.getY(), player.getZ()) < distance * distance;
+    }
+
     @Inject(method = "tick", at = @At("TAIL"))
-    private void postTick(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
+    private void postTick(final BooleanSupplier shouldKeepTicking, final CallbackInfo ci) {
         // First update the IPlayer wrapper list
         updateVSPlayerWrappers();
 
@@ -83,7 +120,7 @@ private void postTick(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
         final IVSPacket shipDataPacket = VSPacketShipDataList.Companion
             .create(shipObjectWorld.getQueryableShipData().iterator());
 
-        for (ServerPlayerEntity playerEntity : players) {
+        for (final ServerPlayerEntity playerEntity : players) {
             VSNetworking.shipDataPacketToClientSender.sendToClient(shipDataPacket, playerEntity);
         }
 
@@ -126,6 +163,7 @@ private void postTick(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
         });
     }
 
+    @Unique
     private void updateVSPlayerWrappers() {
         // First add new player objects
         players.forEach(player -> {
diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinThreadedAnvilChunkStorage.java b/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinThreadedAnvilChunkStorage.java
index 97ef39e7a..f8195101a 100644
--- a/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinThreadedAnvilChunkStorage.java
+++ b/common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinThreadedAnvilChunkStorage.java
@@ -51,7 +51,6 @@ public abstract class MixinThreadedAnvilChunkStorage {
     @Final
     private Supplier<PersistentStateManager> persistentStateManagerFactory;
 
-    private final ThreadedAnvilChunkStorage vs$thisAsChunkMap = ThreadedAnvilChunkStorage.class.cast(this);
 
     /**
      * Force the game to generate empty chunks in the shipyard.
@@ -64,11 +63,11 @@ public abstract class MixinThreadedAnvilChunkStorage {
      */
     @Overwrite
     @Nullable
-    private CompoundTag getUpdatedChunkTag(ChunkPos chunkPos) throws IOException {
-        CompoundTag compoundTag = vs$thisAsChunkMap.getNbt(chunkPos);
+    private CompoundTag getUpdatedChunkTag(final ChunkPos chunkPos) throws IOException {
+        final ThreadedAnvilChunkStorage self = ThreadedAnvilChunkStorage.class.cast(this);
+        final CompoundTag compoundTag = self.getNbt(chunkPos);
         final CompoundTag originalToReturn = compoundTag == null ? null :
-            vs$thisAsChunkMap
-                .updateChunkTag(this.world.getRegistryKey(), this.persistentStateManagerFactory, compoundTag);
+            self.updateChunkTag(this.world.getRegistryKey(), this.persistentStateManagerFactory, compoundTag);
 
         if (originalToReturn == null) {
             final IShipObjectWorldProvider shipObjectWorldProvider = (IShipObjectWorldProvider) world;
@@ -92,8 +91,9 @@ private CompoundTag getUpdatedChunkTag(ChunkPos chunkPos) throws IOException {
      * @author Tri0de
      */
     @Inject(method = "getPlayersWatchingChunk", at = @At("TAIL"), cancellable = true)
-    private void postGetPlayersWatchingChunk(ChunkPos chunkPos, boolean onlyOnWatchDistanceEdge,
-        CallbackInfoReturnable<Stream<ServerPlayerEntity>> cir) {
+    private void postGetPlayersWatchingChunk(final ChunkPos chunkPos, final boolean onlyOnWatchDistanceEdge,
+        final CallbackInfoReturnable<Stream<ServerPlayerEntity>> cir) {
+
         final Iterator<IPlayer> playersWatchingShipChunk =
             VSGameUtilsKt.getShipObjectWorld(world).getIPlayersWatchingShipChunk(chunkPos.x, chunkPos.z);
 
diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt
index c977feabc..fc4dce69a 100644
--- a/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt
+++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/VSGameUtils.kt
@@ -26,15 +26,26 @@ fun World.getShipObjectManagingPos(chunkX: Int, chunkZ: Int): ShipObject? {
     return null
 }
 
-fun World.getShipManagingPos(chunkPos: ChunkPos): ShipData? {
-    return if (shipObjectWorld.chunkAllocator.isChunkInShipyard(chunkPos.x, chunkPos.z)) {
-        shipObjectWorld.queryableShipData.getShipDataFromChunkPos(chunkPos.x, chunkPos.z)
+fun World.getShipManagingPos(blockPos: BlockPos): ShipData? =
+    getShipManagingPos(blockPos.x shr 4, blockPos.z shr 4)
+
+fun World.getShipManagingPos(chunkPos: ChunkPos): ShipData? =
+    getShipManagingPos(chunkPos.x, chunkPos.z)
+
+fun World.getShipManagingPos(x: Int, z: Int): ShipData? {
+    return if (shipObjectWorld.chunkAllocator.isChunkInShipyard(x, z)) {
+        shipObjectWorld.queryableShipData.getShipDataFromChunkPos(x, z)
     } else {
         null
     }
 }
 
+fun ShipData.toWorldCoordinates(pos: BlockPos) = shipTransform.shipToWorldMatrix.transformPosition(pos.toJOMLD())
+fun ShipData.toWorldCoordinates(x: Double, y: Double, z: Double) =
+    shipTransform.shipToWorldMatrix.transformPosition(Vector3d(x, y, z))
+
 object VSGameUtils {
+
     @JvmStatic
     fun getShipManagingPos(world: World, chunkPos: ChunkPos): ShipData? {
         return world.getShipManagingPos(chunkPos)
diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/util/VectorConversionsMC.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/util/VectorConversionsMC.kt
index 9a197eb9e..692a7158d 100644
--- a/common/src/main/kotlin/org/valkyrienskies/mod/common/util/VectorConversionsMC.kt
+++ b/common/src/main/kotlin/org/valkyrienskies/mod/common/util/VectorConversionsMC.kt
@@ -2,6 +2,7 @@ package org.valkyrienskies.mod.common.util
 
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Position
 import net.minecraft.util.math.Quaternion
 import net.minecraft.util.math.Vec3d
 import net.minecraft.util.math.Vec3i
@@ -31,7 +32,7 @@ fun Vector3d.set(v: Vec3i) = also {
     z = v.z.toDouble()
 }
 
-fun Vector3d.set(v: Vec3d) = also {
+fun Vector3d.set(v: Position) = also {
     x = v.x
     y = v.y
     z = v.z
@@ -59,7 +60,7 @@ fun MatrixStack.multiply(modelTransform: Matrix4dc, normalTransform: Quaterniond
 
 fun Vec3i.toJOML() = Vector3i().set(this)
 fun Vec3i.toJOMLD() = Vector3d().set(this)
-fun Vec3d.toJOML() = Vector3d().set(this)
+fun Position.toJOML() = Vector3d().set(this)
 
 fun Matrix4fMC.set(m: Matrix4fc) = also {
     @Suppress("CAST_NEVER_SUCCEEDS")
diff --git a/common/src/main/resources/valkyrienskies-common.mixins.json b/common/src/main/resources/valkyrienskies-common.mixins.json
index 6ef2ad940..47901273a 100644
--- a/common/src/main/resources/valkyrienskies-common.mixins.json
+++ b/common/src/main/resources/valkyrienskies-common.mixins.json
@@ -6,7 +6,10 @@
   "mixins": [
     "accessors.server.world.ThreadedAnvilChunkStorageAccessor",
     "accessors.util.math.Matrix4fAccessor",
+    "block.MixinBlock",
+    "client.particle.ParticleMixin",
     "entity.MixinEntity",
+    "server.PlayerManagerMixin",
     "server.network.ServerPlayerInteractionManagerMixin",
     "server.network.ServerPlayNetworkHandlerMixin",
     "server.world.MixinServerWorld",
@@ -28,4 +31,4 @@
     "defaultRequire": 1
   },
   "minVersion": "0.8"
-}
\ No newline at end of file
+}
diff --git a/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/ExampleFabricMixin.java b/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/ExampleFabricMixin.java
index f2248869b..36a949f71 100644
--- a/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/ExampleFabricMixin.java
+++ b/fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/ExampleFabricMixin.java
@@ -20,7 +20,7 @@ public class ExampleFabricMixin {
         at = @At("HEAD"),
         method = "init"
     )
-    public void inject(CallbackInfo info) {
+    public void inject(final CallbackInfo info) {
         field_23775.info("Hello from ExampleFabricMixin");
     }
 
diff --git a/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/ExampleForgeMixin.java b/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/ExampleForgeMixin.java
index ec6097907..cc90ee725 100644
--- a/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/ExampleForgeMixin.java
+++ b/forge/src/main/java/org/valkyrienskies/mod/forge/mixin/ExampleForgeMixin.java
@@ -20,7 +20,7 @@ public class ExampleForgeMixin {
         at = @At("HEAD"),
         method = "init"
     )
-    public void inject(CallbackInfo info) {
+    public void inject(final CallbackInfo info) {
         field_23775.info("Hello from ExampleForgeMixin");
     }
 
diff --git a/gradle.properties b/gradle.properties
index 07be69da1..dd4541ab7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,22 +1,14 @@
 org.gradle.jvmargs=-Xmx2048M
-
 minecraft_version=1.16.4
-
 archives_base_name=valkyrienskies-116
 mod_version=1.0.0
 maven_group=org.valkyrienskies.mod
-
 architectury_version=1.2.73
-
 fabric_loader_version=0.10.8
 fabric_api_version=0.29.3+1.16
-
 forge_version=35.1.6
-
 yarn_mappings=1.16.4+build.9
-
 vs_core_version=1.0
-
 # Prevent kotlin from autoincluding stdlib as a dependency, which breaks
 # gradle's composite builds (includeBuild) for some reason. We'll add it manually
-kotlin.stdlib.default.dependency=false
\ No newline at end of file
+kotlin.stdlib.default.dependency=false
diff --git a/settings.gradle b/settings.gradle
index ac0189a91..a9a71d0d9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,11 @@
 pluginManagement {
-	repositories {
-		jcenter()
-		maven { url "https://maven.fabricmc.net/" }
-		maven { url "https://maven.shedaniel.me/" }
-		maven { url "https://files.minecraftforge.net/maven/" }
-		gradlePluginPortal()
-	}
+    repositories {
+        jcenter()
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://maven.shedaniel.me/" }
+        maven { url "https://files.minecraftforge.net/maven/" }
+        gradlePluginPortal()
+    }
 }
 
 include("common")
diff --git a/vs-core b/vs-core
index e651a945d..5da758705 160000
--- a/vs-core
+++ b/vs-core
@@ -1 +1 @@
-Subproject commit e651a945d00b31db8b07edee472a4f172abbdc7f
+Subproject commit 5da75870505cdedfa88c4890d4defc9db8029835