diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java index 24c3f0e4f0..6c4bbea92a 100644 --- a/core/src/mindustry/entities/EntityGroup.java +++ b/core/src/mindustry/entities/EntityGroup.java @@ -125,7 +125,7 @@ public class EntityGroup implements Iterable{ entitiesToAdd.clear(); for(T e : entitiesToRemove){ - entityArray.removeValue(e, true); + entityArray.remove(e, true); if(map != null){ map.remove(e.getID()); } @@ -148,7 +148,7 @@ public class EntityGroup implements Iterable{ }else{ //maybe it's being queued? for(T check : entitiesToAdd){ if(check.getID() == id){ //if it is indeed queued, remove it - entitiesToAdd.removeValue(check, true); + entitiesToAdd.remove(check, true); if(removeListener != null){ removeListener.get(check); } diff --git a/core/src/mindustry/entities/effect/ItemTransfer.java b/core/src/mindustry/entities/effect/ItemTransfer.java index 2018d15a69..e0f0c39cb0 100644 --- a/core/src/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/mindustry/entities/effect/ItemTransfer.java @@ -28,8 +28,7 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{ private Position to; private Runnable done; - public ItemTransfer(){ - } + public ItemTransfer(){} @Remote(called = Loc.server, unreliable = true) public static void transferItemEffect(Item item, float x, float y, Unit to){ diff --git a/core/src/mindustry/entities/type/TileEntity.java b/core/src/mindustry/entities/type/TileEntity.java index d83c038e70..0814a4ce58 100644 --- a/core/src/mindustry/entities/type/TileEntity.java +++ b/core/src/mindustry/entities/type/TileEntity.java @@ -204,7 +204,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ other.block().onProximityUpdate(other); if(other.entity != null){ - other.entity.proximity.removeValue(tile, true); + other.entity.proximity.remove(tile, true); } } } diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java index cd3389d1f0..09f09f122a 100644 --- a/core/src/mindustry/game/Saves.java +++ b/core/src/mindustry/game/Saves.java @@ -311,7 +311,7 @@ public class Saves{ public void delete(){ file.delete(); - saves.removeValue(this, true); + saves.remove(this, true); if(this == current){ current = null; } diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 177ecd78b2..5c8619df48 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -156,7 +156,7 @@ public class MobileInput extends InputHandler implements GestureListener{ } void removeRequest(BuildRequest request){ - selectRequests.removeValue(request, true); + selectRequests.remove(request, true); if(!request.breaking){ removals.add(request); } diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 68c6db1edb..cfd3423608 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -190,7 +190,7 @@ public class Administration{ } } - bannedIPs.removeValue(ip, false); + bannedIPs.remove(ip, false); if(found){ save(); diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 429b27f5fb..4b5b31fe08 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -157,7 +157,7 @@ public class JoinDialog extends FloatingDialog{ inner.addImageButton(Icon.trash, Styles.emptyi, () -> { ui.showConfirm("$confirm", "$server.delete", () -> { - servers.removeValue(server, true); + servers.remove(server, true); saveServers(); setupRemote(); refreshRemote(); diff --git a/gradle.properties b/gradle.properties index 02a2b77c2a..e54e317005 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=45ffc0ea35fa7c282538259daf247eabfc987acf +archash=1817bb22ac7680700fe780816940f4217a1f7e07