From be9b7da8926992c7f2121f4ad12a22b6f6820f4e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 11 May 2022 14:36:34 -0400
Subject: [PATCH] Automatic consumeCoolant

---
 core/assets/bundles/bundle.properties                       | 6 +++---
 core/src/mindustry/content/Blocks.java                      | 2 +-
 .../mindustry/world/blocks/defense/turrets/BaseTurret.java  | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 25fd955bec..7ecfacea07 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1992,9 +1992,9 @@ block.plasma-bore.name = Plasma Bore
 block.large-plasma-bore.name = Large Plasma Bore
 block.impact-drill.name = Impact Drill
 block.eruption-drill.name = Eruption Drill
-block.core-bastion.name = Core Bastion
-block.core-citadel.name = Core Citadel
-block.core-acropolis.name = Core Acropolis
+block.core-bastion.name = Core: Bastion
+block.core-citadel.name = Core: Citadel
+block.core-acropolis.name = Core: Acropolis
 block.reinforced-container.name = Reinforced Container
 block.reinforced-vault.name = Reinforced Vault
 block.breach.name = Breach
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index c206af646e..50cd687c4c 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2832,7 +2832,7 @@ public class Blocks{
             health = 250;
             inaccuracy = 2f;
             rotateSpeed = 10f;
-            coolant = consume(new ConsumeCoolant(0.1f));
+            coolant = consumeCoolant(0.1f);
 
             limitRange();
         }};
diff --git a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
index f88f94fa35..a2413de8c1 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
@@ -24,7 +24,6 @@ public class BaseTurret extends Block{
     /** How much reload is lowered by for each unit of liquid of heat capacity. */
     public float coolantMultiplier = 5f;
     /** If not null, this consumer will be used for coolant. */
-    //TODO make automatic for mods?
     public @Nullable ConsumeLiquidBase coolant;
 
     public BaseTurret(String name){
@@ -41,6 +40,10 @@ public class BaseTurret extends Block{
 
     @Override
     public void init(){
+        if(coolant == null){
+            coolant = findConsumer(c -> c instanceof ConsumeCoolant);
+        }
+
         //just makes things a little more convenient
         if(coolant != null){
             //TODO coolant fix