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

and gone

Browse Source
This commit is contained in:
Anuken
2022-05-09 23:50:01 -04:00
parent 95254eef44
commit 6efca04ea8
9 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/Vars.java
View File

@@ -277,7 +277,7 @@ public class Vars implements Loadable{
}
Arrays.sort(locales, Structs.comparing(LanguageDialog::getDisplayName, String.CASE_INSENSITIVE_ORDER));
locales = Seq.with(locales).and(new Locale("router")).toArray(Locale.class);
locales = Seq.with(locales).add(new Locale("router")).toArray(Locale.class);
}
Version.init();

2
core/src/mindustry/content/Blocks.java
View File

@@ -1319,7 +1319,7 @@ public class Blocks{
}});
}
drawer = new DrawMulti(drawers.and(new DrawDefault()));
drawer = new DrawMulti(drawers.add(new DrawDefault()));
craftTime = 60f * 2f;

2
core/src/mindustry/content/TechTree.java
View File

@@ -59,7 +59,7 @@ public class TechTree{
}
public static TechNode nodeProduce(UnlockableContent content, Seq<Objective> objectives, Runnable children){
return node(content, content.researchRequirements(), objectives.and(new Produce(content)), children);
return node(content, content.researchRequirements(), objectives.add(new Produce(content)), children);
}
public static TechNode nodeProduce(UnlockableContent content, Runnable children){

5
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1634,10 +1634,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
if(other == null || !(other.tile.interactable(team))) continue;
//add this tile to proximity of nearby tiles
if(!other.proximity.contains(self(), true)){
other.proximity.add(self());
}
other.proximity.addUnique(self());
tmpTiles.add(other);
}

2
core/src/mindustry/ui/fragments/HintsFragment.java
View File

@@ -27,7 +27,7 @@ public class HintsFragment{
private static final float foutTime = 0.6f;
/** All hints to be displayed in the game. */
public Seq<Hint> hints = new Seq<>().and(DefaultHint.values()).as();
public Seq<Hint> hints = new Seq<>().add(DefaultHint.values()).as();
@Nullable Hint current;
Group group = new WidgetGroup();

2
core/src/mindustry/world/blocks/payloads/PayloadRouter.java
View File

@@ -170,7 +170,7 @@ public class PayloadRouter extends PayloadConveyor{
public void buildConfiguration(Table table){
ItemSelection.buildTable(PayloadRouter.this, table,
content.blocks().select(PayloadRouter.this::canSort).<UnlockableContent>as()
.and(content.units().select(PayloadRouter.this::canSort).as()),
.add(content.units().select(PayloadRouter.this::canSort).as()),
() -> (UnlockableContent)config(), this::configure);
}

2
core/src/mindustry/world/blocks/payloads/PayloadSource.java
View File

@@ -89,7 +89,7 @@ public class PayloadSource extends PayloadBlock{
public void buildConfiguration(Table table){
ItemSelection.buildTable(PayloadSource.this, table,
content.blocks().select(PayloadSource.this::canProduce).<UnlockableContent>as()
.and(content.units().select(PayloadSource.this::canProduce).as()),
.add(content.units().select(PayloadSource.this::canProduce).as()),
() -> (UnlockableContent)config(), this::configure);
}

2
core/src/mindustry/world/consumers/ConsumePayloadFilter.java
View File

@@ -19,7 +19,7 @@ public class ConsumePayloadFilter extends Consume{
public ConsumePayloadFilter(Boolf<UnlockableContent> filter){
this.filter = filter;
this.fitting = Vars.content.blocks().copy().<UnlockableContent>as().and(content.units().as())
this.fitting = Vars.content.blocks().copy().<UnlockableContent>as().add(content.units().as())
.select(filter).toArray(UnlockableContent.class);
}