From 6a69c66a97025c6314411fea89253cf5b8f84d0c Mon Sep 17 00:00:00 2001 From: HbmMods Date: Mon, 25 Jan 2016 19:26:54 +0100 Subject: [PATCH] Changed Difurnace textures, added chainsaw and glowing mushroom stew, enabled config file --- .../blocks/test_difurnace_front_off.png | Bin 394 -> 402 bytes .../blocks/test_difurnace_front_on.png | Bin 395 -> 404 bytes .../textures/blocks/test_difurnace_side.png | Bin 408 -> 425 bytes .../blocks/test_difurnace_top_off.png | Bin 397 -> 430 bytes .../textures/blocks/test_difurnace_top_on.png | Bin 401 -> 435 bytes assets/hbm/textures/items/chainsaw.png | Bin 1395 -> 1353 bytes assets/hbm/textures/items/chainsaw_alt.png | Bin 0 -> 1395 bytes assets/hbm/textures/items/glowing_stew.png | Bin 0 -> 270 bytes com/hbm/blocks/BlockMush.java | 3 +- com/hbm/blocks/NukeBoy.java | 2 +- com/hbm/blocks/NukeFleija.java | 2 +- com/hbm/blocks/NukeGadget.java | 2 +- com/hbm/blocks/NukeMan.java | 2 +- com/hbm/blocks/NukeMike.java | 4 +- com/hbm/blocks/NukePrototype.java | 4 +- com/hbm/blocks/NukeTsar.java | 4 +- com/hbm/blocks/WasteEarth.java | 23 ++-- com/hbm/entity/EntityNuclearCreeper.java | 7 +- com/hbm/entity/EntityRocket.java | 8 ++ com/hbm/explosion/ExplosionChaos.java | 2 +- com/hbm/explosion/ExplosionNukeGeneric.java | 4 +- com/hbm/items/ModItems.java | 9 ++ com/hbm/main/CraftingManager.java | 2 +- com/hbm/main/MainRegistry.java | 114 ++++++++---------- 24 files changed, 102 insertions(+), 90 deletions(-) create mode 100644 assets/hbm/textures/items/chainsaw_alt.png create mode 100644 assets/hbm/textures/items/glowing_stew.png diff --git a/assets/hbm/textures/blocks/test_difurnace_front_off.png b/assets/hbm/textures/blocks/test_difurnace_front_off.png index 85049ee7ef7a2f809db2fb0b212293d2dbdbb676..3a3485de8e9fefb1d7c1f86b41e3b8600c8f9590 100644 GIT binary patch delta 324 zcmV-K0lWT+1Cj%fJPN@801m+cxRGn^kwzbXIczh2P5=M_5J^NqR5(wSl1XlaFc3w3 z^K6l@AdCx!1qX;gLWpdl1O=MmRC#t0LU+$YuC6d{Dq6I{%eR6wY*EF}rUP{ePJErhXT zhh)l$c(ur^7!HV~eM(fo18;}>dp)o(C>0R@n-UMAxQ}x{BJe-sll~YY5%~WFt@Rhm W7yUhW4fD1D00006!%d)KNid`7Y?En(vh${p^Ao4tChj%HP3BKd|K1otdB1ya& zfh64}RDcHjoj&;jSD@kht4sJafssZh98mL1V4k59??V%@0?a=nrF;T8(uqBZ?Ln*n O00002*!%TxKagUC60lH<3S{L|9TKT}kaB(Cdft%D#)(=^Mn zJkN;&+V}mZZ}>)4RrO{WhG87XX_|=e`WJB=EAH5{J1_@4&+EFbZCeBtiRixX&n8)a ze6~1_V=Bz^j1z=W&Xo^M!#|de14k+XE)LK;9zcdb#Ltx_7VElhnr64OEQ<{1 z{e)b3g=xAdiaoo7iz!j=*7LE&h~yhnVO`g4+oC8!2p=c7m@TP*P-R(45{99O-yB;A zW62K5loRn{ky$Yu5KH@%sDKCF4)?b)dSFp1ApSQc9z<~;=YT}uf5s>MF+?Kp{|j2{ YF9jz3Sp)tkw*UYD07*qoM6N<$f>L;rzyJUM delta 317 zcmV-D0mA;21B(NYJPN`901m%Y`|~ZRtFmwg=JZP zRAHJXD52&13FfANqtkZX?&HBvN&AI8WCy%lz}unWC<%K0N-E2;swypMo@Z{(&jC*P z20c2R5(wKlFM#`Knz9s z{79fso(moeKA-}DP`eowR3IT=)icoS(bHOiC}&sO;ZmIJ^ce)aJ^o~aU9OPIdomuw(aY|<#Mrq z9d5T9PPT1x=TX;(Z`C)33nxp=qnQIXG?M}})W3+YJ~e6RaJU2h63XA3r&bW3*0T$b;^N&Gx{Kaf{rIRch+OLV{kZ^y%lACSGNtOLzY tTly2MdaiGQ|1&TIkAHDgYdZ&w9539a;7lx&w>{{AkJB#G;~Qpz9*(lpJoEYEX9 z0%PCzzaC(ZsH*D6FplFiP4he>0(C|l#{xBY_7C&{&-41e@1FU#Xqu+3>x;p09DT!o zx~@>NEQ|O9uCEjx{3OZF9lRdE+gV4~A=kF8uK56ZC_)t?OWL-L%t3A#28yVM!4V1l z=%Ofi_O|2vfb9};um$meB#}kfpe5mkecx{e&BRzmMeB-hfy7_FEK7vmZXla}Srhhf)XXwQHU?L(w c{}WQmJIR{9o;{yA%K!iX07*qoM6N<$f)R3+K>z>% diff --git a/assets/hbm/textures/blocks/test_difurnace_top_off.png b/assets/hbm/textures/blocks/test_difurnace_top_off.png index ad5b4ef06cecff41b9681024701b74f7bbe3e045..d5f3f0afad7df5be63dedd6615fa576f5e6aa60e 100644 GIT binary patch delta 352 zcmV-m0iXVj1Fi#*JPN@801m+cxRGn^kwzbXIczh2P5=M_EJ;K`R5(w4lF@2|Fc^jN z=DRH@b!zoO?S&5@2u{|UF$JCaR{N4;Q<1TQgybau$(O%1S(XJs5QbqK$9bL?MNyU| zqr^OlqW7mbW9qv8b{fZVnx=W48PV5Yy4`Mu3}*fwC29NUkd0#tuGeed_uONi!u@oA zB5Svt*)+}Na#F7q!@!b}Bt?qEi=`oZUpc|X$PWS)6P0<{0^cQZQxD096B8Wy9EIE> zabnvx-zBn1MQ|fdAG?&MsS$(k5})TwCPfYsTaqLeNnLWj6?>1z10JPFuP)(&bRtpT yj*joaxl8|xdtR?(A@P5PllSo$Mx;wn7>2*2ce0y#W-g5Y0000!UmX delta 319 zcmV-F0l@yQ1C0ZaJPN`901m!XS(a5*)pd=P z!9I@Tn+5NvuInDex~|){?fZ@u+~1MsxxzQFQ?GDX4i+fpLKH>QG>K;UCgfo0`#uPN z0+Zo54wioD0YAjE0+0a(zgTjyXZ#DOeH=&82=>E>L=3|qmd^9!<}AyC0Iz^EV|AFK zo2HQy;ofr_l7;tOf|D=8vjpeH5;9!Z#nQ*3vn*3>+hWHOVjQOYMsx~*lBTJ#Df|G`fxQy6L712n$|%rktVJ~R<4!2B~>>pzteHUKo3 Re^USe002ovPDHLkV1o1Kl0^Uj diff --git a/assets/hbm/textures/blocks/test_difurnace_top_on.png b/assets/hbm/textures/blocks/test_difurnace_top_on.png index 9304d600f3e794f6cdaf7b60b168581ccfb30eb1..e78f3ce9292d2ec382921715ab960c4805aa57fd 100644 GIT binary patch delta 357 zcmV-r0h<1i1G58=JPN@801m+cxRGn^kwzbXIczh2P5=M_F-b&0R5(w4lG|#AFc5_E z1byY+3I?sm3lA4QfFM|@H>C<%^{x6PtEouoAR(FT&Q9k4RhDJG?`y52D9ZD^D2lQy zSq1FFFnqf}jcS_a%VM7AWm(pBWd)yqAx%?-20J%Ll;rx(pbcXhf*=@%fjQ~|?1u$^ zS|?@6wrxGnGZVILJMUg!_z?THsOwr7X%|QE+z3zKTh5)*uV%+ zDb9^0DvslDDWQ!jz&D`!o>Gz|N<6qwl=z%)qjJS6-r_hmmLw(9V8Puuj`%rMEPhjh z#nQuxAFc5|F zD*LvALD%04e=d9gL9kM9N)>d~r`n#(Ol%Fy_CrE)#yDrjQCXJxzOS{8qA1VvqA1F; z#L8eFhT+|UcU03f-^4u6%d)KNiWPjlB280;Z(ygca99o&DCR;C1j8_hX89!KU}@Wb z*7H1*VcRy*o;UL-^&tK#02xs5)sl@}a4w+szVBIL*bgHT(RH0z+V`ECGffi$yaLXQ z^~4liRh68G^SyIJvhcb~aPmPomf+l2LWbiwMEkGkBuP|V*VwUSViczQBw7VPiR0K< za=HY@adi9u=@K&hTC#B8IqvD= z7*Y}UcBXgU9RmTE+IccZvz4pY7cs2oeKN_if6=Qi!dbUuB8{`osRcVUDtD&rReSDy zSpR=-TztH^rM~>)@87?(zK&wpvuv&we=_Trsw#`bPsfkD&nVdXrSqKe6U9x=I~Er& zkBFNY@bm54+@F8`@O-vu|I*bd>-3Oe#jC_0RmOXCzBm5dRQ1$o>Svi9GQa$};^pTt zEts0UgXyL56ox0!j3$QPR%P$tiQ#)YQEgc%$01RV`C);*Z$hsZFx*l!F{^V7;_FG(@@js;Nvv8HcaWYk?N+33h82N!?t%?jge#=ZvJN zc7>S6FPYar{XVV)QPyE^A1}7kNnqW9Z%^G?tQ+2d6vnjt_mXDuo_Du8^zh0JP6Y=h z6u+pvTEM)V?lsS@@vj0-R9nZ8%;*suWzTaEf|XUZ1qDIaRNi&L(Mv~uvNYxsvyrXShmlbu640x3!h_!UHI=ipXCCl zf&=i0OjX<}7vW1*EDwLiye&Te+a)!wl$YJ%T%zqGi#SD&>w9_L-!1MGHWXM~!0<%o znzH>QW(DDMlh)_{pBLZ4|IcbsQkX*f*A;ETVTu+BCoI40$=bmj!oi-wDA{U#q--vO zrOp+mjqDpN4=-o%*e$U6@I`?nfp-UUAD&R$uwU|N=ED~p4rOmI?)|?i`|@Ijb#>L} zSU#-1T>7u=NcOFl3|rPT#N|J{#KUkXrS24GxcB@QHrx$iWgO)t?^qHlQ=L+4Oa9s@ zKA%v>5T)?r(j%2pLA_FjAMmtvi{0V1z`i$Mel9X*fTjh-BasY{nBTdonqh?-FlAXV z>=yXWbO9IwTuaVx-^JPhNk|18kHVlzE!QZ+^v_o4gDE|Gi+KSgIo)CXD9ZpzhIiIx zGsqm@`$~%MfM$mvgZd*b#~n=Xqux!_YLGw4IKft?L5zca2Z#KhQWl4@_ks+jbG)=! z*m*43=1pb59da?Zo7!8vuitCAe#rJm$&Qk@$sK>sYHV-w=2MVmJh9GS_S&wZhhJA) zzqj$=^2z@FC|$PWr2&^QdyA87(ku~=0H!1Q>g%t%U%$9B8k)4UJ^C`PSbf}fg+(($ z{%+BX&Z#F8ZIdcfA!*B0S*C%Pr6H&?M1Onds+9G6+N2%gzrId6Z2P_7u6IMkN;63E zVScf?X6~Dv&(GWb7g|@%`QgrIyTF;@v4?pVtS{<(T+yl!^Id2``FT~pBMv=>co%Fh z0;isJ2UuR*|J?oIV7z@==*ob6&s$ablY9L%*6Z;Fc~!t-kHOQ`&t;uc GLK6TVFj8{> literal 1395 zcma)+c~H`67{}iqLV>P`kuzrP4%k7LnuceZfS6WD-r3ryTpvU1jN(P{SY{&>!LpXZP7e4bYn&J3}&cCrQl z*lrD_M_MAmVtn)hi_b{oI9UP&M~2Wqec!UbEd_EfHH->?Tw*iBLRo4|PUtQe0Bpyc zL4Rb|rdZyLZKYGA4<(Gts9DcKalwTZz9+QmcS@Pnp-h6b_a`#%Qod@Z-SyMmS$@U5 z%J5aKE#~c~&x8`(+QmA(KKqSUt6kd9Ot>ldC)@}$vd%Z9+kd_N)ajn=T>y6S1S3j@0B5X!ux}HO0ps zTJ*s4+d9gbgzFs*J!(g*+Y9BW%IP)ei<`cV*Dmz=?g+QUol<~%GF5bq$eo}gL($q= zy~ie0CHcN%Wq>dQTqBTkoDnOK#_T|IOYv|U^A=Xpv&zxx98TH%vW*15Q9A1+H1 z?Ttmy>fY{ngX0t~3J6``<;270FORD3NTR%U@E_mX;{NK)}&1#ag{~{6PHc zx^2}#26nUjbFG3$PcMt;nRP1>SNm}{N9r@o=a%g&%<^rk@FI@3+~tWLG#0|aS(F&B z5SGrP$XpQ;J%#MQS9M{!fVnu%il8l(Tbt4ld+5z)G!SS|Y;PNXDYN4pf6<%pzD z)F|PJVc&36qYQlt7cnr(8T09PG+mvZ=sAvaP{5Vt{8fk*^ub;wsnqcEgoyY_b$zEh zsZs!xRX9)~ zKlX|RWgn}~Xz)p%4P^`XTvt^r14WS#a&P`=TrGC>-Z>|f_HDf8@m*Qq%FT5t?V924 zy7M@5W`%1Bn)KrRN+8Q%7>tAPliRPBY{Ng$o96ktYqxl_$8^f;s~ha3V$&5GUogi~ z7K!>ndMw|RGvt`e|467o;Fxs2AV>U79k^kjVUL%34iy)m*+G3eBC@DkACbK!;64kT zG7oHHy|=$D3nn>JXiZzbln$){S0ObRr}`s&P*;xN?FmF->%q>I8UMDlVP9LLuLi6jXo6AbQVe&1bDBH7yT*t$fLv{B+V4WBQP!rIka3!IH4x#Vjocv$dbnJ; zyKd5VTXl~n#wl%Z(lei3F&mtm#@1b)ExgUUB%2-Bb4!R69Zf7+3 zfOgj2;GKN*HWxl$v_!!Zw>{pSd9nT8jLk1GD6O|{ajWGo1Y3id^m{K|f|94W-f2%)ej{pDw diff --git a/assets/hbm/textures/items/chainsaw_alt.png b/assets/hbm/textures/items/chainsaw_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..f9e6d88208fb353e79d54969525bb86cb477d77d GIT binary patch literal 1395 zcma)+c~H`67{}iqLV>P`kuzrP4%k7LnuceZfS6WD-r3ryTpvU1jN(P{SY{&>!LpXZP7e4bYn&J3}&cCrQl z*lrD_M_MAmVtn)hi_b{oI9UP&M~2Wqec!UbEd_EfHH->?Tw*iBLRo4|PUtQe0Bpyc zL4Rb|rdZyLZKYGA4<(Gts9DcKalwTZz9+QmcS@Pnp-h6b_a`#%Qod@Z-SyMmS$@U5 z%J5aKE#~c~&x8`(+QmA(KKqSUt6kd9Ot>ldC)@}$vd%Z9+kd_N)ajn=T>y6S1S3j@0B5X!ux}HO0ps zTJ*s4+d9gbgzFs*J!(g*+Y9BW%IP)ei<`cV*Dmz=?g+QUol<~%GF5bq$eo}gL($q= zy~ie0CHcN%Wq>dQTqBTkoDnOK#_T|IOYv|U^A=Xpv&zxx98TH%vW*15Q9A1+H1 z?Ttmy>fY{ngX0t~3J6``<;270FORD3NTR%U@E_mX;{NK)}&1#ag{~{6PHc zx^2}#26nUjbFG3$PcMt;nRP1>SNm}{N9r@o=a%g&%<^rk@FI@3+~tWLG#0|aS(F&B z5SGrP$XpQ;J%#MQS9M{!fVnu%il8l(Tbt4ld+5z)G!SS|Y;PNXDYN4pf6<%pzD z)F|PJVc&36qYQlt7cnr(8T09PG+mvZ=sAvaP{5Vt{8fk*^ub;wsnqcEgoyY_b$zEh zsZs!xRX9)~ zKlX|RWgn}~Xz)p%4P^`XTvt^r14WS#a&P`=TrGC>-Z>|f_HDf8@m*Qq%FT5t?V924 zy7M@5W`%1Bn)KrRN+8Q%7>tAPliRPBY{Ng$o96ktYqxl_$8^f;s~ha3V$&5GUogi~ z7K!>ndMw|RGvt`e|467o;Fxs2AV>U79k^kjVUL%34iy)m*+G3eBC@DkACbK!;64kT zG7oHHy|=$D3nn>JXiZzbln$){S0ObRr}`s&P*;xN?FmF->%q>I8UMDlVP9LLuLi6jXo6AbQVe&1bDBH7yT*t$fLv{B+V4WBQP!rIka3!IH4x#Vjocv$dbnJ; zyKd5VTXl~n#wl%Z(lei3F&mtm#@1b)ExgUUB%2-Bb4!R69Zf7+3 zfOgj2;GKN*HWxl$v_!!Zw>{pSd9nT8jLk1GD6O|{ajWGo1Y3id^m{K|f|94W-f2%)ej{pDw literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/glowing_stew.png b/assets/hbm/textures/items/glowing_stew.png new file mode 100644 index 0000000000000000000000000000000000000000..81f6ae236debed9f77546a81cb313c595b835903 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwvjz;Cd6#jvB|ZvBZDI6bJ}K2Mm5{)|uur!oyYRvqAd7*))78&q Iol`;+03+*G@Bjb+ literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/BlockMush.java b/com/hbm/blocks/BlockMush.java index 39412ae54..6c30eb1e1 100644 --- a/com/hbm/blocks/BlockMush.java +++ b/com/hbm/blocks/BlockMush.java @@ -2,6 +2,7 @@ package com.hbm.blocks; import java.util.Random; +import com.hbm.main.MainRegistry; import com.hbm.world.HugeMush; import net.minecraft.block.Block; @@ -123,7 +124,7 @@ public class BlockMush extends Block implements IGrowable { public void updateTick(World world, int x, int y, int z, Random rand) { this.checkAndDropBlock(world, x, y, z); - if(world.getBlock(x, y - 1, z) == ModBlocks.waste_earth && rand.nextInt(5) == 0) + if(world.getBlock(x, y - 1, z) == ModBlocks.waste_earth && rand.nextInt(5) == 0 && MainRegistry.enableMycelium) { world.setBlock(x, y - 1, z, ModBlocks.waste_mycelium); } diff --git a/com/hbm/blocks/NukeBoy.java b/com/hbm/blocks/NukeBoy.java index e36e31258..df5716acf 100644 --- a/com/hbm/blocks/NukeBoy.java +++ b/com/hbm/blocks/NukeBoy.java @@ -156,7 +156,7 @@ public class NukeBoy extends BlockContainer { entity.posX = x; entity.posY = y; entity.posZ = z; - entity.destructionRange = 120; + entity.destructionRange = MainRegistry.boyRadius; entity.speed = 25; entity.coefficient = 10.0F; world.spawnEntityInWorld(entity); diff --git a/com/hbm/blocks/NukeFleija.java b/com/hbm/blocks/NukeFleija.java index ec15513f9..b196a8121 100644 --- a/com/hbm/blocks/NukeFleija.java +++ b/com/hbm/blocks/NukeFleija.java @@ -125,7 +125,7 @@ public class NukeFleija extends BlockContainer { this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1); entity.clearSlots(); p_149695_1_.setBlockToAir(x, y, z); - igniteTestBomb(p_149695_1_, x, y, z, 50); + igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.fleijaRadius); } } } diff --git a/com/hbm/blocks/NukeGadget.java b/com/hbm/blocks/NukeGadget.java index c46fb681b..c0b51dbda 100644 --- a/com/hbm/blocks/NukeGadget.java +++ b/com/hbm/blocks/NukeGadget.java @@ -173,7 +173,7 @@ public class NukeGadget extends BlockContainer { entity.posX = x; entity.posY = y; entity.posZ = z; - entity.destructionRange = 150; + entity.destructionRange = MainRegistry.gadgetRadius; entity.speed = 25; entity.coefficient = 10.0F; diff --git a/com/hbm/blocks/NukeMan.java b/com/hbm/blocks/NukeMan.java index 5fec1f310..d9c3e121c 100644 --- a/com/hbm/blocks/NukeMan.java +++ b/com/hbm/blocks/NukeMan.java @@ -172,7 +172,7 @@ public class NukeMan extends BlockContainer { entity.posX = x; entity.posY = y; entity.posZ = z; - entity.destructionRange = 175; + entity.destructionRange = MainRegistry.manRadius; entity.speed = 25; entity.coefficient = 10.0F; diff --git a/com/hbm/blocks/NukeMike.java b/com/hbm/blocks/NukeMike.java index 9ea54ba1a..6b8122b2b 100644 --- a/com/hbm/blocks/NukeMike.java +++ b/com/hbm/blocks/NukeMike.java @@ -125,7 +125,7 @@ public class NukeMike extends BlockContainer { this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1); entity.clearSlots(); p_149695_1_.setBlockToAir(x, y, z); - igniteTestBomb(p_149695_1_, x, y, z, 175); + igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.manRadius); } if(entity.isFilled()) @@ -133,7 +133,7 @@ public class NukeMike extends BlockContainer { this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1); entity.clearSlots(); p_149695_1_.setBlockToAir(x, y, z); - igniteTestBomb(p_149695_1_, x, y, z, 250); + igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.mikeRadius); } } } diff --git a/com/hbm/blocks/NukePrototype.java b/com/hbm/blocks/NukePrototype.java index e9175e809..7f7a262be 100644 --- a/com/hbm/blocks/NukePrototype.java +++ b/com/hbm/blocks/NukePrototype.java @@ -109,7 +109,7 @@ public class NukePrototype extends BlockContainer { this.onBlockDestroyedByPlayer(world, x, y, z, 1); entity.clearSlots(); world.setBlockToAir(x, y, z); - igniteTestBomb(world, x, y, z, 150); + igniteTestBomb(world, x, y, z, MainRegistry.prototypeRadius); } return true; } else if(!player.isSneaking()) @@ -136,7 +136,7 @@ public class NukePrototype extends BlockContainer { this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1); entity.clearSlots(); p_149695_1_.setBlockToAir(x, y, z); - igniteTestBomb(p_149695_1_, x, y, z, 150); + igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.prototypeRadius); } } } diff --git a/com/hbm/blocks/NukeTsar.java b/com/hbm/blocks/NukeTsar.java index d2cc252e8..d7e6de8e6 100644 --- a/com/hbm/blocks/NukeTsar.java +++ b/com/hbm/blocks/NukeTsar.java @@ -125,7 +125,7 @@ public class NukeTsar extends BlockContainer { this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1); entity.clearSlots(); p_149695_1_.setBlockToAir(x, y, z); - igniteTestBomb(p_149695_1_, x, y, z, 175); + igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.manRadius); } if(entity.isFilled()) @@ -133,7 +133,7 @@ public class NukeTsar extends BlockContainer { this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1); entity.clearSlots(); p_149695_1_.setBlockToAir(x, y, z); - igniteTestBomb(p_149695_1_, x, y, z, 500); + igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.tsarRadius); } } } diff --git a/com/hbm/blocks/WasteEarth.java b/com/hbm/blocks/WasteEarth.java index c5502a362..a6c23aa5e 100644 --- a/com/hbm/blocks/WasteEarth.java +++ b/com/hbm/blocks/WasteEarth.java @@ -5,6 +5,7 @@ import java.util.Random; import com.hbm.entity.EntityNuclearCreeper; import com.hbm.lib.Library; import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -155,7 +156,7 @@ public class WasteEarth extends Block { @Override public void updateTick(World world, int x, int y, int z, Random rand) { - if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(10) == 0) + if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(10) == 0 && MainRegistry.enableMycelium) { Block b0; int count = 0; @@ -172,16 +173,9 @@ public class WasteEarth extends Block { } if(count > 0 && count < 5) world.setBlock(x, y + 1, z, ModBlocks.mush); - if (!world.isRemote) - { - if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) - { - world.setBlock(x, y, z, Blocks.dirt); - } - } } - if(this == ModBlocks.waste_mycelium) + if(this == ModBlocks.waste_mycelium && MainRegistry.enableMycelium) { for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { @@ -196,6 +190,17 @@ public class WasteEarth extends Block { } } } + + if(this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) + { + if (!world.isRemote) + { + if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) + { + world.setBlock(x, y, z, Blocks.dirt); + } + } + } } } diff --git a/com/hbm/entity/EntityNuclearCreeper.java b/com/hbm/entity/EntityNuclearCreeper.java index de22f749b..a29a13ade 100644 --- a/com/hbm/entity/EntityNuclearCreeper.java +++ b/com/hbm/entity/EntityNuclearCreeper.java @@ -72,7 +72,7 @@ public class EntityNuclearCreeper extends EntityMob { { super.applyEntityAttributes(); this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(50.0D); - this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.15D); + this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.3D); } /** @@ -258,6 +258,11 @@ public class EntityNuclearCreeper extends EntityMob { strength = (int)f; super.onUpdate(); + + if(this.getHealth() < this.getMaxHealth() && this.ticksExisted % 10 == 0) + { + this.heal(1.0F); + } } /** diff --git a/com/hbm/entity/EntityRocket.java b/com/hbm/entity/EntityRocket.java index e20c03052..1a8aefcdb 100644 --- a/com/hbm/entity/EntityRocket.java +++ b/com/hbm/entity/EntityRocket.java @@ -259,6 +259,14 @@ public class EntityRocket extends Entity implements IProjectile if (!this.worldObj.isRemote) { this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true); + /*EntityNukeExplosionAdvanced explosion = new EntityNukeExplosionAdvanced(this.worldObj); + explosion.speed = 25; + explosion.coefficient = 5.0F; + explosion.destructionRange = 20; + explosion.posX = this.posX; + explosion.posY = this.posY; + explosion.posZ = this.posZ; + this.worldObj.spawnEntityInWorld(explosion);*/ } this.setDead(); } diff --git a/com/hbm/explosion/ExplosionChaos.java b/com/hbm/explosion/ExplosionChaos.java index fd7f7a615..c8115b987 100644 --- a/com/hbm/explosion/ExplosionChaos.java +++ b/com/hbm/explosion/ExplosionChaos.java @@ -421,7 +421,7 @@ public class ExplosionChaos { { if(entity instanceof EntityPlayer && Library.checkForGasMask((EntityPlayer)entity)) { - Library.damageSuit(((EntityPlayer)entity), 3); + //Library.damageSuit(((EntityPlayer)entity), 3); } else if(entity instanceof EntityLivingBase) { diff --git a/com/hbm/explosion/ExplosionNukeGeneric.java b/com/hbm/explosion/ExplosionNukeGeneric.java index 8436a00f8..47d7a41d9 100644 --- a/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/com/hbm/explosion/ExplosionNukeGeneric.java @@ -89,11 +89,11 @@ public class ExplosionNukeGeneric { double d5; double d6; double d7; - double wat = bombStartStrength*2; + double wat = bombStartStrength/**2*/; boolean isOccupied = false; - bombStartStrength *= 2.0F; + //bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); j = MathHelper.floor_double(x + wat + 1.0D); k = MathHelper.floor_double(y - wat - 1.0D); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 40ea7dbed..eb09a9b94 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -8,6 +8,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemSoup; public class ModItems { @@ -307,6 +308,7 @@ public class ModItems { public static Item cotton_candy; public static Item apple_schrabidium; public static Item tem_flakes; + public static Item glowing_stew; public static Item flame_pony; public static Item flame_conspiracy; @@ -363,6 +365,8 @@ public class ModItems { public static Item t45_plate; public static Item t45_legs; public static Item t45_boots; + + public static Item chainsaw; public static Item schrabidium_helmet; public static Item schrabidium_plate; @@ -691,6 +695,7 @@ public class ModItems { cotton_candy = new ItemCottonCandy(5, false).setUnlocalizedName("cotton_candy").setCreativeTab(MainRegistry.tabNuke).setFull3D().setTextureName(RefStrings.MODID + ":cotton_candy"); apple_schrabidium = new ItemAppleSchrabidium(20, 100, false).setUnlocalizedName("apple_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":apple_schrabidium"); tem_flakes = new ItemTemFlakes(0, 0, false).setUnlocalizedName("tem_flakes").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":tem_flakes"); + glowing_stew = new ItemSoup(6).setUnlocalizedName("glowing_stew").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":glowing_stew"); flame_pony = new ItemCustomLore().setUnlocalizedName("flame_pony").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":flame_pony"); flame_conspiracy = new ItemCustomLore().setUnlocalizedName("flame_conspiracy").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":flame_conspiracy"); @@ -766,6 +771,8 @@ public class ModItems { t45_legs = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 2).setUnlocalizedName("t45_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_legs"); t45_boots = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 3).setUnlocalizedName("t45_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_boots"); + chainsaw = new ItemModAxe(MainRegistry.enumToolMaterialChainsaw).setUnlocalizedName("chainsaw").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":chainsaw"); + schrabidium_helmet = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 0).setUnlocalizedName("schrabidium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_helmet"); schrabidium_plate = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 1).setUnlocalizedName("schrabidium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_plate"); schrabidium_legs = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 2).setUnlocalizedName("schrabidium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_legs"); @@ -1130,6 +1137,7 @@ public class ModItems { GameRegistry.registerItem(cotton_candy, cotton_candy.getUnlocalizedName()); GameRegistry.registerItem(apple_schrabidium, apple_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(tem_flakes, tem_flakes.getUnlocalizedName()); + GameRegistry.registerItem(glowing_stew, glowing_stew.getUnlocalizedName()); //The Gadget GameRegistry.registerItem(gadget_explosive, gadget_explosive.getUnlocalizedName()); @@ -1174,6 +1182,7 @@ public class ModItems { GameRegistry.registerItem(t45_boots, t45_boots.getUnlocalizedName()); //Nobody will ever read this anyway, so it shouldn't matter. + GameRegistry.registerItem(chainsaw, chainsaw.getUnlocalizedName()); GameRegistry.registerItem(igniter, igniter.getUnlocalizedName()); GameRegistry.registerItem(hazmat_helmet, hazmat_helmet.getUnlocalizedName()); GameRegistry.registerItem(hazmat_plate, hazmat_plate.getUnlocalizedName()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 92c486307..8a44d30d4 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -399,7 +399,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SPS", "NCN", "SPS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SNS", "PCP", "SNS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_empty, 6), new Object[] { "P", "C", "B", 'B', Item.getItemFromBlock(Blocks.iron_bars), 'C', ModItems.rod_empty, 'P', ModItems.plate_iron }); - GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.nether_wart, 'S', ModItems.syringe_empty }); + GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.nether_wart, 'S', ModItems.syringe_metal_empty }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_gadget), 1), new Object[] { "DGD", "FCF", "DPD", 'G', ModItems.wire_gold, 'F', ModItems.fins_flat, 'C', ModItems.sphere_steel, 'P', ModItems.pedestal_steel, 'D', new ItemStack(Items.dye, 1, 8) }); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 5a26f0691..c638d21cd 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -4,6 +4,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.FMLCommonHandler; @@ -104,69 +106,7 @@ import cpw.mods.fml.common.registry.GameRegistry; public class MainRegistry { @Instance(RefStrings.MODID) - public static MainRegistry instance; - - /*public static Achievement achievementGetTitanium; - public static Achievement achievementCraftDiFurnace; - public static Achievement achievementGetSteel; - public static Achievement achievementCraftCentrifuge; - public static Achievement achievementGetUranium; - public static Achievement achievementCraftReactor; - public static Achievement achievementGetPlutonium; - public static Achievement achievementGetSchrabidium; - public static Achievement achievementGetEuphemium; - - public static Achievement achievementGetRedCopper; - public static Achievement achievementCraftWireCoated; - public static Achievement achievementCraftCoal; - public static Achievement achievementCraftGenerator; - public static Achievement achievementCraftElectricFurnace; - public static Achievement achievementCraftDeuterium; - - public static Achievement achievementCraftCircuit; - public static Achievement achievementCraftBattery; - public static Achievement achievementCraftEnergyStorage; - - public static Achievement achievementCraftNukeFurnace; - public static Achievement achievementCraftUraniumRod; - public static Achievement achievementCraftUraniumDualRod; - public static Achievement achievementCraftUraniumQuadRod; - public static Achievement achievementCraftUraniumFuel; - - public static Achievement achievementCraftPlutoniumRod; - public static Achievement achievementCraftRtg; - public static Achievement achievementCraftRtgFurnace; - public static Achievement achievementCraftPlutoniumFuel; - public static Achievement achievementCraftMoxFuel; - - public static Achievement achievementCraftSchrabidiumRod; - public static Achievement achievementCraftSchrabidiumFuel; - public static Achievement achievementCraftSchrabidiumApple; - public static Achievement achievementCraftSchrabidiumCircuit; - - public static Achievement achievementCraftWatch; - - public static Achievement achievementGetNeutronReflector; - - public static Achievement achievementCraftRevolver; - public static Achievement achievementCraftGrenade; - public static Achievement achievementCraftGrenadeStrong; - public static Achievement achievementCraftGrenadeCluster; - public static Achievement achievementCraftGrenadeFlare; - public static Achievement achievementCraftGrenadeSchrbidium; - - public static Achievement achievementCraftLittleBoy; - - public static Achievement achievementCraftTheGadget; - public static Achievement achievementCraftFatMan; - public static Achievement achievementCraftIvyMike; - public static Achievement achievementCraftTsarBomba; - - public static Achievement achievementCraftFleija; - - public static Achievement achievementCraftIgniter; - public static Achievement achievementCraftSas3; - public static Achievement achievementCraftPrototype;*/ + public static MainRegistry instance; @SidedProxy(clientSide = RefStrings.CLIENTSIDE, serverSide = RefStrings.SERVERSIDE) public static ServerProxy proxy; @@ -175,7 +115,8 @@ public class MainRegistry public static ModMetadata meta; //Tool Materials - public static ToolMaterial enumToolMaterialSchrabidium = EnumHelper.addToolMaterial("SCHRABIDIUM", 3, 10000, 50.0F, 20.0F, 200); + public static ToolMaterial enumToolMaterialSchrabidium = EnumHelper.addToolMaterial("SCHRABIDIUM", 3, 10000, 50.0F, 100.0F, 200); + public static ToolMaterial enumToolMaterialChainsaw = EnumHelper.addToolMaterial("CHAINSAW", 3, 5000, 50.0F, 47.0F, 0); //Armor Materials public static ArmorMaterial enumArmorMaterialEmerald = EnumHelper.addArmorMaterial("TEST", 2500, new int[] {3, 8, 6, 3}, 30); @@ -191,6 +132,14 @@ public class MainRegistry public static CreativeTabs tabNuke = new NukeTab(CreativeTabs.getNextID(), "tabNuke"); public static boolean enableDebugMode = true; + public static boolean enableMycelium = true; + public static int gadgetRadius = 150; + public static int boyRadius = 120; + public static int manRadius = 175; + public static int mikeRadius = 250; + public static int tsarRadius = 500; + public static int prototypeRadius = 50; + public static int fleijaRadius = 150; @EventHandler public void PreLoad(FMLPreInitializationEvent PreEvent) @@ -337,11 +286,46 @@ public class MainRegistry } @EventHandler - public void preinit(FMLPreInitializationEvent event) + public void preInit(FMLPreInitializationEvent event) { FMLCommonHandler.instance().bus().register(new ModEventHandler()); MinecraftForge.EVENT_BUS.register(new ModEventHandler()); MinecraftForge.TERRAIN_GEN_BUS.register(new ModEventHandler()); MinecraftForge.ORE_GEN_BUS.register(new ModEventHandler()); + + Configuration config = new Configuration(event.getSuggestedConfigurationFile()); + config.load(); + enableDebugMode = config.get(Configuration.CATEGORY_GENERAL, "_enableDebugMode", true).getBoolean(true); + enableMycelium = config.get(Configuration.CATEGORY_GENERAL, "_enableMyceliumSpread", true).getBoolean(true); + + Property propGadget = config.get(Configuration.CATEGORY_GENERAL, "gadgetRadius", 150); + propGadget.comment = "Radius of the Gadget"; + gadgetRadius = propGadget.getInt(); + + Property propBoy = config.get(Configuration.CATEGORY_GENERAL, "boyRadius", 120); + propBoy.comment = "Radius of Little Boy"; + boyRadius = propBoy.getInt(); + + Property propMan = config.get(Configuration.CATEGORY_GENERAL, "manRadius", 175); + propMan.comment = "Radius of Fat Man"; + manRadius = propMan.getInt(); + + Property propMike = config.get(Configuration.CATEGORY_GENERAL, "mikeRadius", 250); + propMike.comment = "Radius of Ivy Mike"; + mikeRadius = propMike.getInt(); + + Property propTsar = config.get(Configuration.CATEGORY_GENERAL, "tsarRadius", 500); + propTsar.comment = "Radius of the Tsar Bomba"; + tsarRadius = propTsar.getInt(); + + Property propPrototype = config.get(Configuration.CATEGORY_GENERAL, "prototypeRadius", 150); + propPrototype.comment = "Radius of the Prototype"; + prototypeRadius = propPrototype.getInt(); + + Property propFleija = config.get(Configuration.CATEGORY_GENERAL, "fleijaRadius", 50); + propFleija.comment = "Radius of F.L.E.I.J.A."; + fleijaRadius = propFleija.getInt(); + + config.save(); } }