From b8e3a9cd7f1bb40f5b71ce401fd781d85c4712c9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 13 Mar 2026 23:53:13 -0400
Subject: [PATCH] Fixed beam drill speed bar not reflecting power

---
 core/src/mindustry/ui/dialogs/JoinDialog.java     |  8 ++++----
 .../mindustry/world/blocks/logic/CanvasBlock.java | 15 ---------------
 .../world/blocks/production/BeamDrill.java        |  2 +-
 gradle.properties                                 |  2 +-
 settings.gradle                                   | 10 +++++++---
 5 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 0c38dd9ab2..0978a38705 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -439,10 +439,10 @@ public class JoinDialog extends BaseDialog{
                     }
 
                     if(!serverSearch.isEmpty() && !(group.name.toLowerCase().contains(serverSearch)
-                        || res.name.toLowerCase().contains(serverSearch)
-                        || res.description.toLowerCase().contains(serverSearch)
-                        || res.mapname.toLowerCase().contains(serverSearch)
-                        || (res.modeName != null && res.modeName.toLowerCase().contains(serverSearch)))) return;
+                        || Strings.stripColors(res.name.toLowerCase()).contains(serverSearch)
+                        || Strings.stripColors(res.description.toLowerCase()).contains(serverSearch)
+                        || Strings.stripColors(res.mapname.toLowerCase()).contains(serverSearch)
+                        || (res.modeName != null && Strings.stripColors(res.modeName.toLowerCase()).contains(serverSearch)))) return;
 
                     if(groupTable[0] == null){
                         addHeader(groupTable, group, hidden, favorite, true);
diff --git a/core/src/mindustry/world/blocks/logic/CanvasBlock.java b/core/src/mindustry/world/blocks/logic/CanvasBlock.java
index d3ae9c7932..f531f7467c 100644
--- a/core/src/mindustry/world/blocks/logic/CanvasBlock.java
+++ b/core/src/mindustry/world/blocks/logic/CanvasBlock.java
@@ -47,7 +47,6 @@ public class CanvasBlock extends Block{
             if(build.data.length == bytes.length){
                 System.arraycopy(bytes, 0, build.data, 0, bytes.length);
                 build.invalidated = true;
-                build.updateTexture();
             }
         });
     }
@@ -154,13 +153,6 @@ public class CanvasBlock extends Block{
             }
         }
 
-        public void setPixel(int x, int y, int index){
-            if(x >= 0 && y >= 0 && x < canvasSize && y < canvasSize && index >= 0 && index < palette.length){
-                setByte(data, (y * canvasSize + x) * bitsPerPixel, index);
-                invalidated = true;
-            }
-        }
-
         public double getPixel(int pos){
             if(pos >= 0 && pos < canvasSize * canvasSize){
                 return getByte(data, pos * bitsPerPixel);
@@ -168,13 +160,6 @@ public class CanvasBlock extends Block{
             return Double.NaN;
         }
 
-        public int getPixel(int x, int y){
-            if(x >= 0 && y >= 0 && x < canvasSize && y < canvasSize){
-                return getByte(data, (y * canvasSize + x) * bitsPerPixel);
-            }
-            return 0;
-        }
-
         public void updateTexture(){
             if(headless || (texture != null && !invalidated)) return;
 
diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java
index a142f890ea..c3e51ec146 100644
--- a/core/src/mindustry/world/blocks/production/BeamDrill.java
+++ b/core/src/mindustry/world/blocks/production/BeamDrill.java
@@ -248,7 +248,7 @@ public class BeamDrill extends Block{
             float multiplier = Mathf.lerp(1f, optionalBoostIntensity, optionalEfficiency);
             float drillTime = getDrillTime(lastItem);
             boostWarmup = Mathf.lerpDelta(boostWarmup, optionalEfficiency, 0.1f);
-            lastDrillSpeed = (facingAmount * multiplier * timeScale) / drillTime;
+            lastDrillSpeed = (facingAmount * multiplier * timeScale) / drillTime * efficiency;
 
             time += edelta() * multiplier;
 
diff --git a/gradle.properties b/gradle.properties
index 69a7bbb9dd..8e80545bca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=3308db9c34
+archash=1abdd6e4bf
diff --git a/settings.gradle b/settings.gradle
index d16da6d9d3..027d2a3269 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,10 +6,10 @@ include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
 
 def hasSdk = System.getenv("ANDROID_HOME") != null
 
+def localProperties = new Properties()
 if(new File(settingsDir, 'local.properties').exists()){
-	def properties = new Properties()
-	properties.load(new File(settingsDir, 'local.properties').newDataInputStream())
-	if(properties.containsKey("sdk.dir")) hasSdk = true
+    localProperties.load(new File(settingsDir, 'local.properties').newDataInputStream())
+	if(localProperties.containsKey("sdk.dir")) hasSdk = true
 }
 
 if(System.getenv("JITPACK") == "true") hasSdk = false
@@ -20,6 +20,10 @@ if(hasSdk){
     println("No Android SDK found. Skipping Android module.")
 }
 
+if(hasProperty("localRhino") || localProperties.getOrDefault("localRhino", "false") == "true"){
+    includeBuild("../rhino")
+}
+
 if(!hasProperty("noLocalArc")){
     if(new File(rootDir.parent, 'Arc').exists()){
         println("Compiling with localArc")