From 32e023ba28e6161b749214c685ddd5d3de81ebc0 Mon Sep 17 00:00:00 2001 From: Kyzderp Date: Sat, 4 Apr 2015 06:19:32 -0700 Subject: [PATCH] Fixed up user message formats and bugs --- ant/build_examplemod.xml | 4 +- ant/buildnumber.txt | 4 +- .../mobcountmod/LiteModMobCounter.class | Bin 11800 -> 11733 bytes .../mobcountmod/LiteModMobCounter.java | 63 ++++++++++-------- 4 files changed, 41 insertions(+), 30 deletions(-) diff --git a/ant/build_examplemod.xml b/ant/build_examplemod.xml index cc94854..7c07f10 100644 --- a/ant/build_examplemod.xml +++ b/ant/build_examplemod.xml @@ -13,11 +13,11 @@ - + - + diff --git a/ant/buildnumber.txt b/ant/buildnumber.txt index 6e91705..712e8f4 100644 --- a/ant/buildnumber.txt +++ b/ant/buildnumber.txt @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Mar 25 02:56:48 PDT 2015 -build.number=38 +#Sat Apr 04 05:06:49 PDT 2015 +build.number=39 diff --git a/bin/com/kyzeragon/mobcountmod/LiteModMobCounter.class b/bin/com/kyzeragon/mobcountmod/LiteModMobCounter.class index 2dd8967e45a7561d7ad1b7307a2e3240d1005a4b..c37607f6a80d46aaf6ce0670a7f34a947650a176 100644 GIT binary patch literal 11733 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 Y&A-9Z1E2ma-hOBBTl{-|JI;Uj7jqV2tpET3 literal 11800 zcmb7K3w%@c^*<*`o7;FPZDNrEg`mizr43Z6(iRw$S7!^A@G6LsCbw-M&8%QlAZ<4kIWuJbU`@6s2 z@0{OxpYuD(_x|(HF(Rtwzq-l6R1r420$Y1`8i`Pc84q-sZDF$~p6W6qfu?B6Xf`9w zW?O?y83{MJn2NT9wuJ(*P`o3svTchIPPr+cX_BDn>gj4v7`=fQ0Apq-Vk82qqv5Tg zwwU22jcM{pHZ^pHQcI&Tb%MtxDF?2VJ*hSj5|Qmq(PYYq8wsYoWGd9&&cqv-Mm3mm zyv9>&L$Myi2{xI@(~~q-cBi6Pk{JR>!e}#MOvQ>-BXNPzyC@ouMB^Py&ZZNZygYHn#oi&W@INZXIf_sog1C(G`BZ&Mq?2r$t06I z39JoW5hgus#@nME!EnMb;!M>|Cs#;T6W}ug13KI`BTQ3I2^=5=DYMx~CPN(tlW${F zR;j^M0*uOzxS5K!_bv^EMaUv}CU35dh4$%dqsb^#4OKKU722Z7Ocr*>LcKwyKd~k- z4iQ9}lO0MVOj>s+nT&2TARNtx#W24<8jq&tGdZWvSj*&UFe8SCoHSFX=`_PlRZO$~ zSAlt`l4cgb4rc2#mP*}p4%3uVLE@omnj;6-fRgDOW~>z?=j$|%#>=Qyr^$4tjOukd z%NotsX^J)ah)!qInQmG%%!MpzYqS`43IhpmHR8!yzeY>JdP}rJjh92g!A`^ImW7XE zp~2j)7MdWcsY&jmQ-cnghHgU8B#!1Q0-ssy4W_ zZ26o{lgRI;&ofOw)ex)E7hwfkjovCd#8josj*gh2(M?c}nh&Ln4l@DMt&*&Rw3YPG zjr1jvZy!#|A*RL?#ALJcWu3g_)95Qqr6-$X zl|`FWGSq25-3F;c)Q$1(9*Fg9nBqxbdyrQGY8$lIPj|TK_LC>j>}H+rq`M%qgwY`x za#(7E&77*>AraVwm6=*XsZPXmOKNEYfV=i|cO;PGgLY;_IL#sK;ZVchSbT^MyJ>)F;sLP zI2}FFz_OmGwF|0n(ovnhMGwOljZ1q%F@&OFPMr4p4U%QPt<5HQPwDhMf%DkO5=DkgKcmyL zGF=jhCMC_bSgEwZ?CK7MftTs~Iz2Bt#th%FWJh->9x)=akK(@$i& z(1u)Yl{|3oOp(Oo&n>*Hioj8KD3OYWVxm+CjU~fHklP5l9T;w1YK?RU?B5{V@4?9U%6`d>_$#w&S?MT=2HJ%8@h1#AZ)CV+voZ$~8E$XA; zkX(eh;7@=YIFgf_6alZ}e55sf) z+dGZ8-$bDI&z>{Oj~k}wr2-~qwzq3siGVGt%ox{5cx((dHtF)t~!yxS1 z9=fT_&8SOihSw0MdK%6!D@}@U#n9+#ph9f!~jGK~<5;#*EFrA4qc(}anu1jW5T>+pwb&m2Dm7>E|mrlg7s z6n|XjT~db@M3XHER0k*#`4jv}H($#%)=YE+V%xWL!~#*d$4F1C%?u@=-Rt;M3I;Qa zVT&*zFow#tnm?`cXCx{YM&syop%z-D!lo?Up!4Uf3KKoI;Y**_`3nLyIt{fv3$|P5 zn*?lh#0In1#8kedb06=4p|zXw)GElvNJy`6T5fBR8h`1KjVSZ0`4*kOBIq@%c3-qe zVFl8>bt`bsnnK2W>!&CL`c!%(QROfGrf#idCm1U1fk0_f_~a|N!sS-XW&jJ*&a;w#taWXjrJdZpMT)y=TFd%LcJv3(hLgdM42v1Q6(d0ZB)_Ed&-mxCbU_c2 z)e2KX&Lc7#(3i>~qQ+q&Re|zlonPTsQP_kcD!ybgksWAqT+bDeBT&gzKYfABLgu1j z7zv_PnCWY{N*(V%f8+7~b0_1u$$z{*tTC=?qcF-&i%x&9^B+V}&Q(iLzjzR&6JbMI zR=E0}&=#zc_8yu&t6e)%svt(maL&p4Gw3u~?U4ZP&}LHZ>GqclXf|re zR6-h4NPe?F9D&`;w?U-yZg=A3=C4TsZXsKt3dOD<^r*NRdr=IAPt0$V>>WQnL zdZOE>o@nl=CtBd@i3YfOqW!I&Xnw0FTF&Z;o-dw7pcRdLe3s+wE%3p3-c){=D$0*i zW$R%I9HLnmR=2ti)47M}ymIFunkyf5@-a_77L*rh57WX{r?(;4>hdlLw&r=41zYpI zjlov8_kv)n=4}qP7Ug?a;?wQDFnEZ98IUysvQ9u+1!SXuY!Z-56i7&cgaKmQujuZ; zXN{6?9l59i@|_8Z%m(+>Xz-r{KF*~8cC^uX6vqD+{9j4u({8GxPQZ$Gz#&DkB5@ZN zeVh9=(4zx$rQWWlqhz*L9HC1OQ;&DY0PP&0E1N3r!=i(PfI@5~`UpN3qXoM}As%A^ z+lZY|;QxUrM0jZ&*hf^VcOs|v<5^_+m?UZ(LY*^1-8J+H8}t_FMyOjZ62DeHu9J`J z%e|jDL^m9z8(Y0!C@S^tK1?@1NPE=#Ek$GP_q|8xYY)(#0Xm=tdojpLb1E#CXa(@E zgdMg(q8CyL1tHDVG>6vHd}^g-kf%t`Vsg1nAE=?b=^Kivd+1)9(njoa;h(cdSS%U} zMY*+@LBVvNl9MPykO`Aa_haP5^8tF$M*9v{@~{>u>!V2(2kGGBG*%wv2Wi#-J=8}Y zYjh0jZW!=)@vM~%PtZ9>=+Qo^#N?CMGj}ifFnn5uuKjB7b9ny&-s|?N*B=SxPNnHu z=$c?8rO=@td3_3X!(oy%moB4ubOrSPF$m!*i0x{K>spBGI=Y0ehv|J*aeJ;sbB5ap zy+}U=N8p2AqMs>lBlL5arC3yieu0sTUdA||Tz+>&A@;sPuUay2{ReAMmgCi#-d_&T zuUAw$tG&M)pg-)PLK(h+VV~pCau+P5@>t%jR3&y?K0t5Uru-I68LxlE!~1v3tdGz; z-hbia{z_N1_dSKHREGby(PB6#Xz9VqWBIpIlaIO9Req42t+m>*8n?41zn`X;Y9;yA zwRv({smnU6G*1ozmEt?Ku3h0@0s@;}PeQX%-otThH+E~<6Oc|JZJPFm{9aO2}Kf{`Bv7d{@VFt#e%%dGvS z*biObkb&su8`H#$SD;tRk;#wvRFB;k7uft5+7HoQ+0(7wu~*y1s%;Dg3b$)&vOkhc$x#a`-k9DOHQ?P zo-Fxzt{|kN3Spf>xXX&rKAwko>*ECoxISKpi0fknZMTn?1TA^ywiX{R%P?N*8lw6$ zhp67ijiL%sJai69GD?5B|AS1?#}{NkEL(*6EBE6nx&Y&wkX>&^zUo5`+XMHzg_`Lr zw2Jm3N_`EkwU1Ktb=pa{!5I%=cR#|%0Xj;zqy2veI{kOjQ*;--fbjAP-9xV-QoW9# z^9Dl8zvv+6&+##Oo*$tf@Kf{xKSMv_7w9MaV|tN)MKAI1>F4}6dYRv& zSJ2aa)#0FDIST1D#~AvJV*>rwQAU4ooJFrYrqUlB)%1qreEiR+KRXuFn~smtUmPv; zmSZ*M*3#RK%jvI<8|iP319;v?e|J1c?>Jtfe>z^FcU8!_$O;kZkmGojn|XzV9LKBl zK7yEo+>W2}O32d*c`XE=euR~qXgpttQ6A(m-kQT{8+aA=xo}CSrRynZSfFJ3yK zNZSlgy<~I!E(haf-{7AxJ+F^OmAB&Q+AMX`L0Vu>ERcx>EmsdZw>GciQ13TDtR2+ zOCPm@c;2xZmveqU%_+?*t8N~O;xeF^31A;zfzOf1b~(AM#IjR%8>m zAe%(DNv+An_`Q>t-0Xu2yfleVr>R^*vv>@h$7jF}OKCa$a3z<~#XONZ*-w}9WZK4O z;hXof@um1wd>cKD_Tjmor_+O64nM4bU(KX9@q8Qa?{XEpcor9;AMN9FvMR<|R=o!b z_+yA7xJtsxufoVdPf$5aspe2Bt|I;4Ad-vUr7=ZQM^z4j_I%hd3OUQFXAi;)9BPIN z3IT<01TAYoOp=lXRgu(Me03i!ET$)q@HKr@2-!&VzP_I-i|KhaH%jIP__O^qPGmS& z%wR6&=H`h6VZ(E?5>z!B*HQu3lb7e=_Zssdy#qeq}GAdx-_YEBS~EWQd>akg&=hmNDYG2wIFpJ zNL>$7H+~qY_(Ihpm7f6p@G<(QGR~WuEU|sL!ZP%|R(6IUzXo$h-f^OG*gwFxt+O}W zWp5}d5}&m86xCzXH)InY^PM%We%dW)OI)(Y8X=)xvbjdpG>7?~k~|Bt8H?BT+1X4% z$i5?dFHZ6C18|fq9vh-0uLwSY6nk*KA_*IUC9Z0#OcDnZqDx#wp3WlA=CU+VyIfr2 zLcO##E7|!d&57G!onb2E2nCRqR&$ir^A@;FjC#0>uHiU+noT;)-AGxN((9bSmz!JY z9Zo5U&$mQryMvqFLaDU}g1&~f@_=%J_4HLf499TNM*6aH5f}B)4nBf8EBx1xYmhFc zJQdjwh-=Uw3SaROHy=O(V43m^;v4v(dtiU~4%}914{*7m)O+3a{kWA#xVyPolp*39 zpVq>7O9`sb6D43?R9u@^w6rGQ(!^{r0|k^z5eicVsHG+!a!xB_rVSY!Z|fpmxs>FO z7iCP0WR<}@UgG$MtTNQafGtx?05yN_%VT{0!NqSSG>vgE2ktST#oXKs$~R^!llYr z;p2y$6Kt32M_WLxeES6NJ8nriv(;(2)l%6Hp<5ZTCaM*2NP-9Olc-w>?Q9syohVN4qVMqC^dx@+zec#72Kinj zz5DR>`~zHsma-4#Q_3ia_%JWzZ}LU_kTN(`7V@UF=i^&8%kv9(HA1W;!gcs5fh0#K zZJ;LG^J6sI_WV2WLq$oLE)>?a)*Py-R%N2rjdg;gPM?@w=`@u?-=jsRy+_L(uULdrcKb`RUff{Okk#+yMV*fPcEqDn%*=_!lBWtM6jf zamOLQN07cBg~L6jc(d9PQ&pu#IH`<(iLx7=JjRb0>@zQixyzaLa;B9#el4j%RXD$~ z!tiiPe)pl2Jc}~sIY{XHRL9Q`p`_lXWKxC_2fr>{@E`e4czWTYZ{Y3E2EWOF;kT0f G_J09y*g#wW diff --git a/java/com/kyzeragon/mobcountmod/LiteModMobCounter.java b/java/com/kyzeragon/mobcountmod/LiteModMobCounter.java index 736a2f9..f69d81e 100644 --- a/java/com/kyzeragon/mobcountmod/LiteModMobCounter.java +++ b/java/com/kyzeragon/mobcountmod/LiteModMobCounter.java @@ -31,7 +31,7 @@ @ExposableOptions(strategy = ConfigStrategy.Versioned, filename="mobcountermod.json") public class LiteModMobCounter implements Tickable, ChatFilter, OutboundChatListener { - private static final boolean staff = true; + private static final boolean staff = false; private static final boolean useOptions = false; private static final boolean rebel = false; private static KeyBinding counterKeyBinding; @@ -70,7 +70,7 @@ else if (this.staff) } @Override - public String getVersion() { return "1.1.0"; } + public String getVersion() { return "1.1.1"; } @Override public void init(File configPath) @@ -144,17 +144,18 @@ public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, bool /** * Client side commands */ + @SuppressWarnings("unused") @Override public void onSendChatMessage(C01PacketChatMessage packet, String message) { String[] tokens = message.split(" "); - if (tokens[0].equalsIgnoreCase("/counter") || tokens[0].equalsIgnoreCase("/count")) + if (tokens[0].equalsIgnoreCase("/counter")) { this.sentCmd = true; if (tokens.length < 2) { - this.logMessage(this.getName() + " [v" + this.getVersion() + "] by Kyzeragon"); - this.logMessage("Type /counter help for commands."); + this.logMessage("§2" + this.getName() + " §8[§2v" + this.getVersion() + "§8] §aby Kyzeragon", false); + this.logMessage("Type §2/counter help §afor commands.", false); return; } if (tokens[1].equalsIgnoreCase("message") || tokens[1].equalsIgnoreCase("m") @@ -162,36 +163,40 @@ public void onSendChatMessage(C01PacketChatMessage packet, String message) { if (tokens.length < 3) { + if (this.toMessage == null) + { + this.logMessage("Not currently notifying any players.", true); + return; + } String toSend = "Currently notifying: "; for (String name : this.toMessage) toSend += name + " "; - this.logMessage(toSend); + this.logMessage(toSend, true); } else if (tokens.length > 3) this.logError("Too many args! Usage: /counter msg clear OR /counter msg [player1[,player2]]]"); else if (tokens[2].equalsIgnoreCase("clear")) { this.toMessage = null; - this.logMessage("Not currently notifying any players."); + this.logMessage("Not currently notifying any players.", true); } else { this.toMessage = tokens[2].split(","); String toSend = tokens[2].replaceAll(",", " "); - this.logMessage("Now notifying: " + toSend); - this.logError("Usage: /counter msg clear OR /counter msg "); + this.logMessage("Now notifying: " + toSend, true); } } else if (tokens[1].equalsIgnoreCase("sound")) { if (tokens.length < 3) - this.logMessage("Current hostile sound: " + this.sound); + this.logMessage("Current hostile sound: " + this.sound, true); else if (tokens.length > 3) this.logError("Too many args! Usage: /counter sound "); else { this.sound = tokens[2]; - this.logMessage("Now using " + this.sound + " as notification sound."); + this.logMessage("Now using " + this.sound + " as notification sound.", true); } } else if (tokens[1].matches("fac|faction")) @@ -201,16 +206,20 @@ else if (tokens[1].matches("fac|faction")) if (tokens[2].equalsIgnoreCase("on")) { this.notifyFac = true; - this.logMessage("Now notifying in faction chat when over 150 mobs."); + this.logMessage("Now notifying in faction chat when over 150 mobs.", true); } else if (tokens[2].equalsIgnoreCase("off")) { this.notifyFac = false; - this.logMessage("Not notifying in faction chat."); + this.logMessage("Not notifying in faction chat.", true); } else this.logError("Usage: /counter fac "); } + else if (this.notifyFac) + this.logMessage("Currently notifying faction chat.", true); + else + this.logMessage("Currently not notifying faction chat.", true); } else if (tokens[1].equalsIgnoreCase("xp5") && this.staff) { @@ -219,13 +228,13 @@ else if (tokens[1].equalsIgnoreCase("xp5") && this.staff) if (tokens[2].equalsIgnoreCase("on")) { this.counter.setXP5(true); - this.logMessage("Now counting only mobs at ShockerzXP5 kill points... mostly."); + this.logMessage("Now counting only mobs at ShockerzXP5 kill points... mostly.", true); return; } else if (tokens[2].equalsIgnoreCase("off")) { this.counter.setXP5(false); - this.logMessage("Using normal mob counter radius."); + this.logMessage("Using normal mob counter radius.", true); return; } } @@ -233,18 +242,18 @@ else if (tokens[2].equalsIgnoreCase("off")) } else if (tokens[1].equalsIgnoreCase("help")) { - String[] commands = {"msg [player1[,player2]] - Set notified players", - "msg clear - Clear the list of notfied players", - "fac|faction - Toggle notification in faction chat.", - "sound [sound file] - Set the notification sound.", - "help - This help message. Hurrdurr."}; - this.logMessage(this.getName() + " [v" + this.getVersion() + "] commands"); + String[] commands = {"msg [player1[,player2]] §7- §aSet notified players", + "msg clear §7- §aClear the list of notfied players", + "fac|faction §7- §aToggle notification in faction chat.", + "sound [sound file] §7- §aSet the notification sound.", + "help §7- §aThis help message. Hurrdurr."}; + this.logMessage("§2" + this.getName() + " §8[§2v" + this.getVersion() + "§8] §acommands", false); for (String command : commands) - this.logMessage("/counter " + command); + this.logMessage("/counter " + command, false); } else { - this.logMessage(this.getName() + " [v" + this.getVersion() + "]"); - this.logMessage("Type /counter help for commands."); + this.logMessage(this.getName() + " [v" + this.getVersion() + "]", false); + this.logMessage("Type /counter help for commands.", false); } } } @@ -445,10 +454,12 @@ private void displayHostile() * Logs the message to the user * @param message The message to log */ - public static void logMessage(String message) + public static void logMessage(String message, boolean usePrefix) { + if (usePrefix) + message = "§8[§2MobCounter§8] §a" + message; ChatComponentText displayMessage = new ChatComponentText(message); - displayMessage.setChatStyle((new ChatStyle()).setColor(EnumChatFormatting.AQUA)); + displayMessage.setChatStyle((new ChatStyle()).setColor(EnumChatFormatting.GREEN)); Minecraft.getMinecraft().thePlayer.addChatComponentMessage(displayMessage); }