and gone

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();

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;
 

core/src/mindustry/content/TechTree.java

@@ -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){

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
+            other.proximity.addUnique(self());
-            if(!other.proximity.contains(self(), true)){
-                other.proximity.add(self());
-            }
 
             tmpTiles.add(other);
         }

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<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();

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).<UnlockableContent>as()
-                .and(content.units().select(PayloadRouter.this::canSort).as()),
+                .add(content.units().select(PayloadRouter.this::canSort).as()),
                 () -> (UnlockableContent)config(), this::configure);
         }
 

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).<UnlockableContent>as()
-                .and(content.units().select(PayloadSource.this::canProduce).as()),
+                .add(content.units().select(PayloadSource.this::canProduce).as()),
             () -> (UnlockableContent)config(), this::configure);
         }
 

core/src/mindustry/world/consumers/ConsumePayloadFilter.java

@@ -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);
     }
 

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