From c4dc6511fd1044d5a33a7bf0ae75b914bcf4eec1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 6 Dec 2021 13:28:20 -0500
Subject: [PATCH] jitpack suck

---
 .../blocks/payload/small-deconstructor.png    | Bin 0 -> 425 bytes
 .../sprites/blocks/turrets/horde.png          | Bin 1262 -> 1260 bytes
 core/src/mindustry/content/Blocks.java        |  11 ++++++++++-
 gradle.properties                             |   2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/payload/small-deconstructor.png

diff --git a/core/assets-raw/sprites/blocks/payload/small-deconstructor.png b/core/assets-raw/sprites/blocks/payload/small-deconstructor.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b94843d6572a2a6ad4419ec51c1371b9656ea3c
GIT binary patch
literal 425
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIjKx9jP7LeL$-HD>U`+OO
zaSX|5yn55#>u`d^frsjsoGmOYt}J~ZYgKw->4R3ArV9RpuI%dX172L><Kw&M#4dPg
zmRaVfr@ue<$xF_QzsJI~a^C%W`$cWiS28-M?VJ&QlubwcbC;9(hxX+M8m#6WV*2*c
z;ODO&K8ZJHem>oOEqm67lueD>W>;|VPySjZEmLypOj__CH<R2)67zV>0`@olo}F=c
zvLnM;!PpNeLI?6(!fis#x0ieFYh4z8z4v)P|M$5cRqh-p+x)A%Ol#he{s7xW{Bmjs
zO>EP5M^@HWzG_u(o?gK*?+BywM-?89M)g1k4I54-r$?PK0#g1*8Vo<Ua7l3cw=@`j
z?2$1rn<vPe^gvQmL2RBNQ_>?&83Aek0}Ub-Osq=|2`eb5&TC{``H_d?1f&1?hL{gu
zI8Jb$?_}Kh&{9#s-A0zV=;&odg>)NT#+{EXg#wu7F*7cGkjbIJc|Oh|vm%R8^^xPM
ec%OyO*l$j)4A}8@4Ko7+1B0ilpUXO@geCy@l&ewz

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/turrets/horde.png b/core/assets-raw/sprites/blocks/turrets/horde.png
index b871ef644c5f74a846f107dc73d371c98ce0c383..4807ba2686a8ee381db1c5aed46c36e78a4d67cb 100644
GIT binary patch
delta 1227
zcmaFI`G#|XVf`{s7srr_IdA7$``vXAX*(WrlR=1^L)F`3s@?>xNCs8WelAxhrX?PM
zS_+}3bQD4ucZKLQ3W*75N-sF&TYBQjDPz0hXM2vFQ4eI;Wc$xP{=8)TZDFV7mtU4x
z$qKW*W;?RyX3chq-@ng(Rb4rE_iy#ZuYVWSJxbdjzDAm1$)V}>3aZDL#F<PEv+wcn
z;EK=@)3TrOq4@Om2aZiI)f0+e@2zCGCUl0Sf<u18lmw*%!9N<NvXnB)9cI^2S;2L~
z+M-n2Zb9tCm7E!hH4ec|T@BL?v2Ri7;Lb3tad2*0!EjzyPwZu1q|X7FL+mQ59UL=)
ze>6;CDPt_=k)JT(fL6k}`iIPSgl@0|teTs@{@PA6|7U+ne;UoXD%jl+@<ac+`J~fR
zTKp$Q3kCTdI{Y{G>#yPv?g@PLS=Pw`hc-?MP<7D$v-0iHD=kTijXDZfA3i%|A6301
z?_K8{mOkZAS?YKHO=+3cH&f++R!zeD2PK9)&Ju0)=H>-uJ+p+mSOdI#&wZ$GtY}wV
zck_wLk_8?bLJw4H63YLlC{`Zyab}8Y*#2SbglP>z4l55o7qD}f*zh;Sk88n{S;buP
z3rfyNa7Hpt`4HSYlX=SDd6OoHTsSP>9_<t;dPMf$@p%1BucthF_)jmVRyW@~oiBq?
z=wb3TUDrEl-kev(A7>qAH&N}`Iy0JSTD=zIl&o}}8V6^mcMS_Y7ED=Tn8G;a!}k35
zoBv;bab&s5`~N!e>AftI8fJY6R?H3y(B%A3?#p?U$)fMi(+#?(uBURI-k<HMA#|Yf
zR^tWT<9q^DuY?yWGU_h4TKrGsS}l`TgUb(HMa{$@hNl{HgMTo%GA&zkj_X4~SH@gT
zPEW>q+Zwwfp%|MLf9Jep>Uqi3vr@<)^linCpWCLboL#PYHIOIrKrx5>geeX}3nc5#
zs%D+@^7C@q*bsJzeUG<>(1oZU4e6X2jBDHYE2cIGU8wre;LdsVF~jK({nzBW*YD5v
zI`AM(!HrXX!<2w-Zbs9G%xk?2#19DCU0B2t%sA&EbNyOR17QV0y9<+8gc&D2WM1nL
zARZu9=W8(Q_M$~v2b2Wf3teG}V0#$Z)WyKhSdnp9;t`Y0+a1fdF)U&#I?vRz@MB48
zW~obM+5#3sP_ne~6cF4{^&@kKg|(Z%aMH(^!p@f2uTLjFU3+GW`WvP&etTO}5#@uQ
z7UuP|RQ!|Ttmj<A^yow59G09PQ)bt0jPH1&(&H<4M7PoRK*Wy&Gg>Yw?{{%}`F&He
zP?52Dp;v<71aA2b)c}8M3C=6Gos&3cWNzM}62g6;g+FGFEdSQ$f9AB@+I?kRnOWB}
zoyQXbR3H3$RUOD&SO4$8r=q2XoLe6<*Vj$iTd=Y$$YK-2$`2ds7hjEFGOKxWA}rXc
z=-@5OT}c}r9&a|!iHJ!2`0K*?e9o)?{^vSZF-J^uKR2oTm}h*PhNJ6&5cj#eauh4`
zUrb@?U2M;C)ZfAD(6_gHU%cinTCeKyRW|Bj`+^#-sA&S_OD3(?Ke2aOLS$3g4@HSD
zj0%Zsrc9}+b$qv#MZwYfkAO>$)x((i313@#Tz@D^ggGvK%;Bk%e#1=H+16vjynA<Q
nWD+zFTK(|@7btU|pN`L7_GrPq&k1!53=9mOu6{1-oD!M<v!g6c

delta 1229
zcmaFE`HpjfVf_kE7srr_IdA9g^%HdzIiB9xs_*cK+2f>g#7)kyUkp=1YC?{*uz2`%
zh$f`IWcE<K5c!c~+7AY`eGF5tzj{$IccyLevzp#B`U@Wjl|BDgzuP+fTe4Zp!2|;d
z9yT?fYrGvdZ(7GKv8%7I^T~SN-5Y-L>D`$4T|e(>U*lycdgxt0K{&aQn{n1d<~WrU
zRvj_!sq#JoOaJE|boyhotop#QXW5?_)~L?l{2*YLpn1@xVfhC}ZO&IrHf{V79s!~o
zcGo{Lt8v(E6(l@?`~S;ZyTXM3J-mJQ`jh9gghE&<c;q)sQ_wq5{G(whOCaM;zU#q1
z9Q>L}j{ot<IymJ+v0}i<we{ND=S^aH#d*-u<r{<7%9FBnoTub8wyJO7{vc=fz?Err
zL);;D8;=BG2gwv!yPeOYY-g^1Tg5r&s$e&R*UCs?JJ&p44^_@fs#%*EUVeCfZE}-P
z-_#a0#;Awq*Xl1*72)PgVVq($|M86YNe4E%2B~Z*IitcD_K<n^Z}slXS%*yO|4K?1
zmi5dMTE!aR<=dI1{_l{`^Bj$<g04<e8T21ATUQ_FJ}I0gC3JylPwV>DEi6+S;@Bf&
zJov7qv1Ux46*o~Uu$xKaVf4J)6Wc!ReXf$i+VkOZf%l44O*;<P|Ngu2r|ZwN{9oTb
zJHx2!pj2~a)6$OHIhqT9ro?3bXjs+~GP{1KYC@)v!^*Oths;t!UeY|SOiNvQ6}cC*
z>@Tej|Fhdo-A=voz4u?EXq5>pTUz3)-J4h}IX~=N){@026aBB~hMe9h{r~G!7kV)~
zPh@xcUJz)v-95v@f&0bR8TRd^^BaT|1nc}gyk>|x-1Pdt`~zbbi%(>%$b*Lh7p;qh
zHZj$^{ivCuvZEs4x1uqNgfWZ6WtD_=w|@S}S)2M%&!Rr=pY>9!E=BGNj)%;Xgglr`
z4(D6Co{c=|>A6Deg7=Sxa?VhuDsK4?I*hstu76-$FBHI3#V`LsV_~ICg5<x4lYhVZ
z{C<{@!4Aoez(edhs#_j8Ie7nYSTA&jwV;Lni^jo_dWQ5L4*5c7SUg(zzo;B^X-N6u
zpf7ZV^-9})p`K^ER;=LKz;R?Ziz(wY$BJnSlnyvE$laRY6w|O=|J_R6h7}E$HZy3N
z%v-l+ZJ)+@o+}D!2a<m@sB<bYh4K3>@7}EZMW<Qpyy$h09Xt2U35zQ;%6|0f;LG=I
zNh%R`S9&K3?9Z=vb7ETEU{SL`g;Cn>X<Gan)`^o^uAHvhp}K+7qm_S&%9XsIrb1ck
zPcKuMa&OBK%|=%T%^HPi4z_O+R08t(J5>|nijS%;jAT%&dGP2>Mwacf=_*_9EiK!+
zH|}enAs?qN)4KI`p{5Ux?>5(&ti4oaOB?^6KQZPHgI>?Ml)@PFus+#+^+uMQA2%kh
zUDoo(e%rpq+HBHwHWi24T1Cb5`Tzcz7V!4}b*m-e4XKq+bSl&5e0kX_6~c0+^vcf5
zVw1kNo%6hK<Ck;59p)mTZF%oqmg{TydQW(5z2y+U<4=JtI*RW+RKa2!bR3QU2=M%3
zm@q+06(YnSwB<0r+rbsWdS5xi#8Y$*@gLm4wMy3AL+NXi9M7`U73`eT9=1P7kV()y
iX!QqDqBOUk*3UFzy=Qc(D2;)Efx*+&&t;ucLK6UCJtfZo

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 396ee9fcdb..995443e55a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -129,7 +129,7 @@ public class Blocks{
 
     //payloads
     //TODO small deconstructor
-    payloadConveyor, payloadRouter, payloadPropulsionTower, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
+    payloadConveyor, payloadRouter, payloadPropulsionTower, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
 
     //logic
     message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
@@ -3244,6 +3244,15 @@ public class Blocks{
             consumes.power(6f);
         }};
 
+        if(false)
+        smallDeconstructor = new PayloadDeconstructor("small-deconstructor"){{
+            requirements(Category.units, with(Items.thorium, 80, Items.silicon, 80, Items.graphite, 80));
+            itemCapacity = 100;
+            consumes.power(1f);
+            size = 3;
+            deconstructSpeed = 1f;
+        }};
+
         deconstructor = new PayloadDeconstructor("deconstructor"){{
             requirements(Category.units, with(Items.thorium, 250, Items.silicon, 200, Items.graphite, 250));
             itemCapacity = 250;
diff --git a/gradle.properties b/gradle.properties
index 6ee9ccabfb..ddb9285998 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ android.useAndroidX=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=997803e9
+archash=997803e989