From bedf93f0e0709b0ddae83832ca2ab8bcd90f979e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 15 Nov 2020 20:20:37 -0500
Subject: [PATCH] Cleanup

---
 core/assets/baseparts/753232120369119314.msch     | Bin 449 -> 0 bytes
 core/assets/baseparts/772833439719489546.msch     | Bin 204 -> 0 bytes
 core/assets/baseparts/772833740053020682.msch     | Bin 303 -> 0 bytes
 core/src/mindustry/core/NetClient.java            |   6 +++---
 .../mindustry/world/blocks/ConstructBlock.java    |   2 +-
 gradle.properties                                 |   2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 core/assets/baseparts/753232120369119314.msch
 delete mode 100644 core/assets/baseparts/772833439719489546.msch
 delete mode 100644 core/assets/baseparts/772833740053020682.msch

diff --git a/core/assets/baseparts/753232120369119314.msch b/core/assets/baseparts/753232120369119314.msch
deleted file mode 100644
index f68d33fae577ddef454ea9b6eb8f87d017f5efff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmc~TPR?Mgn4^2aKI5u`4Eu+Cy`B5^Jehg@SIMh@)!w51E4;l!3q%h(1`4!Dy}w({
z_NnOUq%ZQVdVWdlt}<D!?2dC{?%ZKvU#h^N^x{d-E{}FSuB^YY{!Z^cKc1dn_eV&^
z?TMnsrN%=Zfv01xF1@gKp4O?HIM<HTx4ukW@ukTq!!vivkNHj!;ye9zU-AFtcHK4n
zOHgFy=9X^?lij*47cbTF&K2;AJ+oSMmCz~8%cs9Ky;wfg$s}F9+o@di(V8IUz*o0C
zS|2t}+J0GSa;DxcwbR86$6v5<OG<q(WI6vmA=`?HMJB`O_A<Q}kqmtE0(S1$QTXoO
z%og8mKi+J9ttKUHzi+N@wRs=Q?(hA5d2{w$&5NI7@jvV5<!2`MYIgjo{C()<+U-Se
zzyAKZJKk;nn%If=)8wC6U+q6T^TErjUvvHhnr{5`=lzYF)8Fgey&3tlBJ0!lPkA!i
z<7{gFe7*2}?aJ)cy-(Eh%=~=}qZ+;?etYntJwgB4g5Js(Z~xx<{kVA5N>L%jx92sb
zcA3xWJ0WNt)yLd-<l;6H!yNlthh!LS{NA{`$*|`hd1N``a5)R#yBqUw78+aUr5$(E
N`SScfqh@kxDFBBC>6ZWi

diff --git a/core/assets/baseparts/772833439719489546.msch b/core/assets/baseparts/772833439719489546.msch
deleted file mode 100644
index 8a5af237618eb9317642c491d84641cbfb715716..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmc~TPR?Mgm=oK7vG0(AfNOqZ<E-9~nfsF-yDwCotrp?C*6`ooqMd2-InMs)3fPx<
z+^}p>jpuqZ$A9aCY_0E~t?qC8xr?Fg@Y-j;r%nG^XlYlx_QyXBne4cF?n|2a(UI{R
zGWYqh{@%WSd!zi9^dJ8j{62hAm?6-*<OGNPmqQPvZYA|kXPtR6N`7*u>v8ifG0|I2
zXxsXK{ClbKnvzS(k<I;PpQbEGNoeVKvHfeu$_(AtnYA2?FaP=wXfO4939sJ=Cjp-h
OCn2{7{O=ztivj?V3us#a

diff --git a/core/assets/baseparts/772833740053020682.msch b/core/assets/baseparts/772833740053020682.msch
deleted file mode 100644
index eb1fb26d3b769283d874c3d9fca5bc9232a40a71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 303
zcmc~TPR?Mgm=hZqop;!PC-_fUS7Q9{_pDuaQ_2gZlQ||VbDfoV<E?tvUx{Z5X)8J=
z`JC2ZS5M5nuJ`rQIdA*C_uVqf{_V*5TsuF1wa1j}zc0yEM?YWx`sHrj?md6G=S<sH
zTXypKw)eHaCt94{zVh_x$@cZ#H63dkXE!QWI4QV1-6f<b%(YO+?PI-`#m5y3^dl5p
zBn5m@X0DkKn!&#I(Vnia2h)naGC#JMx_g1V<kGoZYp!<q@GNkgB0cA+)aR5&fti_)
zt6msPpKG$>z^xey8{!)n0$w(oc3I3Zw`SYmu;C0x^#P+`u9>nrPJI8*ymnbHyw~rG
z)xsI!9WzuF#dRi&ZaNjcAxW~>s#W7z*Uedq44dE0Z1QnzWN3?SUzErmRxy2AQ02ES
Ntpuq*tj~1S8UdB(k_Z3*

diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index cc572fdfd3..42f261edce 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -322,15 +322,15 @@ public class NetClient implements ApplicationListener{
     }
 
     @Remote(variants = Variant.both, unreliable = true)
-    public static void onEffect(Effect effect, float x, float y, float rotation, Color color){
+    public static void effect(Effect effect, float x, float y, float rotation, Color color){
         if(effect == null) return;
 
         effect.at(x, y, rotation, color);
     }
 
     @Remote(variants = Variant.both)
-    public static void onEffectReliable(Effect effect, float x, float y, float rotation, Color color){
-        onEffect(effect, x, y, rotation, color);
+    public static void effectReliable(Effect effect, float x, float y, float rotation, Color color){
+        effect(effect, x, y, rotation, color);
     }
 
     @Remote(variants = Variant.both)
diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index 166063f828..ce37e80dde 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -273,7 +273,7 @@ public class ConstructBlock extends Block{
                     int accumulated = (int)(accumulator[i]); //get amount
 
                     if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core
-                        if(core != null){
+                        if(core != null && requirements[i].item.unlockedNow()){ //only accept items that are unlocked
                             int accepting = core.acceptStack(requirements[i].item, accumulated, builder);
                             core.handleStack(requirements[i].item, accepting, builder);
                             accumulator[i] -= accepting;
diff --git a/gradle.properties b/gradle.properties
index 075558d561..c40626f1f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=c3f584d2d17fe0a91798565b73ea4d72ad312abf
+archash=de1a34fbd27468986a0540d0b51146291d9f2db4