From 65337f90fc8e18466dcf6bbe701f7e9d5a1af205 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Sun, 5 Jul 2020 18:33:41 +0200
Subject: [PATCH] Fix multiple bugs

---
 src/js/game/buildings/advanced_processor.js | 8 ++++----
 src/js/game/systems/energy_consumer.js      | 6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/js/game/buildings/advanced_processor.js b/src/js/game/buildings/advanced_processor.js
index c1d73827..7166da12 100644
--- a/src/js/game/buildings/advanced_processor.js
+++ b/src/js/game/buildings/advanced_processor.js
@@ -2,14 +2,14 @@ import { formatItemsPerSecond } from "../../core/utils";
 import { enumDirection, Vector } from "../../core/vector";
 import { T } from "../../translations";
 import { enumItemType } from "../base_item";
+import { EnergyConsumerComponent } from "../components/energy_consumer";
 import { ItemAcceptorComponent } from "../components/item_acceptor";
 import { ItemEjectorComponent } from "../components/item_ejector";
 import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor";
+import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins";
 import { Entity } from "../entity";
 import { MetaBuilding } from "../meta_building";
-import { GameRoot, enumLayer } from "../root";
-import { WiredPinsComponent, enumPinSlotType } from "../components/wired_pins";
-import { EnergyConsumerComponent } from "../components/energy_consumer";
+import { enumLayer, GameRoot } from "../root";
 
 export class MetaAdvancedProcessorBuilding extends MetaBuilding {
     constructor() {
@@ -66,7 +66,7 @@ export class MetaAdvancedProcessorBuilding extends MetaBuilding {
             new EnergyConsumerComponent({
                 bufferSize: 3,
                 perCharge: 0.25,
-                batteryPosition: new Vector(4, 6.5),
+                batteryPosition: new Vector(0.63, 0.7),
                 acceptorSlotIndex: 1,
                 ejectorSlotIndex: 1,
             })
diff --git a/src/js/game/systems/energy_consumer.js b/src/js/game/systems/energy_consumer.js
index 9cb989b7..6552fb9a 100644
--- a/src/js/game/systems/energy_consumer.js
+++ b/src/js/game/systems/energy_consumer.js
@@ -72,11 +72,7 @@ export class EnergyConsumerSystem extends GameSystemWithFilter {
         const staticComp = entity.components.StaticMapEntity;
         const consumerComp = entity.components.EnergyConsumer;
 
-        const position = staticComp
-            .getTileSpaceBounds()
-            .getCenter()
-            .toWorldSpace()
-            .add(consumerComp.batteryPosition);
+        const position = staticComp.localTileToWorld(consumerComp.batteryPosition).toWorldSpaceCenterOfTile();
 
         if (consumerComp.hasTooMuchWastePiled()) {
             this.piledWasteSprite.drawCachedCentered(parameters, position.x, position.y, 12);