From b2e2cfb48d0eb82dd72cb7ca327a8b8942fababf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 11 Mar 2021 10:52:53 -0500
Subject: [PATCH] Log client commands before handling

---
 .../sprites/statuses/status-blasted.png         | Bin 298 -> 298 bytes
 .../sprites/statuses/status-shocked.png         | Bin 261 -> 232 bytes
 core/src/mindustry/core/NetClient.java          |   8 ++++++--
 tools/src/mindustry/tools/Generators.java       |   2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/assets-raw/sprites/statuses/status-blasted.png b/core/assets-raw/sprites/statuses/status-blasted.png
index 96331365fc8e2bef782806631d1a33beaffdc83c..79f635ffb76121dd4bac786520a5db5402d438b2 100644
GIT binary patch
delta 248
zcmV<U00;l70;&R#I)A|q#UKcim;L`Q`!0)72erT!FZQ%WXgft%DF>S&{Y$MC#kNHe
z5j9{WP-E`=_WWBpoW&iWau@><aXNQpAR|t3T+zh2UW~Hnxzqq_2avdcVnr_0B+UR6
z2Wue{vw^I*+XSkC2jSwJ+xmS(GK*<ouA%44-MJZZ6Mc~`cX5p+V#p$SY%Bf@#{e|I
zo_PjCAE<hd&ANEd_Wu*x$1&RpYr#V(BwosM2i(&v5IbmSN02q)8faDxL`}G-DXIZ;
ynpxK~@}si41#dJ0$gzDKv#mH{;`=sw@CN?mB0@Q&@KtmG0000<MNUMnLSTYbnr~SE

delta 248
zcmV<U00;l70;&R#I)BR&#2^TRo&NtXvzLy84<w*F>%pAbQIb?CKy>kEuznGd+1|3q
z%skvs6Absf@#XpBIc&uPfMO5>8F4t)Gq55KaXg7YChGI$y;nBkgp8c9P9P*c+JkbA
z3{1sAz$RJ)JH$gKW;xIi8NWZZ>*|WEoG9@Ag3OnPICcnh&~ZuXo*GJokY(b~Qv5Sq
z15*R&ov)y(1Jc*nEe={<Jx?6n4K)GMgu>!P{RxCRSyH^x7+t{*6L3?ra$v<osH4tu
yz?^Qtsn``KI-naOm2ky`8;h3WofFZ;S@;6AeMLEz)t@o|0000<MNUMnLSTXvIdpOW

diff --git a/core/assets-raw/sprites/statuses/status-shocked.png b/core/assets-raw/sprites/statuses/status-shocked.png
index 9d6822a636719b0575eef28933105da27780bedf..2a08b271b845224e99cfa8179c2dcb76928cf68a 100644
GIT binary patch
delta 204
zcmV;-05kuE0_XvdB!2;OQb$4nuFf3k0001@Nkl<ZScUD@!3uyd3<J<c{QqB$7X=Y?
zX>B~HfgQxLK3JWL_<EpBB6<1xY#m^{{G<ScTne86lo6eP5~3TBMmPW|gbN@eoB%05
zAO%=YHXg<^006<knQQ~Nipv03aT(x@4FKg|>;eFQx@+x#OhxgCh`FQY{(+=)6Wa3L
zCVU-0-&7MIg&;Y)%9j8sgqlhZv?8ia*oL_C71$c{TUh|pPAN3QwInqF0000<MNUMn
GLSTaTJ5wD1

delta 233
zcmV<F02cq~0fhpPB!A3FL_t(o3GLKD3WYEX1W*<4f91-!X`zWpnhAo~RmuP9yhe0y
zt!;0v<IQknX8@GZWdOK98j%I05ez^I!2&EJn1Ce&8xTfR0Dy3>A8<NnmHyypIi5#Q
z77mmJC=K@jw8_!x)&yul+CiTL?AmRmI(q`4aDcqu0SPaKSz>R^)We>D1bwWr0n-hK
zbn!Pf0C`f7RJ&~!Ky4guCT+*QaX<an0-)jXfa%0uK%d#`0pLjUpq?Asc>!gJ2%rQJ
j1<(;I04ib?00d=Se?1OKxA`V|00000NkvXXu0mjf=`&%|

diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 7cd14828f5..fbc3ba9ee8 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -198,6 +198,12 @@ public class NetClient implements ApplicationListener{
 
         Events.fire(new PlayerChatEvent(player, message));
 
+        //log commands before they are handled
+        if(message.startsWith(netServer.clientCommands.getPrefix())){
+            //log with brackets
+            Log.info("<&fi@: @&fr>", "&lk" + player.name, "&lw" + message);
+        }
+
         //check if it's a command
         CommandResponse response = netServer.clientCommands.handleMessage(message, player);
         if(response.type == ResponseType.noCommand){ //no command to handle
@@ -219,8 +225,6 @@ public class NetClient implements ApplicationListener{
             //this is required so other clients get the correct name even if they don't know who's sending it yet
             Call.sendMessage(message, colorizeName(player.id(), player.name), player);
         }else{
-            //log command to console but with brackets
-            Log.info("<&fi@: @&fr>", "&lk" + player.name, "&lw" + message);
 
             //a command was sent, now get the output
             if(response.type != ResponseType.valid){
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index baf23762bf..72c0d4b9e3 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -398,7 +398,7 @@ public class Generators{
                     //if(icon.size == base.width) continue;
                     Image image = new Image(icon.size, icon.size);
                     image.drawScaled(base);
-                    image.save(item.getContentType().name() + "-" + item.name + "-" + icon.name(), false);
+                    image.save(item.getContentType().name() + "-" + item.name + "-" + icon.name(), !(item instanceof StatusEffect));
 
                     if(icon == Cicon.medium){
                         image.save("../ui/" + item.getContentType() + "-" + item.name + "-icon");