Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-03 03:31:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2026-06-20 20:12:52 -04:00
parent fcf3f83737 24adf22c53
commit a586a34f36
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/AndroidManifest.xml
+7
View File
@@ -31,6 +31,13 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="mindustry"/>
</intent-filter>
</activity>
</application>
core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java
+1
View File
@@ -33,6 +33,7 @@ public class TileableLogicDisplay extends LogicDisplay{
super(name);
displaySize = 32;
allowRectanglePlacement = true;
}
public static void linkDisplays(TileableLogicDisplayBuild start){
core/src/mindustry/world/blocks/units/UnitAssembler.java
+7
View File
@@ -706,6 +706,13 @@ public class UnitAssembler extends PayloadBlock{
return super.sense(sensor);
}
@Override
public boolean acceptUnitPayload(Unit unit){
var plan = plan();
return plan.requirements.contains(b -> b.item == unit.type() &&
blocks.get(unit.type()) < Mathf.round(b.amount * state.rules.unitCost(team)));
}
@Override
public PayloadSeq getPayloads(){
return blocks;
core/src/mindustry/world/meta/StatValues.java
+2 -2
View File
@@ -656,7 +656,7 @@ public class StatValues{
if(blockName != null && t instanceof UnlockableContent){
UnlockableContent content = (UnlockableContent) t;
String key = "block." + blockName + "." + content.name + ".info";
if(Core.bundle.has(key)){
if(Core.bundle.has(key) && !Vars.headless){
bt.table(desc -> {
desc.image(Icon.info.getRegion()).size(20).color(Color.lightGray).scaling(Scaling.fit).padRight(8).padLeft(12);
desc.add("[lightgray]" + Core.bundle.get(key));
@@ -872,7 +872,7 @@ public class StatValues{
private static Cell<?> note(Table table, String text){
table.row();
return table.table(t -> {
t.image(Icon.arrowNoteSmall.getRegion()).size(15).color(Pal.stat).scaling(Scaling.fit).padRight(6).padLeft(12);
if(!Vars.headless) t.image(Icon.arrowNoteSmall.getRegion()).size(15).color(Pal.stat).scaling(Scaling.fit).padRight(6).padLeft(12);
t.add(text);
});
}