From 6efca04ea858f40621a3409699d8a6a9ddbe4206 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 9 May 2022 23:50:01 -0400 Subject: [PATCH] and gone --- core/src/mindustry/Vars.java | 2 +- core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/content/TechTree.java | 2 +- core/src/mindustry/entities/comp/BuildingComp.java | 5 +---- core/src/mindustry/ui/fragments/HintsFragment.java | 2 +- core/src/mindustry/world/blocks/payloads/PayloadRouter.java | 2 +- core/src/mindustry/world/blocks/payloads/PayloadSource.java | 2 +- core/src/mindustry/world/consumers/ConsumePayloadFilter.java | 2 +- gradle.properties | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 72558aecaf..b0f98ae7df 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -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(); diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2d64b94e18..64cf213316 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1319,7 +1319,7 @@ public class Blocks{ }}); } - drawer = new DrawMulti(drawers.and(new DrawDefault())); + drawer = new DrawMulti(drawers.add(new DrawDefault())); craftTime = 60f * 2f; diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 8bf2934a66..e8a64bc168 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -59,7 +59,7 @@ public class TechTree{ } public static TechNode nodeProduce(UnlockableContent content, Seq 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){ diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 04d8467e8d..e0948e5503 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -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); } diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java index 98cc83008f..2101ed15fb 100644 --- a/core/src/mindustry/ui/fragments/HintsFragment.java +++ b/core/src/mindustry/ui/fragments/HintsFragment.java @@ -27,7 +27,7 @@ public class HintsFragment{ private static final float foutTime = 0.6f; /** All hints to be displayed in the game. */ - public Seq hints = new Seq<>().and(DefaultHint.values()).as(); + public Seq hints = new Seq<>().add(DefaultHint.values()).as(); @Nullable Hint current; Group group = new WidgetGroup(); diff --git a/core/src/mindustry/world/blocks/payloads/PayloadRouter.java b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java index 9f6c671985..9fa5778c18 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadRouter.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java @@ -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).as() - .and(content.units().select(PayloadRouter.this::canSort).as()), + .add(content.units().select(PayloadRouter.this::canSort).as()), () -> (UnlockableContent)config(), this::configure); } diff --git a/core/src/mindustry/world/blocks/payloads/PayloadSource.java b/core/src/mindustry/world/blocks/payloads/PayloadSource.java index 646744865c..8905d3fed3 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadSource.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadSource.java @@ -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).as() - .and(content.units().select(PayloadSource.this::canProduce).as()), + .add(content.units().select(PayloadSource.this::canProduce).as()), () -> (UnlockableContent)config(), this::configure); } diff --git a/core/src/mindustry/world/consumers/ConsumePayloadFilter.java b/core/src/mindustry/world/consumers/ConsumePayloadFilter.java index 79d6b6610a..e43fc41a1c 100644 --- a/core/src/mindustry/world/consumers/ConsumePayloadFilter.java +++ b/core/src/mindustry/world/consumers/ConsumePayloadFilter.java @@ -19,7 +19,7 @@ public class ConsumePayloadFilter extends Consume{ public ConsumePayloadFilter(Boolf filter){ this.filter = filter; - this.fitting = Vars.content.blocks().copy().as().and(content.units().as()) + this.fitting = Vars.content.blocks().copy().as().add(content.units().as()) .select(filter).toArray(UnlockableContent.class); } diff --git a/gradle.properties b/gradle.properties index 7b9f383456..e64ccbfbc4 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=91ad25c9f9 +archash=b851f88b09