From 127ee1a87e0354c090edfdcaaf69b65f44a4c632 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 21 Oct 2022 08:49:04 -0400
Subject: [PATCH] Prevent achievements from completing with dev console open

---
 core/src/mindustry/content/Blocks.java                      | 2 +-
 core/src/mindustry/service/Achievement.java                 | 6 ++++++
 core/src/mindustry/world/consumers/ConsumeLiquidFilter.java | 3 +--
 gradle.properties                                           | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 573aa75423..b92be03a74 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -4499,7 +4499,7 @@ public class Blocks{
                         deathExplosionEffect = Fx.massiveExplosion;
                         shootOnDeath = true;
                         shake = 10f;
-                        bullet = new ExplosionBulletType(60f, 65f){{
+                        bullet = new ExplosionBulletType(620f, 65f){{
                             hitColor = Pal.redLight;
                             shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosion, Fx.scatheLight, new WaveEffect(){{
                                 lifetime = 10f;
diff --git a/core/src/mindustry/service/Achievement.java b/core/src/mindustry/service/Achievement.java
index a959a95640..7faeb19726 100644
--- a/core/src/mindustry/service/Achievement.java
+++ b/core/src/mindustry/service/Achievement.java
@@ -1,5 +1,7 @@
 package mindustry.service;
 
+import arc.util.*;
+
 import static mindustry.Vars.*;
 
 public enum Achievement{
@@ -138,8 +140,12 @@ public enum Achievement{
 
     public void complete(){
         if(!isAchieved()){
+            //can't complete achievements with the dev console shown.
+            if(ui != null && ui.consolefrag != null && ui.consolefrag.shown() && !OS.username.equals("anuke")) return;
+
             service.completeAchievement(name());
             service.storeStats();
+            completed = true;
         }
     }
 
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
index 8e97250fd0..7dbaab7043 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
@@ -33,8 +33,7 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
     public void build(Building build, Table table){
         Seq<Liquid> list = content.liquids().select(l -> !l.isHidden() && filter.get(l));
         MultiReqImage image = new MultiReqImage();
-        list.each(liquid -> image.add(new ReqImage(liquid.uiIcon, () ->
-            build.liquids != null && build.liquids.get(liquid) > 0)));
+        list.each(liquid -> image.add(new ReqImage(liquid.uiIcon, () -> getConsumed(build) == liquid)));
 
         table.add(image).size(8 * 4);
     }
diff --git a/gradle.properties b/gradle.properties
index 2c5768409d..443cbf281e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=8793e01874
+archash=5a1cbb8b59