Skip to content

Commit

Permalink
Backporting changes to CC: Tweaked Mixins (#1070)
Browse files Browse the repository at this point in the history 
* Fixed both Turtles ability to leave Ships and re-implemented Turtles ability to collide with Ships and pass through their empty spaces

* Ship-On-Ship Action (Turtles can not pass through and detect Ships while on other Ships
  • Loading branch information
@TechTastic
TechTastic authored Jan 20, 2025
1 parent 87c03d3 commit fde6f31
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 33 deletions.
15 changes: 12 additions & 3 deletions .../main/java/org/valkyrienskies/mod/fabric/mixin/compat/cc_restitched/MixinTurtleBrain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,18 @@ public abstract class MixinTurtleBrain {
Direction.getNearest(transformedDirection.x, transformedDirection.y, transformedDirection.z));
setOwner(currentOwner);

if (ship.getTransform().getShipToWorldScaling().equals(1.000E+0, 1.000E+0, 1.000E+0) &&
VSGameConfig.SERVER.getComputerCraft().getCanTurtlesLeaveScaledShips()) {
// SHIP IS SCALED AND TURTLES CAN LEAVE SCALED SHIPS
final boolean isShipScaled = !ship.getTransform().getShipToWorldScaling().equals(1.000E+0, 1.000E+0, 1.000E+0);

if (isShipScaled) {
// SHIP IS SCALED

if (VSGameConfig.SERVER.getComputerCraft().getCanTurtlesLeaveScaledShips()) {
// TURTLES CAN LEAVE SCALED SHIPS

return new BlockPos(ValkyrienSkies.positionToWorld(ship, Vec3.atCenterOf(pos)));
}
} else {
// SHIP ISNT SCALED

return new BlockPos(ValkyrienSkies.positionToWorld(ship, Vec3.atCenterOf(pos)));
}
Expand Down
34 changes: 20 additions & 14 deletions ...java/org/valkyrienskies/mod/fabric/mixin/compat/cc_restitched/MixinTurtleMoveCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@
import dan200.computercraft.shared.turtle.core.TurtlePlayer;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3;
import org.joml.Vector3d;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
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.callback.CallbackInfoReturnable;
Expand All @@ -31,22 +29,30 @@ public abstract class MixinTurtleMoveCommand {
final CallbackInfoReturnable<TurtleCommandResult> cir) {
if (cir.getReturnValue().isSuccess()) {
final Ship ship = ValkyrienSkies.getShipManagingBlock(world, position);
if (ship == null) {
final boolean notInAir = Streams
.stream(ValkyrienSkies.positionToNearbyShipsAndWorld(world, position.getX() + 0.5, position.getY() + 0.5, position.getZ() + 0.5, 0.1))
.map(pos -> ValkyrienSkies.getShipManagingBlock(world, pos))
.map(s -> ValkyrienSkies.positionToShip(s, new Vector3d(position.getX() + 0.5, position.getY() + 0.5, position.getZ() + 0.5)))
.map(pos -> world.getBlockState(new BlockPos(ValkyrienSkies.toMinecraft(pos))))
.anyMatch(BlockState::isAir);
Vector3d testPosition = ValkyrienSkies.toJOML(new Vec3(position.getX() + 0.5, position.getY() + 0.5, position.getZ() + 0.5));

if (notInAir) {
cir.setReturnValue(TurtleCommandResult.failure("Movement obstructed by ship"));
}
} else {
if (ship != null) {
final ChunkPos chunk = world.getChunkAt(position).getPos();
if (!ship.getChunkClaim().contains(chunk.x, chunk.z)) {
cir.setReturnValue(TurtleCommandResult.failure("Out of ship chunk"));
}

testPosition = ValkyrienSkies.positionToWorld(ship, testPosition);
}

final List<Vector3d> nearbyShips =
new ArrayList<>(Streams.stream(ValkyrienSkies.positionToNearbyShips(world,
testPosition.x, testPosition.y, testPosition.z, 0.1)).toList());

final boolean notInAir = !nearbyShips.isEmpty() && nearbyShips
.stream()
.map(ValkyrienSkies::toMinecraft)
.map(BlockPos::new)
.map(world::getBlockState)
.anyMatch(state -> !state.isAir());

if (notInAir) {
cir.setReturnValue(TurtleCommandResult.failure("Movement obstructed by ship"));
}
}
}
Expand Down
15 changes: 12 additions & 3 deletions .../src/main/java/org/valkyrienskies/mod/forge/mixin/compat/cc_tweaked/MixinTurtleBrain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,18 @@ public abstract class MixinTurtleBrain {
Direction.getNearest(transformedDirection.x, transformedDirection.y, transformedDirection.z));
setOwner(currentOwner);

if (ship.getTransform().getShipToWorldScaling().equals(1.000E+0, 1.000E+0, 1.000E+0) &&
VSGameConfig.SERVER.getComputerCraft().getCanTurtlesLeaveScaledShips()) {
// SHIP IS SCALED AND TURTLES CAN LEAVE SCALED SHIPS
final boolean isShipScaled = !ship.getTransform().getShipToWorldScaling().equals(1.000E+0, 1.000E+0, 1.000E+0);

if (isShipScaled) {
// SHIP IS SCALED

if (VSGameConfig.SERVER.getComputerCraft().getCanTurtlesLeaveScaledShips()) {
// TURTLES CAN LEAVE SCALED SHIPS

return new BlockPos(ValkyrienSkies.positionToWorld(ship, Vec3.atCenterOf(pos)));
}
} else {
// SHIP ISNT SCALED

return new BlockPos(ValkyrienSkies.positionToWorld(ship, Vec3.atCenterOf(pos)));
}
Expand Down
33 changes: 20 additions & 13 deletions ...ain/java/org/valkyrienskies/mod/forge/mixin/compat/cc_tweaked/MixinTurtleMoveCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3;
import org.joml.Vector3d;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
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.callback.CallbackInfoReturnable;
Expand All @@ -30,22 +29,30 @@ public abstract class MixinTurtleMoveCommand {
final CallbackInfoReturnable<TurtleCommandResult> cir) {
if (cir.getReturnValue().isSuccess()) {
final Ship ship = ValkyrienSkies.getShipManagingBlock(world, position);
if (ship == null) {
final boolean notInAir = Streams
.stream(ValkyrienSkies.positionToNearbyShipsAndWorld(world, position.getX() + 0.5, position.getY() + 0.5, position.getZ() + 0.5, 0.1))
.map(pos -> ValkyrienSkies.getShipManagingBlock(world, pos))
.map(s -> ValkyrienSkies.positionToShip(s, new Vector3d(position.getX() + 0.5, position.getY() + 0.5, position.getZ() + 0.5)))
.map(pos -> world.getBlockState(new BlockPos(ValkyrienSkies.toMinecraft(pos))))
.anyMatch(BlockState::isAir);
Vector3d testPosition = ValkyrienSkies.toJOML(new Vec3(position.getX() + 0.5, position.getY() + 0.5, position.getZ() + 0.5));

if (notInAir) {
cir.setReturnValue(TurtleCommandResult.failure("Movement obstructed by ship"));
}
} else {
if (ship != null) {
final ChunkPos chunk = world.getChunkAt(position).getPos();
if (!ship.getChunkClaim().contains(chunk.x, chunk.z)) {
cir.setReturnValue(TurtleCommandResult.failure("Out of ship chunk"));
}

testPosition = ValkyrienSkies.positionToWorld(ship, testPosition);
}

final List<Vector3d> nearbyShips =
new ArrayList<>(Streams.stream(ValkyrienSkies.positionToNearbyShips(world,
testPosition.x, testPosition.y, testPosition.z, 0.1)).toList());

final boolean notInAir = !nearbyShips.isEmpty() && nearbyShips
.stream()
.map(ValkyrienSkies::toMinecraft)
.map(BlockPos::new)
.map(world::getBlockState)
.anyMatch(state -> !state.isAir());

if (notInAir) {
cir.setReturnValue(TurtleCommandResult.failure("Movement obstructed by ship"));
}
}
}
Expand Down

0 comments on commit fde6f31

Please sign in to comment.