Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed beam drill speed bar not reflecting power

Browse Source
This commit is contained in:
Anuken
2026-03-13 23:53:13 -04:00
parent 06af1faf5b
commit b8e3a9cd7f
5 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -439,10 +439,10 @@ public class JoinDialog extends BaseDialog{
} }
if(!serverSearch.isEmpty() && !(group.name.toLowerCase().contains(serverSearch) if(!serverSearch.isEmpty() && !(group.name.toLowerCase().contains(serverSearch)
|| res.name.toLowerCase().contains(serverSearch) || Strings.stripColors(res.name.toLowerCase()).contains(serverSearch)
|| res.description.toLowerCase().contains(serverSearch) || Strings.stripColors(res.description.toLowerCase()).contains(serverSearch)
|| res.mapname.toLowerCase().contains(serverSearch) || Strings.stripColors(res.mapname.toLowerCase()).contains(serverSearch)
|| (res.modeName != null && res.modeName.toLowerCase().contains(serverSearch)))) return; || (res.modeName != null && Strings.stripColors(res.modeName.toLowerCase()).contains(serverSearch)))) return;
if(groupTable[0] == null){ if(groupTable[0] == null){
addHeader(groupTable, group, hidden, favorite, true); addHeader(groupTable, group, hidden, favorite, true);

15
core/src/mindustry/world/blocks/logic/CanvasBlock.java
View File

@@ -47,7 +47,6 @@ public class CanvasBlock extends Block{
if(build.data.length == bytes.length){ if(build.data.length == bytes.length){
System.arraycopy(bytes, 0, build.data, 0, bytes.length); System.arraycopy(bytes, 0, build.data, 0, bytes.length);
build.invalidated = true; 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){ public double getPixel(int pos){
if(pos >= 0 && pos < canvasSize * canvasSize){ if(pos >= 0 && pos < canvasSize * canvasSize){
return getByte(data, pos * bitsPerPixel); return getByte(data, pos * bitsPerPixel);
@@ -168,13 +160,6 @@ public class CanvasBlock extends Block{
return Double.NaN; 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(){ public void updateTexture(){
if(headless || (texture != null && !invalidated)) return; if(headless || (texture != null && !invalidated)) return;

2
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@@ -248,7 +248,7 @@ public class BeamDrill extends Block{
float multiplier = Mathf.lerp(1f, optionalBoostIntensity, optionalEfficiency); float multiplier = Mathf.lerp(1f, optionalBoostIntensity, optionalEfficiency);
float drillTime = getDrillTime(lastItem); float drillTime = getDrillTime(lastItem);
boostWarmup = Mathf.lerpDelta(boostWarmup, optionalEfficiency, 0.1f); boostWarmup = Mathf.lerpDelta(boostWarmup, optionalEfficiency, 0.1f);
lastDrillSpeed = (facingAmount * multiplier * timeScale) / drillTime; lastDrillSpeed = (facingAmount * multiplier * timeScale) / drillTime * efficiency;
time += edelta() * multiplier; time += edelta() * multiplier;

2
gradle.properties
View File

@@ -26,4 +26,4 @@ org.gradle.caching=true
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
android.enableR8.fullMode=false android.enableR8.fullMode=false
archash=3308db9c34 archash=1abdd6e4bf

10
settings.gradle
View File

@@ -6,10 +6,10 @@ include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
def hasSdk = System.getenv("ANDROID_HOME") != null def hasSdk = System.getenv("ANDROID_HOME") != null
def localProperties = new Properties()
if(new File(settingsDir, 'local.properties').exists()){ if(new File(settingsDir, 'local.properties').exists()){
def properties = new Properties() localProperties.load(new File(settingsDir, 'local.properties').newDataInputStream())
properties.load(new File(settingsDir, 'local.properties').newDataInputStream()) if(localProperties.containsKey("sdk.dir")) hasSdk = true
if(properties.containsKey("sdk.dir")) hasSdk = true
} }
if(System.getenv("JITPACK") == "true") hasSdk = false if(System.getenv("JITPACK") == "true") hasSdk = false
@@ -20,6 +20,10 @@ if(hasSdk){
println("No Android SDK found. Skipping Android module.") println("No Android SDK found. Skipping Android module.")
} }
if(hasProperty("localRhino") || localProperties.getOrDefault("localRhino", "false") == "true"){
includeBuild("../rhino")
}
if(!hasProperty("noLocalArc")){ if(!hasProperty("noLocalArc")){
if(new File(rootDir.parent, 'Arc').exists()){ if(new File(rootDir.parent, 'Arc').exists()){
println("Compiling with localArc") println("Compiling with localArc")