From 5721cc75b6a94923d3c715fde38db45f79538441 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 18 Apr 2022 17:22:47 -0400
Subject: [PATCH] Mod load fixes

---
 core/assets/scripts/base.js                            | 3 ---
 core/assets/scripts/global.js                          | 3 ---
 core/src/mindustry/mod/ContentParser.java              | 2 +-
 core/src/mindustry/world/Block.java                    | 2 +-
 core/src/mindustry/world/consumers/ConsumeCoolant.java | 4 ++++
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js
index d97e6aa8f2..3481c74309 100755
--- a/core/assets/scripts/base.js
+++ b/core/assets/scripts/base.js
@@ -46,6 +46,3 @@ function extend(/*Base, ..., def*/){
     }
     return instance
 }
-
-//For backwards compatibility, use extend instead
-const extendContent = extend;
diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js
index 0a65252edc..b35d1b18ec 100755
--- a/core/assets/scripts/global.js
+++ b/core/assets/scripts/global.js
@@ -49,9 +49,6 @@ function extend(/*Base, ..., def*/){
     return instance
 }
 
-//For backwards compatibility, use extend instead
-const extendContent = extend;
-
 importPackage(Packages.arc)
 importPackage(Packages.arc.audio)
 importPackage(Packages.arc.func)
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 052f9dc0a2..d51320aad0 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -137,7 +137,7 @@ public class ContentParser{
             }
             var bc = resolve(data.getString("type", ""), DrawDefault.class);
             data.remove("type");
-            var result = make(bc);
+            DrawBlock result = make(bc);
             readFields(result, data);
             return result;
         });
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 17ddff9dc7..369ce5fe73 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -313,7 +313,7 @@ public class Block extends UnlockableContent implements Senseable{
     /** Configuration handlers by type. */
     public ObjectMap<Class<?>, Cons2> configurations = new ObjectMap<>();
     /** Consumption filters. */
-    public boolean[] itemFilter, liquidFilter;
+    public boolean[] itemFilter = {}, liquidFilter = {};
     /** Array of consumers used by this block. Only populated after init(). */
     public Consume[] consumers = {}, optionalConsumers = {}, nonOptionalConsumers = {}, updateConsumers = {};
     /** Set to true if this block has any consumers in its array. */
diff --git a/core/src/mindustry/world/consumers/ConsumeCoolant.java b/core/src/mindustry/world/consumers/ConsumeCoolant.java
index f6b1e17d65..f59557facb 100644
--- a/core/src/mindustry/world/consumers/ConsumeCoolant.java
+++ b/core/src/mindustry/world/consumers/ConsumeCoolant.java
@@ -8,4 +8,8 @@ public class ConsumeCoolant extends ConsumeLiquidFilter{
         this.filter = liquid -> liquid.coolant && liquid.temperature <= maxTemp && liquid.flammability < maxFlammability;
         this.amount = amount;
     }
+
+    public ConsumeCoolant(){
+        this(1f);
+    }
 }