Fix Valkyrien Skies (#542)

Co-authored-by: Govert de Gans <grappigegovert@hotmail.com>
Co-authored-by: Craig <sandedshoes@gmail.com>

Author: 3 people

changelog.md

@@ -1,11 +1,21 @@
-# Version 2.1.6
+# Version 2.1.7
 
 ![TARDIS Refined](https://wiki.tardisrefined.net/TARDIS-Refined-Wiki/tardis_refined_v2_1.png)
 
 #### Changes
 - Amethyst Screwdriver tooltip now is colored gray.
 
 #### Bug Fix
+- Bug fix: TARDIS exterior disappears when moved by other mods.
+- Bug fix: Taking off or landing a TARDIS on a Valkyrien Skies ship breaks the ship.
+- Bug fix: Impossible to enter TARDIS when on a Valkyrien Skies ship.
+- Bug fix: TARDIS shows shipyard coordinates when on a Valkyrien Skies ship.
+- Bug fix: Player does not face the right horizontal direction when entering/exiting a TARDIS on a Valkyrien Skies ship.
+- Partial bug fix: Player falls through Valkyrien Skies ship when exiting the TARDIS.
+- Bug fix: TARDIS does not take Valkyrien Skies ships into account when computing travel distance.
+- Bug fix: TARDIS does not automatically try to land on ships.
+- Bug fix: Flickering when spectating TARDIS exterior on a Valkyrien Skies ship.
+
 - Bug fix: Fixes Console Textures having left over prefabs
 - Bug fix: Fixes Forge not having the same access level as Fabric (https://github.com/WhoCraft/TardisRefined/issues/477)
 - Bug fix: Fixed Shulker shells not having correct texture paths

common/src/main/java/whocraft/tardis_refined/common/block/shell/GlobalShellBlock.java

@@ -68,9 +68,9 @@ public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, Block
     }
 
     @Nullable
-    @Override
+    @Override // Always assume it's placed by another mod. That setting is set to false when the TARDIS_ID is set.
     public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
-        return new GlobalShellBlockEntity(blockPos, blockState);
+        return new GlobalShellBlockEntity(blockPos, blockState).setPlacedByOtherMod(true);
     }
 
     @Nullable

common/src/main/java/whocraft/tardis_refined/common/block/shell/ShellBaseBlock.java

@@ -19,12 +19,15 @@
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import whocraft.tardis_refined.common.blockentity.shell.ExteriorShell;
 import whocraft.tardis_refined.common.util.TRTeleporter;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 
 public abstract class ShellBaseBlock extends BaseEntityBlock implements SimpleWaterloggedBlock, Fallable {
 

common/src/main/java/whocraft/tardis_refined/common/blockentity/shell/ShellBaseBlockEntity.java

@@ -27,6 +27,7 @@
 import whocraft.tardis_refined.common.capability.tardis.TardisLevelOperator;
 import whocraft.tardis_refined.common.capability.tardis.upgrades.UpgradeHandler;
 import whocraft.tardis_refined.common.dimension.DimensionHandler;
+import whocraft.tardis_refined.common.tardis.TardisNavLocation;
 import whocraft.tardis_refined.common.tardis.manager.AestheticHandler;
 import whocraft.tardis_refined.common.tardis.manager.TardisPilotingManager;
 import whocraft.tardis_refined.common.util.DimensionUtil;
@@ -44,6 +45,7 @@ public abstract class ShellBaseBlockEntity extends BlockEntity implements Exteri
     public AnimationState liveliness = new AnimationState();
     protected ResourceKey<Level> TARDIS_ID;
     private boolean hasPotentialToBeRemoved = false;
+    private boolean placedByOtherMod = false; // We don't serialize this by design, because other mods might still create duplicates.
 
     public ShellBaseBlockEntity(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
         super(blockEntityType, blockPos, blockState);
@@ -54,11 +56,17 @@ public ResourceKey<Level> getTardisId() {
         return this.TARDIS_ID;
     }
 
+    public ShellBaseBlockEntity setPlacedByOtherMod(boolean placedByOtherMod) {
+        this.placedByOtherMod = placedByOtherMod;
+        return this;
+    }
+
     @Override
     public void setTardisId(ResourceKey<Level> levelKey) {
         this.TARDIS_ID = levelKey;
         this.setChanged();
         this.level.sendBlockUpdated(this.getBlockPos(), this.getBlockState(), this.getBlockState(), Block.UPDATE_ALL);
+        placedByOtherMod = false; // If any mod runs this function we can be sure they have probably set the current location property.
     }
 
     @Override
@@ -161,6 +169,13 @@ public void tick(Level level, BlockPos blockPos, BlockState blockState, ShellBas
 
             TardisLevelOperator.get(tardisLevel).ifPresent(tardisLevelOperator -> {
                 if(!tardisLevelOperator.getPilotingManager().isInFlight()) {
+                    if (placedByOtherMod) { // If placed by another mod we don't want it to delete itself.
+                        var dir = level.getBlockState(blockPos).getOptionalValue(ShellBaseBlock.FACING).orElse(Direction.NORTH);
+                        tardisLevelOperator.getPilotingManager().setCurrentLocation(
+                                new TardisNavLocation(blockPos, dir, level.dimension())
+                        );
+                        placedByOtherMod = false;
+                    }
                     if (isInvalidTardis(tardisLevelOperator)) {
                         BlockPos myCurrentPosition = getBlockPos();
                         level.removeBlock(myCurrentPosition, false);

common/src/main/java/whocraft/tardis_refined/common/capability/player/TardisPlayerInfo.java

@@ -9,6 +9,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Abilities;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.Vec3;
 import whocraft.tardis_refined.common.capability.tardis.TardisLevelOperator;
 import whocraft.tardis_refined.common.network.messages.player.C2SExitTardisView;
 import whocraft.tardis_refined.common.network.messages.player.S2CResetPostShellView;
@@ -18,6 +19,8 @@
 import whocraft.tardis_refined.common.util.DimensionUtil;
 import whocraft.tardis_refined.common.util.Platform;
 import whocraft.tardis_refined.common.util.TRTeleporter;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 
 import javax.annotation.Nullable;
 import java.util.Objects;
@@ -104,9 +107,15 @@ public void startShellView(ServerPlayer serverPlayer, TardisLevelOperator tardis
         if (spectateTarget != null) {
 
             BlockPos spectatePos = spectateTarget.getPosition();
+            Vec3 accurateSpectatePos = Vec3.atBottomCenterOf(spectatePos);
 
-            if (spectateTarget.getPosition().distManhattan(new Vec3i((int) player.position().x, (int) player.position().y, (int) player.position().z)) > 3 || !player.level().dimension().location().toString().equals(spectateTarget.getDimensionKey().location().toString())) {
-                TRTeleporter.simpleTeleport(player, spectateTarget.getLevel(), spectatePos.getX() + 0.5, spectatePos.getY(), spectatePos.getZ() + 0.5, playerPreviousRot, playerPreviousYaw);
+            if (ModCompatChecker.valkyrienSkies()) {
+                accurateSpectatePos = VSHelper.toWorldPosition(spectateTarget.getLevel(), spectatePos, accurateSpectatePos);
+                spectatePos = VSHelper.toWorldPosition(spectateTarget.getLevel(), spectatePos);
+            }
+
+            if (spectatePos.distManhattan(new Vec3i((int) player.position().x, (int) player.position().y, (int) player.position().z)) > 3 || !player.level().dimension().location().toString().equals(spectateTarget.getDimensionKey().location().toString())) {
+                TRTeleporter.simpleTeleport(player, spectateTarget.getLevel(), accurateSpectatePos.x, accurateSpectatePos.y, accurateSpectatePos.z, playerPreviousRot, playerPreviousYaw);
             }
             updatePlayerAbilities(serverPlayer, serverPlayer.getAbilities(), true);
             setRenderVortex(timeVortex);

common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/CoordinateControl.java

@@ -10,6 +10,8 @@
 import whocraft.tardis_refined.common.tardis.manager.TardisPilotingManager;
 import whocraft.tardis_refined.common.tardis.themes.ConsoleTheme;
 import whocraft.tardis_refined.common.util.PlayerUtil;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 
 
 public class CoordinateControl extends whocraft.tardis_refined.common.tardis.control.Control {
@@ -54,6 +56,11 @@ private boolean changeCoord(TardisLevelOperator operator, ConsoleTheme theme, Co
                 case Z -> potentialPos = potentialPos.offset(0, 0, incrementAmount);
             }
 
+            if (ModCompatChecker.valkyrienSkies()) {
+                pilotManager.setTargetLocation(VSHelper.toWorldLocation(pilotManager.getTargetLocation()));
+                potentialPos = VSHelper.toWorldPosition(targetLocation.getLevel(), potentialPos);
+            }
+
             //Use vanilla check which accounts for both world height and horizontal bounds
             if (pilotManager.getTargetLocation().getLevel().isInWorldBounds(potentialPos)) {
 

common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java

@@ -12,6 +12,8 @@
 import whocraft.tardis_refined.common.tardis.manager.TardisPilotingManager;
 import whocraft.tardis_refined.common.tardis.themes.ConsoleTheme;
 import whocraft.tardis_refined.common.util.*;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 import whocraft.tardis_refined.constants.ModMessages;
 import whocraft.tardis_refined.registry.TRUpgrades;
 
@@ -82,6 +84,9 @@ private boolean changeDim(TardisLevelOperator operator, ConsoleTheme theme, Cont
                 }
             }
 
+            if (ModCompatChecker.valkyrienSkies()) {
+                pilotManager.setTargetLocation(VSHelper.toWorldLocation(pilotManager.getTargetLocation()));
+            }
             pilotManager.setTargetDimension(dimensions.get(nextIndex));
 
             PlayerUtil.sendMessage(player, Component.translatable(ModMessages.CONTROL_DIMENSION_SELECTED, MiscHelper.getCleanDimensionName(pilotManager.getTargetLocation().getDimensionKey())), true);

common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/ReadoutControl.java

@@ -8,6 +8,8 @@
 import whocraft.tardis_refined.common.tardis.TardisNavLocation;
 import whocraft.tardis_refined.common.tardis.themes.ConsoleTheme;
 import whocraft.tardis_refined.common.util.PlayerUtil;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 import whocraft.tardis_refined.constants.ModMessages;
 
 public class ReadoutControl extends whocraft.tardis_refined.common.tardis.control.Control {
@@ -23,6 +25,9 @@ public ReadoutControl(ResourceLocation id, String langId) {
     public boolean onLeftClick(TardisLevelOperator operator, ConsoleTheme theme, ControlEntity controlEntity, Player player) {
 
         TardisNavLocation currentPosition = operator.getPilotingManager().getCurrentLocation();
+        if (ModCompatChecker.valkyrienSkies()) {
+            currentPosition = VSHelper.toWorldLocation(currentPosition);
+        }
         PlayerUtil.sendMessage(player, Component.translatable(ModMessages.CURRENT).append(" - X: " + currentPosition.getPosition().getX() + " Y: " + currentPosition.getPosition().getY() + " Z: " + currentPosition.getPosition().getZ() + " F: " + currentPosition.getDirection().getName() + " D: " + currentPosition.getDimensionKey().location().getPath()), true);
 
 
@@ -33,6 +38,9 @@ public boolean onLeftClick(TardisLevelOperator operator, ConsoleTheme theme, Con
     public boolean onRightClick(TardisLevelOperator operator, ConsoleTheme theme, ControlEntity controlEntity, Player player) {
 
         TardisNavLocation targetLocation = operator.getPilotingManager().getTargetLocation();
+        if (ModCompatChecker.valkyrienSkies()) {
+            targetLocation = VSHelper.toWorldLocation(targetLocation);
+        }
         PlayerUtil.sendMessage(player, Component.translatable(ModMessages.DESTINATION).append(" - X: " + targetLocation.getPosition().getX() + " Y: " + targetLocation.getPosition().getY() + " Z: " + targetLocation.getPosition().getZ() + " F: " + targetLocation.getDirection().getName() + " D: " + targetLocation.getDimensionKey().location().getPath()), true);
 
         return true;

common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/RotationControl.java

@@ -9,6 +9,8 @@
 import whocraft.tardis_refined.common.tardis.manager.TardisPilotingManager;
 import whocraft.tardis_refined.common.tardis.themes.ConsoleTheme;
 import whocraft.tardis_refined.common.util.PlayerUtil;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 
 public class RotationControl extends whocraft.tardis_refined.common.tardis.control.Control {
     public RotationControl(ResourceLocation id) {
@@ -32,6 +34,9 @@ public boolean onLeftClick(TardisLevelOperator operator, ConsoleTheme theme, Con
     private boolean rotateDir(TardisLevelOperator operator, ConsoleTheme theme, ControlEntity controlEntity, Player player, boolean clockwise) {
         if (!operator.getLevel().isClientSide()) {
             TardisPilotingManager pilotManager = operator.getPilotingManager();
+            if (ModCompatChecker.valkyrienSkies()) {
+                pilotManager.setTargetLocation(VSHelper.toWorldLocation(pilotManager.getTargetLocation()));
+            }
 
             Direction dir = pilotManager.getTargetLocation().getDirection();
             pilotManager.getTargetLocation().setDirection(clockwise ? dir.getClockWise() : dir.getCounterClockWise());

common/src/main/java/whocraft/tardis_refined/common/tardis/control/ship/MonitorControl.java

@@ -17,6 +17,8 @@
 import whocraft.tardis_refined.common.tardis.themes.ConsoleTheme;
 import whocraft.tardis_refined.common.util.MiscHelper;
 import whocraft.tardis_refined.common.util.PlayerUtil;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.valkyrienskies.VSHelper;
 import whocraft.tardis_refined.constants.ModMessages;
 
 public class MonitorControl extends Control {
@@ -56,8 +58,15 @@ public boolean onRightClick(TardisLevelOperator operator, ConsoleTheme theme, Co
                 if (key.interactMonitor(hand, player, controlEntity, player.getUsedItemHand()))
                     isSyncingKey = true;
             }
-            if (!isSyncingKey)
-                new S2COpenMonitor(operator.getInteriorManager().isWaitingToGenerate(), operator.getPilotingManager().getCurrentLocation(), operator.getPilotingManager().getTargetLocation(), operator.getUpgradeHandler(), operator.getAestheticHandler().getShellTheme()).send((ServerPlayer) player);
+            if (!isSyncingKey) {
+                var currentLocation = operator.getPilotingManager().getCurrentLocation();
+                var targetLocation = operator.getPilotingManager().getTargetLocation();
+                if (ModCompatChecker.valkyrienSkies()) {
+                    currentLocation = VSHelper.toWorldLocation(currentLocation);
+                    targetLocation = VSHelper.toWorldLocation(targetLocation);
+                }
+                new S2COpenMonitor(operator.getInteriorManager().isWaitingToGenerate(), currentLocation, targetLocation, operator.getUpgradeHandler(), operator.getAestheticHandler().getShellTheme()).send((ServerPlayer) player);
+            }
             return true;
         }
         return false;