From 2bfe0c30ec3e552d1e2bdbf3c694c9a04773e66a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 17 Jun 2020 12:17:29 -0400
Subject: [PATCH] Cleanup

---
 .../sprites/blocks/units/resupply-point.png      | Bin 0 -> 1161 bytes
 core/src/mindustry/game/Rules.java               |   2 +-
 .../mindustry/ui/dialogs/CustomRulesDialog.java  |   6 ++----
 gradle.properties                                |   2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/units/resupply-point.png

diff --git a/core/assets-raw/sprites/blocks/units/resupply-point.png b/core/assets-raw/sprites/blocks/units/resupply-point.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6d9d52572356c942d652f248b4601d901f18197
GIT binary patch
literal 1161
zcmV;41a|w0P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(LrFwIRCt{2TRm!<K@c4&N?~G*9S~Tc!U3ldDFV5G-MC3%lS8;PK7x)A(#3}e
zahpcDK)N6Zs8AuWKoEyuLOQ1~BUY=K*_qv0$%4E}X#eKD{hQfuw*d-#{_^#nOFQih
z#In~n$C@Tsl+=HAa@0uGpUfbUN7NF*qu!JVVxopT!dnE-`Xmw91PghDm(evw6ej}t
zr$l}_o`?;->wXv0KTTd$Ex&)zWz#4Tn(-eOm;HN=WQx4TK#5=}c>vi)s$&-vxw!1l
zGxU0g3u<b}hp>|IARj_I66QZb@(2_`OMW;UnT*UuuXm`*rxBq6K$EvNwkq-nFA*A>
zNFL!K!qOsWt$bbNEp1Cvm=s_W$XjjTL}<l-c#w~Gkd$M?A#`}A;|bg5a5z%gJsnS$
zrUN?#auJgU$n)IdGW!Qzk!0>@Gz+kQ&}EIG$RjKwaCvKpU=koC7aJpyM`%Py<?$Aw
zdA>JOWu(ZVF&gp+iJ*3rc!_Y@89Xe4=X*1_x^0UMmLOh%KaO8AIT!Ou?P6N)!iWp=
zd<t+QK{5hY=HYO}ZZp;x!csPOB!s)t!Ws~ZpdlYN78_hbUR#G%gm_C{S_D&385%{Y
z8;amTK5S1yN(2POjobw!5hRBMfF21RC>4R@#BPIJfz%4C^(1qk5rKl#p{|}_P4Wou
z(bc-TZL>Ro1s<U(fQ}&L)92v&=J;U*NIpOeN-Qt(+B^WXP?n$zov!&5C>0?EOONIB
zZVq{XXbq?(LJlEInOyP!#3E=pebtCiGFLTaE#xU~<SyVXLM@b%2N1SF>pA>mhQ!7F
zL}=6SUx0NRux^-RflY)t7O;@F_zvE%9JH#VL2vRkPlN!<MG#MfBv^VrM+8e5iwNwA
zP%ZKZ3!xmraz$tYl#}=PNNLFfK)cB~BDB0*S<CmiQh1yN06d7`>IbaiYq1x3ggF*S
z^>R%Sa!-@Yv4B)Sa|B&Ogw$zs>a<!N4QismRf~XiaU!J1Ba-I<@d_^~zA6#oI${x0
z<YODz6CrMIU#AGthtKJFVkVCWMQ8z}9UJKwI`x&7O5?U(&$uGhG1oW8aM~Hblh*6E
z{V<{3eohv+`}G^PcX!CN?cE*NdfI~7>}S$2$?tfx^#{KFeU_{P?;~*SO5{ThKki=G
z{D9KwpmDlVdE(0$)J+u&mTrlqkUJeL9w&EUgS&}R;v8jpg4U6c<8H@gEZ1->Ag{`L
ze(G8UN&+Zy1b9YwwNXMIK$rrXAVMj50LSa{tDX)X<j+oy8chIz5AXZz<Eh6u5-blm
zxV#GwCJ-JY0kQ5UGhxTYI|%t?2H_z>E*UQos8Nd|#4pE|7Qxc#P(q^gNgaS3KvB=;
zShCVc;E-~7w84&7Jt4S`6`#&pMDRA+vp#85Cm&C1M5xhYUiC`k0TcoN$RgAt?@@n>
bJOIEy0gA5vC5cT400000NkvXXu0mjf`=I{P

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 0c47e1dea0..4848cf6013 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -73,7 +73,7 @@ public class Rules{
     /** Spawn layout. */
     public Seq<SpawnGroup> spawns = new Seq<>();
     /** Starting items put in cores */
-    public Seq<ItemStack> loadout = Seq.with(ItemStack.with(Items.copper, 100));
+    public Seq<ItemStack> loadout = ItemStack.list(Items.copper, 100);
     /** Weather events that occur here. */
     public Seq<WeatherEntry> weather = new Seq<>(1);
     /** Blocks that cannot be placed. */
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index 2dfba3a9aa..0cb44eca5c 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -144,10 +144,8 @@ public class CustomRulesDialog extends BaseDialog{
 
         main.button("$configure",
             () -> loadoutDialog.show(Blocks.coreShard.itemCapacity, rules.loadout,
-                () -> {
-                    rules.loadout.clear();
-                    rules.loadout.add(new ItemStack(Items.copper, 100));
-                }, () -> {}, () -> {}
+                () -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
+                () -> {}, () -> {}
         )).left().width(300f);
         main.row();
 
diff --git a/gradle.properties b/gradle.properties
index 0e60468f69..a4bf351bc2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=f76b0c94953c07ef2ac40858b3b615a34911bdf7
+archash=bae3e678b96297aed5ca6dbaabcc652da62fa904