Skip to content

Refactor WirelessNetworkMixin to use injection for range #1612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Dokt0r wants to merge 1 commit into from
+34 −7
Closed

Refactor WirelessNetworkMixin to use injection for range #1612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions ...main/java/dev/ryanhcode/sable/mixin/compatibility/computercraft/WirelessNetworkMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,47 @@
package dev.ryanhcode.sable.mixin.compatibility.computercraft;

import com.llamalad7.mixinextras.sugar.Local;
import dan200.computercraft.api.network.Packet;
import dan200.computercraft.api.network.PacketReceiver;
import dan200.computercraft.api.network.PacketSender;
import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
import dev.ryanhcode.sable.Sable;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

/**
* Adjusts CC: Tweaked wireless modem range calculations to account for sub-level distances.
*
* Previously, this mixin targeted an internal `Vec3.distanceToSqr` call via `@Redirect`.
* Changes in newer CC: Tweaked versions caused an `InjectionError` (`Scanned 0 target(s)`).
*
* This implementation injects at `@At("HEAD")` of `tryTransmit`, reimplementing the method
* body using Sable's sub-level distance helper and cancelling the original execution.
*/
@Mixin(WirelessNetwork.class)
public class WirelessNetworkMixin {

@Redirect(remap = false, method = "tryTransmit", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/Vec3;distanceToSqr(Lnet/minecraft/world/phys/Vec3;)D"))
private static double getPosition(final Vec3 a, final Vec3 b, @Local(ordinal = 0, argsOnly = true) final PacketReceiver packetReceiver) {
return Sable.HELPER.distanceSquaredWithSubLevels(packetReceiver.getLevel(), a, b);
}
@Inject(remap = false, method = "tryTransmit", at = @At("HEAD"), cancellable = true)
private static void sable$tryTransmit(final PacketReceiver receiver,
final Packet packet,
final double range,
final boolean interdimensional,
final CallbackInfo ci) {
final PacketSender sender = packet.sender();

if (receiver.getLevel() == sender.getLevel()) {
final double receiveRange = Math.max(range, receiver.getRange());
final double distanceSq = Sable.HELPER.distanceSquaredWithSubLevels(
receiver.getLevel(), receiver.getPosition(), sender.getPosition());

if (interdimensional || receiver.isInterdimensional() || distanceSq <= receiveRange * receiveRange) {
receiver.receiveSameDimension(packet, Math.sqrt(distanceSq));
}
} else if (interdimensional || receiver.isInterdimensional()) {
receiver.receiveDifferentDimension(packet);
}

ci.cancel();
}
}