From fc4dd3ab98d23c47feeb8249040f70eb5dd20ddf Mon Sep 17 00:00:00 2001 From: Kyzderp Date: Wed, 2 Sep 2015 23:58:16 -0700 Subject: [PATCH] not gonna do adult/child separation, added stuff --- .gitignore | 3 +- ant/build_examplemod.xml | 2 +- ant/buildnumber.txt | 4 +- .../mobcountmod/LiteModMobCounter.class | Bin 11733 -> 11497 bytes .../kyzeragon/mobcountmod/MobCounter.class | Bin 4688 -> 4386 bytes .../mobcountmod/LiteModMobCounter.java | 48 ++++++++++-------- .../com/kyzeragon/mobcountmod/MobCounter.java | 40 ++++++--------- 7 files changed, 47 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index ab1c723..85e5992 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,5 @@ Temporary Items *.class *.class *.class -bin/com/kyzeragon/mobcountmod/LiteModMobCounter.class \ No newline at end of file +bin/com/kyzeragon/mobcountmod/LiteModMobCounter.class +*.class \ No newline at end of file diff --git a/ant/build_examplemod.xml b/ant/build_examplemod.xml index 3cc0f33..8c1db5b 100644 --- a/ant/build_examplemod.xml +++ b/ant/build_examplemod.xml @@ -17,7 +17,7 @@ - + diff --git a/ant/buildnumber.txt b/ant/buildnumber.txt index 8674508..5012ed2 100644 --- a/ant/buildnumber.txt +++ b/ant/buildnumber.txt @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sun Jul 05 17:59:19 PDT 2015 -build.number=44 +#Wed Sep 02 23:48:54 PDT 2015 +build.number=46 diff --git a/bin/com/kyzeragon/mobcountmod/LiteModMobCounter.class b/bin/com/kyzeragon/mobcountmod/LiteModMobCounter.class index 47fed2aab0f0cc7898932e5146f0dcc99eb801b4..1d17d7941999d4e78a3166e1ed40d349f62df534 100644 GIT binary patch literal 11497 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%0Dprx22ab`N?{xasd zlm#LBO@vbL$=zY{a#)63&zA~2n#orjCIkGcW)(~}Rc4v|@dzd>9VT_%L?>~tgSnr9 txu1i%Unu5u{UpO&h9#6<_@~(0#jj&NAq8Ztaq%xK{w4p4f1Tpr{67!48PEU# literal 11733 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 Zf6c$a(*vLWE#7`-@Z0=*ekaa<_!q=DVXpuH diff --git a/bin/com/kyzeragon/mobcountmod/MobCounter.class b/bin/com/kyzeragon/mobcountmod/MobCounter.class index bc95ae049acbff7881fcfcdcf9099a067242e138..672a714cdebc44a228944cc1eaa9fdd35746cd3c 100644 GIT binary patch delta 1871 zcma)6ZA@EL7=BLgEw?R~wv<9~B%3(KpmamV*avQGgN=_3#uOC>+XPEtu+lPGhWo5c z2D*(YIWuO_#l-l_%$O-5YNByJjK(a{#6QNwEc;_j^!E}Iv-#ZKQaa&>ZJ*mW&w0;z z-miOpD*50k#}5y`{2IU}+`R4hLnvxli+mvZ9d-n;Nk=s{%Zrveu|?joRNA+pR>O9I zfSj`gtU8{-4(V5VH)f*_yEW_*a1QsK>Z=@&4}~jRhhlLZdr&W+#)i&>1eCJ!77csl ztWu#i3Y5vWl(q7nqKRfwrFjj}2?qrB>nMj`Lu<;z)*Ky+g)|(Ld(&T!+Fh#Qo1v(N^>k#{lA2=d{am`{*v_zy>F-*T!clk(dZ(9+NS^gWQd zU{Y<%srKd6v!oK4!SJvSa>a}B`Q6SXnHMrwOqtH*)Zt9Z@3t@P@5x*-_aF5$|FoLP zy|mn|Z#fktm5y9Z6(W>Lnx_puMk%-0F9mD)>_!2f>yc1VhF?zhM|BV4*Hhv{Fy;o<7w-av}LXa)2oJMt_Bxyw(~aiEXm{xV5Pke8X9@cH1XSr18A1JoId*n zB&aL!>XLGCO4*lIHZ9|9(=wEOGmFZmWv;HM+)Cv(Dj%eB8ckbJf#&pj7zCJ<6;rU|62qC!kawmN zcj8()aRnlWb(!U*Cg9@s7H%_YTg2uSd-0|hb6!X<-uB`hFK#?OG7hXWYI>O&U&)BE NDBYKLxoW|C{{nQ>d!GOR delta 2127 zcmZ`(ZERCz6n@Tn+q-tR>(+H!HV6s~*e7$q25c}K<7+Y*8^S(RSl8Zd9a}rwJI45` zC@?@l^aW&ypol`qG$P9sG=_vf#At&4(fETOXpH|PAsYW6p7(YiC1}&rp8K5hKF@j2 zd+vLF#_b%(H~(D!8o)e^TygwPiZ!>UMf^$rTov;OX=4tob`0};c4 z5~SKuh*Aw@SSWl6mC9m5zBpr<>8kDw__pdn2P&{s#S-yjLW!jk%S4i;)uN(G3|R`4 zYC^6|PTbI`>%A&gGCJE<9qL!HTI4B3N)4e^w1@$am5#VZSz4-c%W;*-V6hXPxY!pt&~BR1P?)FE_RK~xqL z(9ngggv5ZMhrLE9OvuR1tDP*cW(==LLJvYJf&};DQ4PI#iMJ5cw;Ke{I77EL*il^9 z)}{N53KbE;jG%55_XL8vFYMjWZWQZ5BVY^^uQdOvI&^Pax9&g~eHyl*pP&XJd`{hd zvn?&MgaHjZ%t)s`%pnr)a(z7x0E?y^1LHJnQ`*(%xU*?0~0vmGuP!2mFlL-DYku`D1uO{+L9P)#S)W#t< zBocM6V`w^8bPelylv9$GQEc)Lo7qkAp%~QiIP^k1l%HacBiI}tiV?Iv3Poj8+8)Iu zX4c+Y9vTQdH9)&Rk+deBv zcst?r!@KF$s60Xo_`rDVr}FO{9*0~w`Q>j#0b_;Oha#NBTwFpiuHz|u%h%c+z6S4M z0VSc7rlE{Vu#jr8h_+xcg;7rXQ9-A$ls?8Xx`HaYfoi&m74#EU(Jxp{zp;N0HOPsw z*d)2X$hnCsh$xn!@k`FHH8NOlpD1x=cI-E2q+kSxxZml6 z9qb*M@QzJ*v8Zn%D!o|LHww{sg)2!g+nNC@`*kd{o|{^a)%?E}4It!nBP%yc<)m@tA#4=iJ9GFlf6|ps zr-hbWm(|82;O7z0k;(T-Had78oje3x;;bt(?HxW5zRY<~3KFv2?4J>5ljqxmtP?^i zdd1Jl(=6|rylEoYl}d)meU`biM4hWFYk*hoWd2>uznl5@Fn^T!_x=z6IdRK1-@c#u z4>13r$^Rbux$ZQvC?%B+nf&jI)|6?{^Rn@=d3Li5aD>}`6n4HOoj8UZMl$$dz+*5r zZtQ(Hu_X)0$>9r-`*Lww4KL$K#1wA&bPqoA;F1TIJs9@j6AwOp^r#(}C8>||o=%uj PT5Ro@6yY 16) color = 0xAA0000; + fontRender.drawStringWithShadow("Snowmen: " + count, 0, 50, color); + } String toDisplay; int color = 0xFFFFFF; for (int i = 0; i < 4; i++) { - int count = this.counter.countEntity(i, true) + this.counter.countEntity(i, false); + int count = this.counter.countEntity(i); toDisplay = "" + count; - if (this.showChildCounts) - toDisplay = this.counter.countEntity(i, false) + "/" + this.counter.countEntity(i, true); if (count > 16) color = 0xAA0000; fontRender.drawStringWithShadow(this.passives[i] + toDisplay, 0, i * 10 + 10, color); color = 0xFFFFFF; @@ -385,22 +386,26 @@ private void displayPassiveCompact() */ private void displayPassiveExpanded() { + FontRenderer fontRender = Minecraft.getMinecraft().fontRenderer; for (int i = 4; i < 8; i++) { - FontRenderer fontRender = Minecraft.getMinecraft().fontRenderer; int color = 0xFFFFFF; - int count = this.counter.countEntity(i, true) + this.counter.countEntity(i, false); + int count = this.counter.countEntity(i); String toDisplay = "" + count; int x = 70; - if (this.showChildCounts) - { - toDisplay = this.counter.countEntity(i, false) + "/" + this.counter.countEntity(i, true); - x = 80; - } + if (count > 16) color = 0xAA0000; fontRender.drawStringWithShadow(this.passives[i] + toDisplay, x, i * 10 - 30, color); color = 0xFFFFFF; } + + if (this.staff) + { + int color = 0xFFFFFF; + int count = this.counter.countEntity(17); + if (count > 16) color = 0xAA0000; + fontRender.drawStringWithShadow("Golems: " + count, 70, 50, color); + } } /** @@ -412,6 +417,8 @@ private void displayHostile() int offset = 0; if (this.counterVisible > 0) offset = 50; + if (this.staff) + offset += 10; if (this.counter.getXP5()) { @@ -426,24 +433,23 @@ private void displayHostile() int totalCount = 0; for (int i = 0; i < 4; i++) { - int count = this.counter.countEntity(i + 8, true); + int count = this.counter.countEntity(i + 8); totalCount += count; fontRender.drawStringWithShadow(this.hostiles[i] + count, 0, i * 10 + 10 + offset, 0xFFFFFF); } for (int i = 4; i < 8; i++) { - int count = this.counter.countEntity(i + 8, true); + int count = this.counter.countEntity(i + 8); totalCount += count; if (this.hostileVisible > 1) fontRender.drawStringWithShadow(this.hostiles[i] + count, 90, i * 10 - 30 + offset, 0xFFFFFF); } int color = 0xFFFFFF; if (totalCount > 149) // if 150+ mobs, display in red. - { color = 0xAA0000; - } else this.playSoundCount = 100; + if (this.counter.getXP5()) fontRender.drawStringWithShadow("Total: " + totalCount, 70, offset, color); else diff --git a/java/com/kyzeragon/mobcountmod/MobCounter.java b/java/com/kyzeragon/mobcountmod/MobCounter.java index ec7dd52..1b84dd8 100644 --- a/java/com/kyzeragon/mobcountmod/MobCounter.java +++ b/java/com/kyzeragon/mobcountmod/MobCounter.java @@ -34,44 +34,34 @@ public MobCounter(boolean isStaff) this.hostileBB = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); } - public int countEntity(int num, boolean adult) + public int countEntity(int num) { Minecraft minecraft = Minecraft.getMinecraft(); - List result = new ArrayList(); switch (num) { - case 0: result = minecraft.theWorld.getEntitiesWithinAABB(EntityChicken.class, boundingBox); break; - case 1: result = minecraft.theWorld.getEntitiesWithinAABB(EntityPig.class, boundingBox); break; - case 2: result = minecraft.theWorld.getEntitiesWithinAABB(EntitySheep.class, boundingBox); break; - case 3: result = minecraft.theWorld.getEntitiesWithinAABB(EntityCow.class, boundingBox); break; - case 4: result = minecraft.theWorld.getEntitiesWithinAABB(EntityHorse.class, boundingBox); break; - case 5: result = minecraft.theWorld.getEntitiesWithinAABB(EntityMooshroom.class, boundingBox); break; - case 6: result = minecraft.theWorld.getEntitiesWithinAABB(EntityOcelot.class, boundingBox); break; - case 7: result = minecraft.theWorld.getEntitiesWithinAABB(EntityWolf.class, boundingBox); break; - - case 8: return (minecraft.theWorld.getEntitiesWithinAABB(EntityZombie.class, hostileBB).size() - this.countEntity(14, true)); + case 0: return minecraft.theWorld.getEntitiesWithinAABB(EntityChicken.class, boundingBox).size(); + case 1: return minecraft.theWorld.getEntitiesWithinAABB(EntityPig.class, boundingBox).size(); + case 2: return minecraft.theWorld.getEntitiesWithinAABB(EntitySheep.class, boundingBox).size(); + case 3: return minecraft.theWorld.getEntitiesWithinAABB(EntityCow.class, boundingBox).size() - this.countEntity(5); + case 4: return minecraft.theWorld.getEntitiesWithinAABB(EntityHorse.class, boundingBox).size(); + case 5: return minecraft.theWorld.getEntitiesWithinAABB(EntityMooshroom.class, boundingBox).size(); + case 6: return minecraft.theWorld.getEntitiesWithinAABB(EntityOcelot.class, boundingBox).size(); + case 7: return minecraft.theWorld.getEntitiesWithinAABB(EntityWolf.class, boundingBox).size(); + + case 8: return (minecraft.theWorld.getEntitiesWithinAABB(EntityZombie.class, hostileBB).size() - this.countEntity(14)); case 9: return minecraft.theWorld.getEntitiesWithinAABB(EntityCaveSpider.class, hostileBB).size(); case 10: return minecraft.theWorld.getEntitiesWithinAABB(EntitySkeleton.class, hostileBB).size(); - case 11: return (minecraft.theWorld.getEntitiesWithinAABB(EntitySpider.class, hostileBB).size() - this.countEntity(9, true)); + case 11: return (minecraft.theWorld.getEntitiesWithinAABB(EntitySpider.class, hostileBB).size() - this.countEntity(9)); case 12: return minecraft.theWorld.getEntitiesWithinAABB(EntityCreeper.class, hostileBB).size(); case 13: return minecraft.theWorld.getEntitiesWithinAABB(EntityWitch.class, hostileBB).size(); case 14: return minecraft.theWorld.getEntitiesWithinAABB(EntityPigZombie.class, hostileBB).size(); case 15: return minecraft.theWorld.getEntitiesWithinAABB(EntitySlime.class, hostileBB).size(); case 16: return minecraft.theWorld.getEntitiesWithinAABB(EntityPlayer.class, boundingBox).size() - 1; + case 17: return minecraft.theWorld.getEntitiesWithinAABB(EntityIronGolem.class, boundingBox).size(); + case 18: return minecraft.theWorld.getEntitiesWithinAABB(EntitySnowman.class, boundingBox).size(); } - if (adult) - { - return result.size() - this.countEntity(num, false); - } else { - int count = 0; - for (Object mob: result) - { - if (((EntityAgeable)mob).isChild()) - count++; - } - return count; - } + return 0; } public void updateBB()