[1.20.1] Modular Force Field System Compat

forge/build.gradle

@@ -88,6 +88,7 @@ dependencies {
     modImplementation("teamreborn:energy:${energy_version}") {
         transitive = false
     }
+
     // TIS-3d
     modCompileOnly("maven.modrinth:tis3d:${tis3d_version}")
 
@@ -102,6 +103,9 @@ dependencies {
     // Mekanism
     modCompileOnly ("curse.maven:mekanism-268560:4644795")
 
+    // Modular Force Field System
+    modCompileOnly("maven.modrinth:mffs:5.1.18")
+
     // Add Kotlin for Forge (3.12.0)
     forgeRuntimeLibrary("maven.modrinth:kotlin-for-forge:${kotlin_version}")
 

forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/mffs/MixinClientPacketHandler.java

@@ -0,0 +1,36 @@
+package org.valkyrienskies.mod.forge.mixin.compat.mffs;
+
+import dev.su5ed.mffs.network.ClientPacketHandler;
+import dev.su5ed.mffs.render.particle.BeamParticleOptions;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.world.phys.Vec3;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.valkyrienskies.core.api.ships.Ship;
+import org.valkyrienskies.mod.api.ValkyrienSkies;
+
+@Pseudo
+@Mixin(ClientPacketHandler.class)
+public class MixinClientPacketHandler {
+    @Redirect(method = "handleDrawBeamPacket", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/client/multiplayer/ClientLevel;addParticle(Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V"
+    ))
+    private static void valkyrienskies$handleBeamsOnShips(ClientLevel instance, ParticleOptions arg, double d, double e, double f, double g, double h, double i) {
+        if (!(arg instanceof BeamParticleOptions beam)) {
+            instance.addParticle(arg, d, e, f, g, h, i);
+            return;
+        }
+
+        Vec3 target = beam.target();
+        final Ship ship = ValkyrienSkies.getShipManagingBlock(instance, ((BeamParticleOptions) arg).target());
+        if (ship != null) {
+            target = ValkyrienSkies.positionToWorld(ship, target);
+        }
+
+        instance.addParticle(new BeamParticleOptions(target, beam.color(), beam.lifetime()), d, e, f, g, h, i);
+    }
+}

forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/mffs/README.md

@@ -0,0 +1,4 @@
+Modular Force Field System Compatibility Mixin
+
+- MixinClientPacketHandler
+  - Fixes the target position of the Beam Particle if it is on a Ship pointing it to the correct Worldspace position

forge/src/main/resources/valkyrienskies-forge.mixins.json

@@ -29,6 +29,7 @@
     "compat.create.client.MixinFlwContraption",
     "compat.create.client.MixinSuperGlueSelectionHandler",
     "compat.create.client.MixinTrackBlockOutline",
+    "compat.mffs.MixinClientPacketHandler",
     "compat.sodium.MixinRenderSectionManager",
     "compat.tis3d.MixinCasingTileEntityRender",
     "compat.tis3d.MixinRenderContextImpl"