fix: prevent footprints from being placed without a block beneath them

Author: Roelymole

src/main/java/dev/galacticraft/mod/misc/footprint/Footprint.java

@@ -84,33 +84,6 @@ public static Vector3d getFootprintPosition(Level level, float rotation, Vector3
         int mainPosX = Mth.floor(position.x());
         int mainPosY = Mth.floor(position.y());
         int mainPosZ = Mth.floor(position.z());
-        BlockPos posMain = new BlockPos(mainPosX, mainPosY, mainPosZ);
-
-        // If the footprint is hovering over air...
-        if (level.getBlockState(posMain).isAir()) {
-            position.x += (playerCenter.x - mainPosX);
-            position.z += (playerCenter.z - mainPosZ);
-
-            BlockPos pos1 = new BlockPos(Mth.floor(position.x()), Mth.floor(position.y()), Mth.floor(position.z()));
-            // If the footprint is still over air....
-            BlockState b2 = level.getBlockState(pos1);
-            if (b2.isAir()) {
-                for (Direction direction : Direction.values()) {
-                    BlockPos offsetPos = posMain.relative(direction);
-                    if (direction != Direction.DOWN && direction != Direction.UP) {
-                        if (!level.getBlockState(offsetPos).isAir()) {
-                            position.x += direction.getStepX();
-                            position.z += direction.getStepZ();
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        mainPosX = Mth.floor(position.x());
-        mainPosZ = Mth.floor(position.z());
-        ;
 
         double x0 = (Math.sin((45 - rotation) / Constant.RADIANS_TO_DEGREES) * footprintScale) + position.x;
         double x1 = (Math.sin((135 - rotation) / Constant.RADIANS_TO_DEGREES) * footprintScale) + position.x;

src/main/java/dev/galacticraft/mod/mixin/EntityMixin.java

@@ -202,43 +202,43 @@ private void tickFootprints(MoverType type, Vec3 motion, CallbackInfo ci) {
         if ((Object) this instanceof Player player)
             isFlying = player.getAbilities().flying;
         if (motionSqrd > 0.001 && this.level.dimensionTypeRegistration().is(GCTags.FOOTPRINTS_DIMENSIONS) && getVehicle() == null && !isFlying) {
-            int iPosX = Mth.floor(getX());
-            int iPosY = Mth.floor(getY() - 0.05);
-            int iPosZ = Mth.floor(getZ());
-            BlockPos pos1 = new BlockPos(iPosX, iPosY, iPosZ);
-            BlockState state = this.level.getBlockState(pos1);
-
-            // If the block below is the moon block
-            if (state.is(GCTags.FOOTPRINTS)) {
-                // If it has been long enough since the last step
-                if (galacticraft$getDistanceSinceLastStep() > 0.35) {
-                    Vector3d pos = new Vector3d(getX(), getY(), getZ());
-                    // Set the footprint position to the block below and add
-                    // random number to stop z-fighting
-                    pos.y = Mth.floor(getY()) + random.nextFloat() / 100.0F;
-
-                    // Adjust footprint to left or right depending on step
-                    // count
-                    switch (galacticraft$getLastStep()) {
-                        case 0:
-                            pos.add(new Vector3d(Math.sin(Math.toRadians(-getYRot() + 90)) * 0.25, 0, Math.cos(Math.toRadians(-getYRot() + 90)) * 0.25));
-                            break;
-                        case 1:
-                            pos.add(new Vector3d(Math.sin(Math.toRadians(-getYRot() - 90)) * 0.25, 0, Math.cos(Math.toRadians(-getYRot() - 90)) * 0.25));
-                            break;
-                    }
-
-                    pos = Footprint.getFootprintPosition(level, getYRot() - 180, pos, position());
+            // If it has been long enough since the last step
+            if (galacticraft$getDistanceSinceLastStep() > 0.35) {
+                Vector3d pos = new Vector3d(getX(), getY(), getZ());
+                // Set the footprint position to the block below and add
+                // random number to stop z-fighting
+                pos.y = Mth.floor(getY()) + random.nextFloat() / 100.0F;
+
+                // Adjust footprint to left or right depending on step
+                // count
+                switch (galacticraft$getLastStep()) {
+                    case 0:
+                        pos.add(new Vector3d(Math.sin(Math.toRadians(-getYRot() + 90)) * 0.25, 0, Math.cos(Math.toRadians(-getYRot() + 90)) * 0.25));
+                        break;
+                    case 1:
+                        pos.add(new Vector3d(Math.sin(Math.toRadians(-getYRot() - 90)) * 0.25, 0, Math.cos(Math.toRadians(-getYRot() - 90)) * 0.25));
+                        break;
+                }
+
+                pos = Footprint.getFootprintPosition(level, getYRot() - 180, pos, position());
+
+                int iPosX = Mth.floor(pos.x);
+                int iPosY = Mth.floor(pos.y - 0.05);
+                int iPosZ = Mth.floor(pos.z);
+                BlockPos blockPos = new BlockPos(iPosX, iPosY, iPosZ);
+                BlockState state = this.level.getBlockState(blockPos);
 
+                // If the block below is the moon block
+                if (state.is(GCTags.FOOTPRINTS)) {
                     long chunkKey = ChunkPos.asLong(SectionPos.blockToSectionCoord(pos.x), SectionPos.blockToSectionCoord(pos.z));
                     level.galacticraft$getFootprintManager().addFootprint(chunkKey, new Footprint(level.dimensionTypeRegistration().unwrapKey().get().location(), pos, getYRot(), getUUID()));
-
-                    // Increment and cap step counter at 1
-                    galacticraft$setLastStep((galacticraft$getLastStep() + 1) % 2);
-                    galacticraft$setDistanceSinceLastStep(0);
-                } else {
-                    galacticraft$setDistanceSinceLastStep(galacticraft$getDistanceSinceLastStep() + motionSqrd);
                 }
+
+                // Increment and cap step counter at 1
+                galacticraft$setLastStep((galacticraft$getLastStep() + 1) % 2);
+                galacticraft$setDistanceSinceLastStep(0);
+            } else {
+                galacticraft$setDistanceSinceLastStep(galacticraft$getDistanceSinceLastStep() + motionSqrd);
             }
         }
     }