From 9af135b5cee00e76fd19685bd96af19a70bc6fea Mon Sep 17 00:00:00 2001
From: dengr1065 <dengr1065@gmail.com>
Date: Sun, 16 Aug 2020 17:09:25 +0300
Subject: [PATCH] fix everything

---
 src/js/game/component_registry.js     | 3 ---
 src/js/game/systems/item_processor.js | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/js/game/component_registry.js b/src/js/game/component_registry.js
index 8237b566..fed10dce 100644
--- a/src/js/game/component_registry.js
+++ b/src/js/game/component_registry.js
@@ -15,11 +15,8 @@ import { ConstantSignalComponent } from "./components/constant_signal";
 import { LogicGateComponent } from "./components/logic_gate";
 import { LeverComponent } from "./components/lever";
 import { WireTunnelComponent } from "./components/wire_tunnel";
-<<<<<<< HEAD
 import { ProcessingRequirementComponent } from "./components/processing_requirement";
-=======
 import { DisplayComponent } from "./components/display";
->>>>>>> upstream/master
 
 export function initComponentRegistry() {
     gComponentRegistry.register(StaticMapEntityComponent);
diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js
index a20b03cf..d12a95aa 100644
--- a/src/js/game/systems/item_processor.js
+++ b/src/js/game/systems/item_processor.js
@@ -1,5 +1,5 @@
 import { globalConfig } from "../../core/config";
-import { BaseItem, enumItemType } from "../base_item";
+import { BaseItem } from "../base_item";
 import { enumColorMixingResults } from "../colors";
 import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor";
 import { Entity } from "../entity";
@@ -345,7 +345,7 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
                 for (let i = 0; i < 4; ++i) {
                     if (colorItems[i] == null) {
                         skipped[i] = false; // make sure we never insert null item back
-                    } else if (pinValues[i].getItemType() == enumItemType.color) {
+                    } else if (pinValues[i] instanceof ColorItem) {
                         // if pin value is a color, skip anything except that color
                         // but still require any color, because it would not work on
                         // slow factories.