remove belt underlays component

src/js/game/buildings/balancer.js

@@ -8,7 +8,6 @@ import { GameRoot } from "../root";
 import { enumHubGoalRewards } from "../tutorial_goals";
 import { T } from "../../translations";
 import { formatItemsPerSecond, generateMatrixRotations } from "../../core/utils";
-import { BeltUnderlaysComponent } from "../components/belt_underlays";
 
 /** @enum {string} */
 export const enumBalancerVariants = {
@@ -138,8 +137,6 @@ export class MetaBalancerBuilding extends MetaBuilding {
                 renderFloatingItems: false,
             })
         );
-
-        entity.addComponent(new BeltUnderlaysComponent({ underlays: [] }));
     }
 
     /**
@@ -167,11 +164,6 @@ export class MetaBalancerBuilding extends MetaBuilding {
                     { pos: new Vector(1, 0), direction: enumDirection.top },
                 ]);
 
-                entity.components.BeltUnderlays.underlays = [
-                    { pos: new Vector(0, 0), direction: enumDirection.top },
-                    { pos: new Vector(1, 0), direction: enumDirection.top },
-                ];
-
                 break;
             }
             case enumBalancerVariants.merger:
@@ -195,10 +187,6 @@ export class MetaBalancerBuilding extends MetaBuilding {
                     { pos: new Vector(0, 0), direction: enumDirection.top },
                 ]);
 
-                entity.components.BeltUnderlays.underlays = [
-                    { pos: new Vector(0, 0), direction: enumDirection.top },
-                ];
-
                 break;
             }
             case enumBalancerVariants.splitter:
@@ -224,10 +212,6 @@ export class MetaBalancerBuilding extends MetaBuilding {
                     },
                 ]);
 
-                entity.components.BeltUnderlays.underlays = [
-                    { pos: new Vector(0, 0), direction: enumDirection.top },
-                ];
-
                 break;
             }
             default:

src/js/game/buildings/reader.js

@@ -6,7 +6,6 @@ import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins";
 import { Entity } from "../entity";
 import { MetaBuilding } from "../meta_building";
 import { GameRoot } from "../root";
-import { BeltUnderlaysComponent } from "../components/belt_underlays";
 import { BeltReaderComponent } from "../components/belt_reader";
 import { enumHubGoalRewards } from "../tutorial_goals";
 import { generateMatrixRotations } from "../../core/utils";
@@ -99,17 +98,6 @@ export class MetaReaderBuilding extends MetaBuilding {
             })
         );
 
-        entity.addComponent(
-            new BeltUnderlaysComponent({
-                underlays: [
-                    {
-                        pos: new Vector(0, 0),
-                        direction: enumDirection.top,
-                    },
-                ],
-            })
-        );
-
         entity.addComponent(new BeltReaderComponent());
     }
 }

src/js/game/component_registry.js

@@ -9,7 +9,6 @@ import { UndergroundBeltComponent } from "./components/underground_belt";
 import { HubComponent } from "./components/hub";
 import { StorageComponent } from "./components/storage";
 import { WiredPinsComponent } from "./components/wired_pins";
-import { BeltUnderlaysComponent } from "./components/belt_underlays";
 import { WireComponent } from "./components/wire";
 import { ConstantSignalComponent } from "./components/constant_signal";
 import { LogicGateComponent } from "./components/logic_gate";
@@ -32,7 +31,6 @@ export function initComponentRegistry() {
     gComponentRegistry.register(HubComponent);
     gComponentRegistry.register(StorageComponent);
     gComponentRegistry.register(WiredPinsComponent);
-    gComponentRegistry.register(BeltUnderlaysComponent);
     gComponentRegistry.register(WireComponent);
     gComponentRegistry.register(ConstantSignalComponent);
     gComponentRegistry.register(LogicGateComponent);

src/js/game/components/belt_underlays.js

@@ -1,41 +0,0 @@
-import { enumDirection, Vector } from "../../core/vector";
-import { Component } from "../component";
-
-/**
- * Store which type an underlay is, this is cached so we can easily
- * render it.
- *
- * Full: Render underlay at top and bottom of tile
- * Bottom Only: Only render underlay at the bottom half
- * Top Only:
- * @enum {string}
- */
-export const enumClippedBeltUnderlayType = {
-    full: "full",
-    bottomOnly: "bottomOnly",
-    topOnly: "topOnly",
-    none: "none",
-};
-
-/**
- * @typedef {{
- *   pos: Vector,
- *   direction: enumDirection,
- *   cachedType?: enumClippedBeltUnderlayType
- * }} BeltUnderlayTile
- */
-
-export class BeltUnderlaysComponent extends Component {
-    static getId() {
-        return "BeltUnderlays";
-    }
-
-    /**
-     * @param {object} param0
-     * @param {Array<BeltUnderlayTile>=} param0.underlays Where to render belt underlays
-     */
-    constructor({ underlays = [] }) {
-        super();
-        this.underlays = underlays;
-    }
-}

src/js/game/entity_components.js

@@ -1,6 +1,5 @@
 /* typehints:start */
 import { BeltComponent } from "./components/belt";
-import { BeltUnderlaysComponent } from "./components/belt_underlays";
 import { HubComponent } from "./components/hub";
 import { ItemAcceptorComponent } from "./components/item_acceptor";
 import { ItemEjectorComponent } from "./components/item_ejector";
@@ -60,9 +59,6 @@ export class EntityComponentStorage {
         /** @type {WiredPinsComponent} */
         this.WiredPins;
 
-        /** @type {BeltUnderlaysComponent} */
-        this.BeltUnderlays;
-
         /** @type {WireComponent} */
         this.Wire;
 

src/js/game/systems/acceptor_belt.js

@@ -2,25 +2,12 @@ import { globalConfig } from "../../core/config";
 import { DrawParameters } from "../../core/draw_parameters";
 import { Loader } from "../../core/loader";
 import { Rectangle } from "../../core/rectangle";
-import { FULL_CLIP_RECT } from "../../core/sprites";
 import { enumDirectionToAngle, enumInvertedDirections } from "../../core/vector";
-import { enumClippedBeltUnderlayType } from "../components/belt_underlays";
 import { ItemAcceptorComponent } from "../components/item_acceptor";
 import { GameSystemWithFilter } from "../game_system_with_filter";
 import { MapChunkView } from "../map_chunk_view";
 import { BELT_ANIM_COUNT } from "./belt";
 
-/**
- * Mapping from underlay type to clip rect
- * @type {Object<enumClippedBeltUnderlayType, Rectangle>}
- */
-const enumUnderlayTypeToClipRect = {
-    [enumClippedBeltUnderlayType.none]: null,
-    [enumClippedBeltUnderlayType.full]: FULL_CLIP_RECT,
-    [enumClippedBeltUnderlayType.topOnly]: new Rectangle(0, 0, 1, 0.5),
-    [enumClippedBeltUnderlayType.bottomOnly]: new Rectangle(0, 0.5, 1, 0.5),
-};
-
 export class AcceptorBeltSystem extends GameSystemWithFilter {
     constructor(root) {
         super(root, [ItemAcceptorComponent]);
@@ -86,12 +73,7 @@ export class AcceptorBeltSystem extends GameSystemWithFilter {
                     const worldDirection = staticComp.localDirectionToWorld(direction);
                     const angle = enumDirectionToAngle[enumInvertedDirections[worldDirection]];
 
-                    const underlayType = enumClippedBeltUnderlayType.bottomOnly;
+                    const clipRect = new Rectangle(0, 0.5, 1, 0.5);
-                    const clipRect = enumUnderlayTypeToClipRect[underlayType];
-                    if (!clipRect) {
-                        // Empty
-                        continue;
-                    }
 
                     // Actually draw the sprite
                     const x = destX + globalConfig.halfTileSize;

src/js/game/systems/ejector_belt.js

@@ -2,25 +2,12 @@ import { globalConfig } from "../../core/config";
 import { DrawParameters } from "../../core/draw_parameters";
 import { Loader } from "../../core/loader";
 import { Rectangle } from "../../core/rectangle";
-import { FULL_CLIP_RECT } from "../../core/sprites";
 import { enumDirectionToAngle } from "../../core/vector";
-import { enumClippedBeltUnderlayType } from "../components/belt_underlays";
 import { ItemEjectorComponent } from "../components/item_ejector";
 import { GameSystemWithFilter } from "../game_system_with_filter";
 import { MapChunkView } from "../map_chunk_view";
 import { BELT_ANIM_COUNT } from "./belt";
 
-/**
- * Mapping from underlay type to clip rect
- * @type {Object<enumClippedBeltUnderlayType, Rectangle>}
- */
-const enumUnderlayTypeToClipRect = {
-    [enumClippedBeltUnderlayType.none]: null,
-    [enumClippedBeltUnderlayType.full]: FULL_CLIP_RECT,
-    [enumClippedBeltUnderlayType.topOnly]: new Rectangle(0, 0, 1, 0.5),
-    [enumClippedBeltUnderlayType.bottomOnly]: new Rectangle(0, 0.5, 1, 0.5),
-};
-
 export class EjectorBeltSystem extends GameSystemWithFilter {
     constructor(root) {
         super(root, [ItemEjectorComponent]);
@@ -83,12 +70,7 @@ export class EjectorBeltSystem extends GameSystemWithFilter {
                 const worldDirection = staticComp.localDirectionToWorld(direction);
                 const angle = enumDirectionToAngle[worldDirection];
 
-                const underlayType = enumClippedBeltUnderlayType.topOnly;
+                const clipRect = new Rectangle(0, 0, 1, 0.5);
-                const clipRect = enumUnderlayTypeToClipRect[underlayType];
-                if (!clipRect) {
-                    // Empty
-                    continue;
-                }
 
                 // Actually draw the sprite
                 const x = destX + globalConfig.halfTileSize;