Merge pull request #629 from TechTastic/1.18.x/compat/modular_routers

Modular Routers Compatibility

forge/build.gradle

@@ -78,6 +78,9 @@ dependencies {
     //modImplementation("curse.maven:tis3d-238603:3738437")
     //modImplementation("curse.maven:markdownmanual-502485:3738124")
 
+    // Modular Routers
+    modCompileOnly("curse.maven:mr-250294:3776175")
+
     // Add Kotlin for Forge (3.12.0)
     forgeRuntimeLibrary('curse.maven:kotlinforforge-351264:4513187')
 

forge/src/main/java/org/valkyrienskies/mod/forge/mixin/compat/modular_routers/MixinContainerModularRouter.java

@@ -0,0 +1,35 @@
+package org.valkyrienskies.mod.forge.mixin.compat.modular_routers;
+
+import me.desht.modularrouters.block.tile.ModularRouterBlockEntity;
+import me.desht.modularrouters.container.ContainerModularRouter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
+import org.joml.Vector3d;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.Shadow;
+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.common.VSGameUtilsKt;
+import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
+
+@Pseudo
+@Mixin(ContainerModularRouter.class)
+public class MixinContainerModularRouter {
+    @Shadow
+    @Final
+    private ModularRouterBlockEntity router;
+
+    @Redirect(method = "stillValid", at = @At(target = "Lnet/minecraft/world/phys/Vec3;distanceToSqr(Lnet/minecraft/world/phys/Vec3;)D", value = "INVOKE"))
+    public double ValkyrienSkies$distanceCheck(final Vec3 instance, final Vec3 vec3) {
+        final Level level = router.getLevel();
+        final Ship ship = VSGameUtilsKt.getShipManagingPos(level, instance);
+        if (ship == null)
+            return instance.distanceToSqr(vec3);
+
+        final Vector3d newInstance = ship.getTransform().getShipToWorld().transformPosition(VectorConversionsMCKt.toJOML(instance));
+        return VectorConversionsMCKt.toMinecraft(newInstance).distanceToSqr(vec3);
+    }
+}

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

@@ -14,6 +14,7 @@
     "compat.immersivengineering.MixinBlockEntityInventory",
     "compat.thermalexpansion.MixinTileCoFH",
     "compat.tis3d.MixinInfraredPacketEntity",
+    "compat.modular_routers.MixinContainerModularRouter",
     "feature.forge_interact.MixinIForgePlayer",
     "world.level.block.FireMixin"
   ],