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
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$V@X6oRA_<K**{9dU>LyRC(=VWI5^a$;2k=3(52voJc4)+!9@or?@;K{4h|09
zLI)Ajnl@?j<@@uF9~qus-UI@vp5NZT6+CCD0YhfFm{-LHEEn^NLO1Y-r@(+Zp27n5
z@i6)N_)KBhne)qw)@z#ZWU_&_n|KHhll6KV9CXUeW>fq|G;QJ-o(winzk&OkXv331
z0L>9y@MIFeZbVl+R5!PGNxp@qSJ#c_j}P~q@g&^9cC-3-b}F94k5E0L4<07LG(Bg#
zS$TbV>V+qRmv{)C!~sL`Bn$|FCs9BsJP86q;)xs(8c)Q4G4MnR7z<B?fHCom956PX
z5d&i287UwZo)H3K;t3oO8&AN16nFv!q{0&*ASIrG0jco}2*?3X&wyO;^a#ia&xrxK
z;W;57M?4(^a>dgjAZI)+0lDKj5>Nu30|BMrX$U9@&t5=jcxnM9;z6okOrhon*_C-v
Txb3V100000NkvXXu0mjf_mrzr

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
zcmV;+1T_2Z3G4}wF@L5>L_t(|ob8=EPTfEhhR0Od01^ubB}+(^E|4l&03{WV3PnN!
zq)1UJAXUmNAXEXmR4joK77!^Lpvp~k$mGg1K6B>0#>^*C0J1&)KVQ!oU)vKxr_<?l
zIvo=R>juQU*?hMc`}@uHC8?de`zNF8`*MEbX1`ag8vvxjmwzB7#sU`tG{XnHNJt7;
zEEXz1nDBGU*Wf{d=_g=w>%DmZ))LGFcnBY`lwcyjQ}}?D1a$!(!v`!Rs0!FSICUF7
zpk0xv31}gFKvRN>fR@4sv?PcNXfb?1LxQLP&mArn>5f@Uz#PH{BqfLlm{a(GlmvDG
za||DlkiaTn&VS(p+!ELXP^z78uhzLXPv-n}`7)f<5sQFS_%GKtlFO8YPmx;^Qcl9d
z{ay9?b5skE4u5JpV^G4el29c;EBvYL#ngmiA%QF))#2vCKU#aFZtjVk1db!}YA4<P
zl!Tg&nIym}d|>b3bTJG=7>0j0H*j{0ni7fyP)beC@PC1Lhb6Ar<Rqk^NGKBEC469a
z|70O~!AwH}T7b9kwUCy85<scL=MX+Xk%0YVP70uunsW*tpmfX_30VP@@KcSM1C;%q
zl8_Y8!ykuRLQxgO9sb8(FS6^D=HdP>Y<(?nH)jrL0TSV3)-6TcW=jdx7vpNf2Q(#&
zwV7K2mVYV%lxk-zd_Y4&?tr04pp>XFWC4`$w{P#W|JUfmrzG$HEMI4h1d@Q7@KYgc
zR!}Jk@OMoK#R52v{N=DM%GYHH%fD+$C=$SV+JVq5#|{vB>Jy<M0WF}_bN&?8eF92=
zMEETsDPd9o<tUv~_y9!$rmW5i@NkM~ohb=P0e?MwK5`OVJgEJg=>m-D0*t8=Fjeh%
zxcRo0shf8x)lm#tz;g&6kd#0Ypc#J6C2Gz}PD(<tfL6i>yh|t&&|3I_X9;Klt%eVH
zm4Fh^dia1x3Dx5O%kYoZ9*eKPYf8Z2W*|lhAFz~AiwglY;RCHoFc-iPKG32BQvsae
z1AnbaFcTmVKG2c`69JOp1Fc9<7f>30O)#3<qM|CmA`tHq)C5=t;aP%;01p9pXu}xd
z0zB=wr?vp10&>p+jG^&#WodOpd1jylF##UK2Rum-5wLprX}CB$Mo$xB@mz6<gq!Qj
zVdbsNv?uHWRu4ZtH54Pk@}X{wgn0fM34aN!0^;z2oCIw6l$(9AUx?%+j7=WIErCtI
zSopx0gwi9wL_+EJvSSi*GdFQcU=ffDABZJTPdgY1)Z0U137BcKxFl2yz=RK6oE;Cf
z=lq<6+Pl=Qb~cLUEaQ++CE)t%dr<>^fBwMoa-}f|wc!JQew4j%sdiF0vH+>@v45l0
zSOPYD?8sJALUO^{Il5x7;m3nFY*<)f@%qruZwb}@|7}Bh16Y<v&XRY=Nnc(lK}En+
zN1eKCA$f1;lmv~VKLo{3KuW^)?Y-#h3v#a|NcA0B;fJ7n3R;#BcchZ9FUY-?U|E7@
z_#qhd0U%+ll$3mZLGHB#AVE9)5JZeR;as0!^@WT@_#qfpL8apeNi1jBHZ4OvNU)yX
p+<Y8hDZx7YPN&o9bUK~q%U^4z;-KF1V157q002ovPDHLkV1l!wEKL9a

delta 1229
zcmV;;1Ty>V3GNAyF@LB@L_t(|ob8>xP8C5E$7hL!FF@i0NXa8u*$Gzq0F+dGRK$b?
zNKA+oU}fn8NF~r&@d%dq04BZwmDlR%c%7L&bLM=F%rBwf5_aeQf4e(p_G31L!C){L
z3<f4l)(wc+**jjOK7W6HOls$gjaSL#-CSR~`Q9tm4FGcCOMj3PV}T0+n&AUpBxD6F
z77LXhOc162Z^1(RGNyaL#^!7D0IVgL3Gfg;U@5^wfT!>QD+%fXJcbWgNKh59yMN*~
zd_cQ8QWKC1|LNMgRulf=+uhgX=b92!1b7S|u$CY$z;pP3r36s{xenJ;_&`pAbjSQi
zYQdE7b0JX4t$!=Go{|LW3Bfr;_5ez$$sK+P${r}SC$J0f9zNhj0;_;t!UsG^U=u(Y
zWF0=a=UP3PtL=IToYfJF07|J@6Fx<5O-LmP(j{uM0O|1O){}w~j+KNa0b1eDtuLk}
z6blJt0hBtQ<CtHPz_CSAB(!wQBmq|81H1bti)os|G=KdW8*z4wni8r7P)bdSYA61}
z66b6v)e%KPl>jf{13P=i3&|5^8WPX~yoIlYv;>rZUI$rRNDkI!1!$L=UXdzMivlR&
zTb|pIhVs4VBxD7Q@Y8ThsH%dv!+-nzvH3;$%@6hM=F9;tKq7q1vZaXIY$>7nWL#_b
zfTo00n}4|_U}+LSsdiG~0~!)a8w^DPr9_P(3!sF*b$eI*yGAEICwcEn{W4o5kOZ`Z
zUwcP_1UU)txu%3_0UTTYa@Za&$}j(}C80_H=V1pz_i#}@w?}A5Knv*gm_LVgpMVk|
z5q?idN|+Tu*-HPX@BxYhOj%tN;NcL_J984U0)IyMe3T@(cu@NxGXxkj1Q^pKV6NKv
z_-w6Z@h&)jUj93!I*K6+cnIMGk`hP)G{bK>Ma@~sNlB;{&`bD$cL`MjdJ7-$ECDT`
z*YE+a5>Ntq4<GO-p?Mr&8UEpu`|9)Wni4R$8HiEB2P`GD;zB@6_&~1`%mr|S5A-O(
zRDS?x_&{$G%mhe;5A-C#M1W-YKra&11=NP$5{%}$sHh6C2*kStH361Ec$T0dz(W8Y
z+K@tAfTu6+sV#u0fYP%7DKwt0tgVhH&kWQcCctC(fF}te0#*-Br;D>A^elrG&lT55
zxVgTZR$g{8YvSs`>F<VOBv?Mwjgb()Z+}KY0;_;He4r!&8$RV`U+e{ul7!UDez+yD
z2}p$xq$JdC`85)1ugj(+l-{(&DS<^mDSRN7Kt1eWBv5Y;i6vlObHyd0SpX({;Nt9P
zYCYzcB(&b8cD21;^^P$P2~7g7uRc{Z;K#c+ER!pxB(#PP{QO)u;Zp0I(qsWr;eTUC
ztFZ)Z_}G!HriAQ2w!Wh)1{;1nc*BN;6&5cK{rr|t?f=(0q*s7tdE_j4XPorug&I@@
z%yrbc(-xBVhR#XQ*!n|I+yinFwr=l4r!Oc?OOWe3w89TT`4F@$A?`>er!Oc?ORy|K
zGyD(?`T&rSDkUYSFDOk*01~vr4@SYL6E5`$Ru^O}!Vkf)3aTAPNFw!u9t@^ss0Rs_
r;fLU09AGKII{d+4Fc=I5gNMs6X)*=gGSYHp00000NkvXXu0mjfVLc_!

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