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
zcmV;y0Y3h1b7N=$c$_WJKWNoJ90%}kF1fzE<eAs{bm~y6OBGM3OG{O76~RGK5QG}<
z-FpV|a^;frAB8SXVh2SWYDEV@oLt=81P7%c2qNg@Qo2ZoE(&V>T~9*p^W&Fqe*6*~
zM&uzV(t*NAQOjJ_rO>^eD#~nLMTpDV^p&Xef--1HZIt+*LRc5MPP^1k`bO79SM*X@
zX|sg(Ad^OmIisa2OKlKJUCgT`suId6)64aO=%<xJG-oG^LU$G7tWpC}>e@(!;enF3
z(;|~;F1jYma{$Na1`8P)@G%6>_h4%}0t6grGTWvu=ve>`o=~~CxN+{@nS@QY`0TUm
zCK?+*zMV~bH;x3m_m7TloV?X;Uz|AqYWdUVG~Rr;{CWGr>8-bN?e+WhyI)41tX+}c
zW*_7`)sM}Y;OW)%Z2VC*vGV-y*x8rwF5TH#`FLvb_wsHWw_ZGa{PocHt*L9PjpQe8
zHcw13T7dRp_Tcb`U@z97jd|$p{o4EEbE>Ho5+Uu+DH^&rnvTd3J6etdj>OTnG%;*H
r+QJ+GJWlLKMjQui#Ns)a!*>J@?%1E%aWgw^X2(V>^ymKpDPwhYhX(1F

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
zcmV;-05kt>b7N=$c${62(T>6(5Jhi+ftro+X}@CQN1-K~CRk0aG5-B>xn>`1Lr>0d
z2c}5aIfNx&3hbOuwcu+i_wzd6w)wgMhQqDq`<9paaXCJ7t@!>Z9BW>G3(_fXTUlSQ
zX}(Sc`?tThfgki|`2PS-@bVy-5QU`32tV|~;2PRukCz3R$yy(iiABdZv|L-X$SXZh
z@%_?))*?h?#Iuh!@|2)tV1$V1xAlmrXf5k$eF&q|`tVUd8vCRTPVhnyOo&1fM&J+c
G<0BQ33us#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
zcmV+~0nq+!b7N=$c${5PTW-TJ3{(7eieX>-?*)q8WOr~IV+fF@MVevQ?I();80H{m
zsECqG%P0pYVQtqg_0rBuKW^`f9H#!bZ1a7eZ>va@*Za~Qdt2wP>*>2Ki@f~{oR+qI
zcFE_q?|u7`IL)`I%gd8Le~WyGt$~|?BX~j}MCG~?ArlIr5=QZVDmd||pf6Y;L>UlF
zWSOjxRcHsT;=GFW!De#x1LHWAyPzK#rJV|_)rd?Cph1)yoaGwxWPuQwY2$k6FqfS)
zsKDBoAh2J608r_JHHtW#H#-KfK(NdRd%!YN3Yi@&LJt4T>qM^;y-xHxp_o^Qm?a?>
zERz+o%3H8v8FM;?DCUaUnjrwQ?wNv2L4g2<TZf`y2Ud8OmQs24iYj0l`~~JMCV`db
Bk_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