Add traffic flow and a bunch of small random tweaks

- Autopilot vehicles will stop behind other vehicles
- Auto mechanic table UI now shows tooltips for missing items in a recipe
- You can extract items out of vehicles with hoppers
- Invulnerable mobs will stay in the driver seat of a car even if another player gets on
- More appropriate automobile frustum culling

Author: FoundationGames

README.md

@@ -4,14 +4,18 @@
 **Automobility is currently in BETA!** <br/>
 The mod isn't feature-complete, and any feature requests would be greatly appreciated. Discuss features on the mod's GitHub Discussions page, or in the [Discord](https://discord.gg/7Aw3y4RtY9).
 
-## Available for Fabric/Quilt and Forge
-- Requires **[Fabric API](https://modrinth.com/mod/fabric-api)** (Fabric) or **[QSL](https://modrinth.com/mod/qsl)** (Quilt)
-- No additional mods required for Forge
+## Available for Fabric and NeoForge
+- Requires **[Fabric API](https://modrinth.com/mod/fabric-api)** (Fabric)
+- No additional mods required for NeoForge
 
-**Currently maintained for version 1.19.2, older versions are retired.**
+**Currently maintained for version 1.21.1, older versions are retired.**
+
+### Supports Data Packs and Resource Packs
+- Add your own custom vehicle types with data packs and resource packs! 
+- Here is an [example](https://github.com/FoundationGames/City-Vehicles-Example-Addon) that you can use as a template.
 
 ## Getting Started
-- **Recipes:** Crafting recipes can be viewed using [**EMI**](https://www.curseforge.com/minecraft/mc-mods/emi) (Fabric/Quilt) or [**JEI**](https://www.curseforge.com/minecraft/mc-mods/jei) (Forge).
+- **Recipes:** Crafting table recipes can be viewed using [**EMI**](https://www.curseforge.com/minecraft/mc-mods/emi) or [**JEI**](https://www.curseforge.com/minecraft/mc-mods/jei). Automobile part recipes are viewed in the Auto Mechanic Table's GUI.
 - **Automobile Parts:** Craft an Auto Mechanic Table. Use the GUI to craft the frame, engine, and wheels for your automobile. You can optionally craft an attachment.
 - **Building your Automobile:** Craft an Automobile Assembler, as well as a Crowbar. Place parts on the assembler until the vehicle is complete. Use a crowbar to destroy the vehicle.
 - **Enhancing your Automobile:** Use your Auto Mechanic Table to craft attachments, which can be placed on your Automobile to add exciting functionality or utility.
@@ -26,7 +30,7 @@ The mod isn't feature-complete, and any feature requests would be greatly apprec
 - A/D - Steer left/right
 - Space - Drift/Deploy
 
-**Controller Support (*Fabric and Quilt Exclusive*):** when using [MidnightControls](https://www.curseforge.com/minecraft/mc-mods/midnightcontrols), you will be able to control automobiles with the following default controls:
+**Controller Support (*Fabric Exclusive*):** when using [Controlify](https://modrinth.com/mod/controlify), you will be able to control automobiles with the following default controls:
 - A - Accelerate
 - B - Brake/Reverse
 - LStick - Steer left/right

common/src/main/java/io/github/foundationgames/automobility/automobile/attachment/front/AutopilotFrontAttachment.java

@@ -3,10 +3,14 @@
 import io.github.foundationgames.automobility.automobile.attachment.FrontAttachmentType;
 import io.github.foundationgames.automobility.block.AutopilotSignBlock;
 import io.github.foundationgames.automobility.entity.AutomobileEntity;
+import io.github.foundationgames.automobility.entity.HitboxEntity;
+import io.github.foundationgames.automobility.item.AutopilotSignBlockItem;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
@@ -15,7 +19,6 @@ public class AutopilotFrontAttachment extends FrontAttachment {
     public static final int MAX_HEADING_COMMAND_TIME = 6000;
 
     private @Nullable AutopilotSignBlock.Heading currentHeading = null;
-    private int playerStopTimer = 0;
     private int headingTimeLimit = 0;
     private int animationTimer = 0;
 
@@ -38,28 +41,57 @@ public void provideAlternativeInputs(AutomobileEntity automobile, AutomobileEnti
         if (currentHeading == null) {
             input.clearInputs();
         } else {
+            var dirHeading = automobile.getLookAngle();
+            boolean somethingInTheWay = false;
+
+            double width = 0.8 * automobile.getBbWidth();
+            var box = new AABB(-width, -2, -width, width, 4, width);
+            box = box.move(pos().add(dirHeading.scale(1 + 1.75 * width)));
+
+            for (var e : world().getEntitiesOfClass(HitboxEntity.class, box)) {
+                if (!automobile.isOneOfMyHitboxes(e) && (!automobile.isInvulnerable() || e.automobile().isInvulnerable())) {
+                    somethingInTheWay = true;
+                    break;
+                }
+            }
+
+            if (!somethingInTheWay) for (var e : world().getEntitiesOfClass(LivingEntity.class, box.inflate(1.25))) {
+                if (e.isUsingItem() && e.getItemInHand(e.getUsedItemHand()).getItem() instanceof AutopilotSignBlockItem) {
+                    var eLooking = e.getLookAngle();
+                    var meToE = e.position().subtract(pos()).normalize();
+
+                    if (eLooking.dot(meToE) < 0) {
+                        somethingInTheWay = true;
+                        break;
+                    }
+                }
+            }
+
             var autoPos = autoPos();
             var autoMovement = automobile.getMeasuredMovement();
 
             var dirAlongPath = currentHeading.dir();
-            var dirHeading = automobile.getLookAngle();
+            double offCosine = dirHeading.dot(dirAlongPath);
 
             var pathToPath = currentHeading.pathToPath(autoPos);
             double distToPath = pathToPath.length();
 
             var dirToPath = pathToPath.normalize();
-            double autoSpeedIntoPath = currentHeading.stop() ? autoMovement.length() : Math.max(0, -autoMovement.dot(dirToPath));
+            double autoSpeedIntoPath = currentHeading.stop() || somethingInTheWay ? autoMovement.length() : Math.max(0, -autoMovement.dot(dirToPath));
 
             double favorDirToPath = Math.clamp(distToPath * 0.1, 0, 1);
 
-            if (this.playerStopTimer > 0 || (
-                    currentHeading.stop() && currentHeading.origin().distanceToSqr(autoPos) < 25 + 100 * autoMovement.lengthSqr())) {
-                input.accelerating = false;
-                input.braking = autoSpeedIntoPath > distToPath * 0.2;
+            boolean burnout;
+            if (somethingInTheWay || (
+                    currentHeading.stop() && currentHeading.origin().distanceToSqr(autoPos) < 25 + 49 * autoMovement.lengthSqr())) {
+                burnout = offCosine > 0 && automobile.getTurboCharge() < AutomobileEntity.SMALL_TURBO_TIME - 5;
+                input.accelerating = burnout;
+                input.braking = burnout || autoSpeedIntoPath > 0.2;
                 favorDirToPath = Math.sqrt(favorDirToPath);
             } else {
-                input.accelerating = autoSpeedIntoPath * autoSpeedIntoPath * distToPath * distToPath < 6;
-                input.braking = false;
+                burnout = automobile.burningOut() ? offCosine > -0.8 : offCosine > 0.2;
+                input.accelerating = burnout || autoSpeedIntoPath * autoSpeedIntoPath * distToPath * distToPath < 5 + (2 / automobile.getHandling());
+                input.braking = burnout;
             }
 
             var dirHeadingF = dirHeading.toVector3f().mul(1, 0, 1);
@@ -68,9 +100,11 @@ public void provideAlternativeInputs(AutomobileEntity automobile, AutomobileEnti
             double headingToPathDir = dirHeadingF.angleSigned(dirDesiredHeadingF, new Vector3f(0, 1, 0)) / Mth.HALF_PI;
             input.steering = (float) Math.clamp(headingToPathDir, -1, 1);
 
-            float offset = (float) dirAlongPath.cross(dirHeading).length();
-            float damp = (float) Mth.clamp(Math.abs(distToPath * 0.2) + Math.sqrt(offset), 0, 1);
-            input.steering *= damp * damp;
+            if (!burnout) {
+                float offset = (float) dirAlongPath.cross(dirHeading).length();
+                float damp = (float) Mth.clamp(Math.abs(distToPath * 0.2) + Math.sqrt(offset), 0, 1);
+                input.steering *= damp * damp;
+            }
         }
     }
 
@@ -92,10 +126,6 @@ public void notifyHeadingCommand(AutopilotSignBlock.Heading heading) {
         }
     }
 
-    public void notifyPlayerStop() {
-        this.playerStopTimer = 8;
-    }
-
     @Override
     public void tick() {
         super.tick();
@@ -119,10 +149,6 @@ public void tick() {
                     this.currentHeading = null;
                 }
             }
-
-            if (this.playerStopTimer > 0) {
-                this.playerStopTimer--;
-            }
         }
 
         this.animationTimer++;
@@ -141,7 +167,6 @@ public void writeNbt(CompoundTag nbt, HolderLookup.Provider registry) {
         }
 
         nbt.putInt("timeout", this.headingTimeLimit);
-        nbt.putInt("player_stop_time", this.playerStopTimer);
     }
 
     @Override
@@ -155,7 +180,6 @@ public void readNbt(CompoundTag nbt, HolderLookup.Provider reg) {
         }
 
         this.headingTimeLimit = nbt.getInt("timeout");
-        this.playerStopTimer = nbt.getInt("player_stop_time");
     }
 
     public int getAnimationTimer() {

common/src/main/java/io/github/foundationgames/automobility/block/AutomobilePressurePlateBlock.java

@@ -2,6 +2,7 @@
 
 import com.mojang.serialization.MapCodec;
 import io.github.foundationgames.automobility.entity.AutomobileEntity;
+import io.github.foundationgames.automobility.entity.HitboxEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.PressurePlateBlock;
@@ -16,6 +17,9 @@ public AutomobilePressurePlateBlock(Properties properties) {
 
     @Override
     protected int getSignalStrength(Level level, BlockPos pos) {
-        return getEntityCount(level, TOUCH_AABB.move(pos), AutomobileEntity.class) > 0 ? 15 : 0;
+        var box = TOUCH_AABB.move(pos);
+        return getEntityCount(level, box, AutomobileEntity.class) +
+                getEntityCount(level, box, HitboxEntity.class)
+                > 0 ? 15 : 0;
     }
 }

common/src/main/java/io/github/foundationgames/automobility/block/AutopilotSignBlock.java

@@ -185,7 +185,7 @@ public Heading getHeading(BlockState state, BlockPos pos) {
     }
 
     public double getDetectBoxOffset(BlockState state) {
-        return state.getValue(TYPE).standing() ? 6 : 1.5;
+        return state.getValue(TYPE).standing() ? 7.5 : 2;
     }
 
     @Override

common/src/main/java/io/github/foundationgames/automobility/block/entity/AutopilotSignBlockEntity.java

@@ -25,7 +25,7 @@ public static void tick(Level level, BlockPos pos, BlockState state, AutopilotSi
             sign.broadcastDelay = BROADCAST_INTERVAL;
 
             if (state.getBlock() instanceof AutopilotSignBlock block) {
-                var box = new AABB(-16, -1.5, -16, 16, 1.5, 16);
+                var box = new AABB(-16, -2, -16, 16, 2, 16);
                 var heading = block.getHeading(state, pos);
 
                 var boxOrigin = heading.planeOrigin().add(heading.limitPlane().scale(block.getDetectBoxOffset(state)));