From 915f3056bec655d811fdc6dcebc6fc006c0320b8 Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Mon, 3 Aug 2015 21:19:20 +0100 Subject: [PATCH] Better balls, fancier Infinity block, update todo --- .../spiteful/avaritia/LudicrousEvents.java | 3 ++ .../avaritia/items/ItemMatterCluster.java | 24 ++++++++----- .../resources/assets/avaritia/lang/en_US.lang | 3 +- .../textures/blocks/block_infinity.png | Bin 2481 -> 6320 bytes .../textures/blocks/block_infinity.png.mcmeta | 34 +++++++++++++++++- .../textures/items/mattercluster_full.png | Bin 3208 -> 3235 bytes .../items/mattercluster_full_mask.png | Bin 3661 -> 3077 bytes .../items/mattercluster_full_mask.png.mcmeta | 22 ------------ .../textures/items/mattercluster_mask.png | Bin 3500 -> 3017 bytes .../items/mattercluster_mask.png.mcmeta | 22 ------------ todo.txt | 3 +- 11 files changed, 55 insertions(+), 56 deletions(-) delete mode 100644 src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png.mcmeta delete mode 100644 src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png.mcmeta diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index a99fa1b..ee51d39 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -196,6 +196,9 @@ public class LudicrousEvents { event.newSpeed *= 5; if(!event.entityPlayer.isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(event.entityPlayer)) event.newSpeed *= 5; + if(held.getTagCompound().getBoolean("hammer")) { + event.newSpeed *= 0.1; + } } } } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java b/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java index 282f12f..4a663a0 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java @@ -196,7 +196,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { int donorcount = getClusterSize(donor); int recipientcount = getClusterSize(recipient); - Lumberjack.info("merge 1"); Lumberjack.info(donorcount +", "+ recipientcount); if (donorcount == 0 || donorcount == capacity || recipientcount == capacity) { return; @@ -207,7 +206,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { List> datalist = new ArrayList>(); datalist.addAll(donordata.entrySet()); - Lumberjack.info("merge 2"); while (recipientcount < capacity && donorcount > 0) { Entry e = datalist.get(0); ItemStackWrapper wrap = e.getKey(); @@ -231,8 +229,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { datalist.remove(0); } } - - Lumberjack.info("merge 4"); setClusterData(recipient, recipientdata, recipientcount); if (donorcount > 0) { @@ -246,10 +242,12 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - List drops = ToolHelper.collateMatterClusterContents(ItemMatterCluster.getClusterData(stack)); - - for (ItemStack drop : drops) { - ToolHelper.dropItem(drop, world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ)); + if(!world.isRemote) { + List drops = ToolHelper.collateMatterClusterContents(ItemMatterCluster.getClusterData(stack)); + + for (ItemStack drop : drops) { + ToolHelper.dropItem(drop, world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ)); + } } stack.stackSize = 0; @@ -288,4 +286,14 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { { return this.getIcon(stack, 0); } + + @Override + public String getUnlocalizedName(ItemStack stack) + { + int count = getClusterSize(stack); + if (count == capacity) { + return super.getUnlocalizedName(stack) + ".full"; + } + return super.getUnlocalizedName(stack); + } } diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index d58767c..84271e2 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -33,6 +33,7 @@ item.infinity_armor_3.name=Infinity Boots item.avaritia_fracturedore.name=Unknown Fractured Ore item.avaritia_fracturedore.prefix=Fractured item.avaritia_mattercluster.name=Matter Cluster +item.avaritia_mattercluster.full.name=Critical Matter Cluster # # Blocks tile.compressed_workbench.name=Compressed Crafting Table @@ -56,7 +57,7 @@ tooltip.infinity_ingot.desc=The fury of the universe in the palm of your hand. tooltip.record_fragment.desc=One likes to believe in the freedom of music~ tooltip.skullfire_sword.desc=Beheads skeletons and scorches them black. tooltip.matter_cluster.desc=Use to deconstruct. -tooltip.matter_cluster.desc2=Hold SHIFT for more info. +tooltip.matter_cluster.desc2=Hold SHIFT for contents. tooltip.matter_cluster.counter=items # # Achievements diff --git a/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png b/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png index a8cd09776a6531735b867ccbfb09a5d8a74dc4cb..a63ca5c6c7e60a899df04652d9924c3757a87944 100644 GIT binary patch delta 6311 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 delta 2442 zcmV;533c|cF|iYn7YaZK0ssI2oF8DplaUH8e*g(^NLh0L01m(a01m(bYSxJf0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a2@y#|K~zXfW!8CY6xSUG z@UdAV+BB&UEtfG45TAu$SPQ5PCYU3XK&VLwS6l9LW_EV5iCrKV?=idH!+2-j;$<&m zf154B*vL&vlX@rzRO-WTEb_@aA^XAvzn_UBHrJt<%W8Rzb?CB3oa)b{ zn`!SXqq_;J?Y~Z0-aag;ZT8;OM5EgQf2k>uw09>89>gX>)B(W?jVqVsejYaPAN6vu zl83lJmkD}8)KgdzO;i|B8;RJ}utS#{!-ZZi*XGIK0=zZA6TFBCG|n4|Mah&%Q#RUM zZx9KvR0+Zo_+)&gEn0FOoZ`vP1llFiC=XEq77A(g;HXuEsALd}q1tJ-=6in6f0cT) zZr;E*DJz3>jsK3|3)sMFgA30<%w|MIw#$6+gG$?<0}>5-G_KQ~=@#_(b9yD-I-8W+ zX(bPl3Ga2;ASyyc93ujjvO}U_hv7f*KG)&O^a->(pW@z1BPfle4F67Ir8 zOJAj(78+`#rCxl(yiYEP;NN!>f8V4|zy*)1C3iuTpFprlZ*Lxz{TVLe)=r6V1z*Dk z>3rxF)r+FhEnrbA|ECmBlbn$dj5zxMU^}L9_3pp73GZH8@Rvaz`t#t50GD~=SG80ID4`=i&COrZiYk;mMV^e#Ei_N$(BmfrQ0M~dJtb+j#@CR`V>SfXBe-j`jLG%PA zC&wC2j>_S?+-okcI2i^6V?dyTJ7JK6t4qx1h%{}X$)|o7X)!ulM}iw4`duR)CBvO} zX*CCuefjz_QBSisf%W|PWdig{^rS;2PwO40X|PofwCRmb>Mqwf#ib<#h>J8PVHxow zByNX9EyNd-SfkN-nwB_~e?oc0;~SaLKH@xom+NS|A99*C-5>O{2e(H9^0y^Ezu$L1 zSoWUZN85eSJ{x>zmDf55lH<3kUT zwtI)R-H)C5_UyCRd@pCx-=j;LnTLA2VU^URWLWJ+%Aqn3cCg_af7&7DfapY+gWXy# zXRuZAJN9oRO+2X*=#rd=uvMZ zTKFq#(nhGXv8LK-e}fmQAvXDu2PN_YC1QEP!+!Cd$OJ|QS*@1Xn$`x0?jey`V-*6H zqRyf()vEr(8dvGcEJF_>#l3TljTjCw73xZ3xpaNM_-RE&I zw$Qqxpj2ihK^aP5#jaOA>EZHD<^i9OJ`BAU1CJKwA&;hbe}#F#Lj*k>Aqyn3>gO64 zm9#;@Z0zmOFFf*~G7miM;f)?1&K-e-m3i=mGTa-58e&*0kfB1hEV-Es93=f5t~9b9 zj%7U@9_ySkDwp5oV#l}Gt)$1eEavr9k2mf3bdbo#$9@=F*AAwJrsoq^YDt6^^nbnGSkD_R_0-|?>C(4f53cDdYjemS1}({MKaJs%C0gG z)6fG+KJtM1zyd|i^mFVxVsATmf~Rro0Wlut+qb&qBm*U_R8NhglkT(&NQj zar>-_Sl)+K{6qX{WedxPz0$P`i4ZHO76@C0i)1gSdbDI-j?QxN510=N1iU7TM8Z5U zKxRIae<}EvwRhG7%LlXDu(7f5tiNE(<-=BSB!C{CyBo>oLy0@sG5M=_zRqr)fF2%1 zOb^+7s1(Px3!f8#mPv281z>R`U;hcv`_rETi`A}(lf2&3$TSP+^)oecab`7N}E++X8?5~;m zU;+F=xu|>G10FL1x$-=8bL07t^Kh#t@9l&{*6c8RM=>AV=z%a2JY2Jq{X7}KbB)9J zLJuk)$iVI4$i1U)!$%k_1I~IC4AnBd?dV{D`OYes!nI1}9TAfI01ZcAn zY@tVYvzj#SVXrwa%|0jlFLRM5e{TbN;Mn`5D{x*i9?eS_4puWCme%IxCFWt3+dC)_ z^iYpoot>9*9+XQQ#qZHm4)rS_A*C=MiZCA*G7m7cl??H4oF{|zWEKA({K}XQ2Sv3{ zASnw(iNrEd*1r~`R)a4noFAXyL1HJ@QVY&rgMB~M0-;Gd8QK*zT)2M&@X`o4ff4y>__UCVG zH(R(~LJ$PBiv?aS-=ea(pVQZu{U~G<;9p){ z*xeW)TiT7zWl>t=ti?Gu$O5D|h*2FdIitHZDca`D++^0f*&KZElgV+__>j4=aQ zOOVTutA=F&E&#}dCk^(TI7ap8 zBE`M)1pGi%LE`hUFTl|0L@>|M%Z(KwEzGB07*qoM6N<$f(yO&EC2ui delta 467 zcmV;^0WAKb8HgFMzzTn}Nkl96bYj=FisumR5sIgj5uK{eH=h z6US&GSZjzP0~m5AoQ)M@Jnd#)k!=3H-s=xJK6NCiqFN{vkr}fjsd6&#y!lWoV^u0R z8#^XxAiE4$TX26>wKVTNAt=cNhNFBjh_jbfl@LN{S89|H$dan0RZ=f-PMef#&`e#002ov JPDHLkV1hF40eyMPF8?h;U(v zh_rM;%00LR4TWqHy-`(ng3@JKzJk6vx2oY z%AIqs5!`{_0ngs~961N? zf2UK7G0bK&wAKKG5NMi)wr#mwE^IcNv6E|SljRSXsuBy z*8PJwBcdCIfe-@T`?2l&2;O@_2n@pzND)LX>~=fm^ZBnLo=zv$>-A$7`o5=aTk5)| w>$-|Pi}cr3PM%%ktH+eQd(O8308Ra}b>o1*1ONa407*qoM6N<$f^=M_761SM delta 939 zcmV;c162Hl7|k4z7Ya}a0ssI2pUGlcu_2xce*<_)L_t(|+U%A=PwGk($LDs21*R$0 zA<)F6WrGq73(J<^rhW}zX^1X}ThXd(SNa9~27CY(;;tHEln_7?Y)M2Qsj1KqBdxiM zxlyQiy~@2WdGFm>HPdtE^ql|s^$Y-?T;JYq$+A508B8>FSiIcDvBoc{4AP{(KhTi(e1i^VBoE*dh5MaV z`igMB-Wt<2-yd231s-x`*mn5mxYFU4PF*j3r6RWHOmdMv^3q z@ds7Xbv>WY=kxi$Jp7AzKnO7m!}EMN91e%WJkK)>gAjUG>6w`sK@g(RXfPNA0MzUC zVzH=cTCdle9FgbwR4Sz?3gJOflvFCk^ZdI!&@>$k2BXm^;emvrY5Mo^V45cRe{RA< zu~@9v>!xW=5RTNFVVL)lei3A>N`t{b)3k?&hqJRY63{S=!C>&0hkup_gpk|qW?9zj z^?JQtmSx>;H$rGK4+tTT$0G=WD2nlTJRXmWq9_Q0$Kx6Gc~#owa%|NL08UO$WLYj03KT^R zhr@oquW4GjT)w)xDwoT5cXz#BZ)#k)qcNEI5tgF*LA}%e}=>1)WZG0 zczAW7C~9|i7eaV&a6o#&vaHR`P20A2c6OehpT`_1irU-TJ3KtZ7|+ekz36a%f3NHM z#>U3>_BQeP;jq8Ie{^&-KR+J|g%%bTIF17VwA=0L>+5Q@dV71jzP_H#W?z+t5Mqo& zq0s8;>dMLr`NcPz%|f97e*k!Ve1s5=Wr;D4#bUB7HyRCVWHlNMS(an57{+*PJ`fl< zjw5H2`9MYt$8n=be04q$7~1W2v)KdykoiE;Xt&#=Nc`X-o6RbU;&QnlgtN1=9*^fG z>GSjRo12@pwY9M-*|x3gdbL^w0BD-#D66jPB;XXneY!RNAP?UM6#$k5P$ybUwG;pV N002ovPDHLkV1m-W(KP@7 diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png.mcmeta deleted file mode 100644 index caa3c53..0000000 --- a/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png.mcmeta +++ /dev/null @@ -1,22 +0,0 @@ -{ - "animation": { - "frametime": 1, - "frames": [ - 0, - 0, - 0, - 0, - 1, - 1, - 2, - 2, - 3, - 4, - 3, - 2, - 2, - 1, - 1 - ] - } -} diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png b/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png index e61a357d57d42519eb6c53aec3d66ae8aaeff363..917f15abfc420b5245513dac462b7bc8111dc8b2 100644 GIT binary patch delta 290 zcmV+-0p0$r8_5@t7YYyv1^@s6AM^iVu_2xce*pAJL_t(|+SHS=YK1@$MUQdC!Yu>~ zTRR`@fB63v7IwBWV2sM2RU9Ns;M>3x}CIcLHGNLA~*?9s|U=34(wy42hzM zIF1qGL-yX|oMT;AwrykI_j^DXh9pTsnxpGTY`5q9*F5;)?W7i0&vb@jG<|oW9+ku#u%J)7eH{1 ovJm3OXS@J@6Qtn(KhygFjzWw$G|pN>3;+NC07*qoM6N<$g3UdHjsO4v delta 776 zcmV+j1NZ#N7pxnQ7Ya}a0ssI2pUGlcu_2xce*)J@L_t(|+U!+bPvSrny)gYqv?;Zd zKob+-h0=szVt6zWAJCsc_^bLx3^Ar5QF##hKw6SP#G%qUwfiuef{3f@YBrnYJWlVK z-j8$U0&MU;Qm>DS#p2=NApo46o%Q?u_wQ&nn{gb+aolV+Uw=*ijg&UnV4apQ#{2vG zf7NOg0Bqa7xVRvM{OW>6qcI!~8DosG;c(b!G~SVSwOY+)vj`!CP&S+8zxpFTtP*V7 z9*ss(6h%=q8jWn*{_3JP_!s3Z2*TFZmZoWnq5uG;bTXOvzRws-V$d={QItZVaBy&N zbab@0x0lIeeBbwdKL~>Lzsu+ItyZhue{OR>wA<}gtCi2^-&CujD5X-VR;zJ8)M~X- zsl?O!B0o?{d%a$#)8T&TbUM9Wk5c+(msC|P6bd{O0N~`oU@)CdKi}33zFFR>R0<&^ zilQvbf*=3@V=M@Qr>CbVisCr_Ije=x5!&9~)-(-coD7Z-GMP+fvsp5`1wj-=e@)Yh z#bTvW$>nkY;CWuR+wJ%JVHmC<$g+$vu2d=~Cnx1{833-YuL0oU;o<)N{_*i~l^_U$ zqA0msu3Ro#mc-9Q+ z;vL61Jv{}0`FuW`%{U>Qm_gTd(=?N4zAozZx@nrauFJCgLf+gAhGFn%a=srp$1sd# zOMG@ea5K2B>o^Vo@cqEca9wxV5-52xBuNrQ5h1j*vy;hWlA_Pg&u?#U$K&yfE`?!8 z2;m(Z3wE$L diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png.mcmeta deleted file mode 100644 index caa3c53..0000000 --- a/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png.mcmeta +++ /dev/null @@ -1,22 +0,0 @@ -{ - "animation": { - "frametime": 1, - "frames": [ - 0, - 0, - 0, - 0, - 1, - 1, - 2, - 2, - 3, - 4, - 3, - 2, - 2, - 1, - 1 - ] - } -} diff --git a/todo.txt b/todo.txt index 9c91bda..33d1892 100644 --- a/todo.txt +++ b/todo.txt @@ -1,12 +1,10 @@ - Finish the main tools - World Breaker (Infinity Pickaxe) - - Mass destruction EntityItem - Planet Eater (Infinity Shovel) - Destroyer Mode - 17x17x17 AOE, No Drops - Nature's Ruin (Infinity Axe) - Treecapitating? - 17x17 all trees ded on right click -- Make Infinity block not look so derpy - Dire Crafting Table stores inventory - Neutronium Compressor - 100+ ingredients per singularity @@ -15,6 +13,7 @@ - Cross-mod support - Clean up the code - Finish Thaumcraft support + - TiCon Materials - Add configs - Configs for all cross-mod interaction - Config to gut entire mod except for 9x9 crafting, for modpack use