From 6770e629577b4492c585d45b8b5ce8ec95d2af60 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sat, 29 Apr 2017 13:26:11 +0200 Subject: [PATCH] Fixed a lot of NBT saves, rebalanced generators, etc --- assets/hbm/lang/de_DE.lang | 6 +- assets/hbm/lang/en_US.lang | 6 +- assets/hbm/sounds.json | 4 + assets/hbm/sounds/tool/techBleep.ogg | Bin 0 -> 3256 bytes assets/hbm/sounds/tool/techBoop.ogg | Bin 0 -> 2877 bytes assets/hbm/sounds/weapon/missileTakeOff.ogg | Bin 0 -> 11088 bytes .../textures/items/ingot_lanthanium_alloy.png | Bin 0 -> 442 bytes .../hbm/textures/items/quartz_plutonium.png | Bin 0 -> 401 bytes com/hbm/blocks/bomb/LaunchPad.java | 18 +++++ com/hbm/blocks/generic/RedBarrel.java | 3 +- com/hbm/blocks/machine/BlockSeal.java | 71 +++++++++++++----- com/hbm/explosion/ExplosionNukeGeneric.java | 3 + .../gui/container/ContainerMachineRTG.java | 2 +- com/hbm/items/special/ItemCustomLore.java | 7 +- com/hbm/items/special/ItemFuelRod.java | 24 +++--- com/hbm/items/tool/ItemCrateCaller.java | 2 + com/hbm/items/tool/ItemDesingator.java | 3 + com/hbm/items/tool/ItemDesingatorRange.java | 3 + com/hbm/items/tool/ItemDetonator.java | 7 +- com/hbm/items/tool/ItemMultitoolPassive.java | 4 + com/hbm/items/tool/ItemMultitoolTool.java | 3 + com/hbm/items/weapon/GunJack.java | 6 +- com/hbm/lib/SPCLStrings.java | 12 +++ com/hbm/main/CraftingManager.java | 8 +- com/hbm/tileentity/TileEntityBombMulti.java | 9 +++ com/hbm/tileentity/TileEntityCable.java | 9 +++ com/hbm/tileentity/TileEntityDecoBlock.java | 9 +++ .../tileentity/TileEntityDecoBlockAlt.java | 9 +++ .../tileentity/TileEntityDecoBlockAltF.java | 9 +++ .../tileentity/TileEntityDecoBlockAltG.java | 9 +++ .../tileentity/TileEntityDecoBlockAltW.java | 9 +++ .../TileEntityDecoPoleSatelliteReceiver.java | 9 +++ com/hbm/tileentity/TileEntityDecoPoleTop.java | 9 +++ .../tileentity/TileEntityDecoSteelPoles.java | 9 +++ .../TileEntityDecoTapeRecorder.java | 9 +++ com/hbm/tileentity/TileEntityDiFurnace.java | 4 +- com/hbm/tileentity/TileEntityFWatzCore.java | 16 ++-- .../TileEntityFusionMultiblock.java | 29 +++---- com/hbm/tileentity/TileEntityIGenerator.java | 11 ++- com/hbm/tileentity/TileEntityLaunchPad.java | 13 +++- .../tileentity/TileEntityMachineBattery.java | 6 +- .../TileEntityMachineCMBFactory.java | 12 +-- .../TileEntityMachineCentrifuge.java | 13 +++- com/hbm/tileentity/TileEntityMachineCoal.java | 14 ++-- .../TileEntityMachineDeuterium.java | 20 ++--- .../tileentity/TileEntityMachineDiesel.java | 10 +-- .../TileEntityMachineElectricFurnace.java | 12 +-- .../TileEntityMachineGenerator.java | 44 +++++------ .../tileentity/TileEntityMachinePuF6Tank.java | 9 +++ ...eEntityMachineSchrabidiumTransmutator.java | 11 +-- .../tileentity/TileEntityMachineShredder.java | 4 +- .../tileentity/TileEntityMachineUF6Tank.java | 9 +++ com/hbm/tileentity/TileEntityNukeBoy.java | 9 +++ com/hbm/tileentity/TileEntityNukeCustom.java | 9 +++ com/hbm/tileentity/TileEntityNukeFleija.java | 9 +++ com/hbm/tileentity/TileEntityNukeGadget.java | 9 +++ com/hbm/tileentity/TileEntityNukeMan.java | 9 +++ com/hbm/tileentity/TileEntityNukeMike.java | 9 +++ .../tileentity/TileEntityNukePrototype.java | 9 +++ com/hbm/tileentity/TileEntityNukeTsar.java | 9 +++ .../TileEntityReactorMultiblock.java | 42 +++++------ com/hbm/tileentity/TileEntityRedBarrel.java | 9 +++ com/hbm/tileentity/TileEntityWatzCore.java | 8 +- .../tileentity/TileEntityYellowBarrel.java | 9 +++ 64 files changed, 503 insertions(+), 165 deletions(-) create mode 100644 assets/hbm/sounds/tool/techBleep.ogg create mode 100644 assets/hbm/sounds/tool/techBoop.ogg create mode 100644 assets/hbm/sounds/weapon/missileTakeOff.ogg create mode 100644 assets/hbm/textures/items/ingot_lanthanium_alloy.png create mode 100644 assets/hbm/textures/items/quartz_plutonium.png create mode 100644 com/hbm/lib/SPCLStrings.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 4c4a4bd4e..7da37d46e 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -200,12 +200,13 @@ tile.fwatz_plasma.name=Destabilisiertes Antischrabidiumplasma container.fusionaryWatzPlant=Fusionares Watzwerk tile.machine_rtg_grey.name=Radioisotopengenerator +container.rtg=Radioisotopengenerator tile.machine_rtg_red.name=Fulminationsgenerator tile.machine_rtg_orange.name=Starker RTG tile.machine_rtg_yellow.name=Australium Supergenerator tile.machine_rtg_green.name=Verticium-Reichtumsgenerator -tile.machine_rtg_cyan.name=Schrabidium-Zerfallsenergie-Generator -tile.machine_rtg_blue.name=Convectionsgenerator +tile.machine_rtg_cyan.name=Schrabidium-Zerfallsenergie-Generator (WIP) +tile.machine_rtg_blue.name=Konvektionsgenerator tile.machine_rtg_purple.name=Paarvernichtungsgenerator item.fuse.name=Sicherung @@ -429,6 +430,7 @@ item.centrifuge_element.name=Zentrifugenelement item.centrifuge_tower.name=Zentrifugenturm item.reactor_core.name=Brutreaktorkern item.pellet_rtg.name=Plutonium 238 Pellet +item.pellet_rtg_weak.name=Schwaches Uran RTG-Pellet item.rtg_unit.name=RTG Einheit item.hazmat_cloth.name=Strahlenschutzanzugsstoff item.filter_coal.name=Aktivkohlefilter diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index d10fdf4d9..362f4dcc7 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -199,12 +199,13 @@ tile.fwatz_core.name=Fusionary Watz Reactor Control tile.fwatz_plasma.name=Destabilized Antischrabidium Plasma container.fusionaryWatzPlant=Fusionary Watz Plant -tile.machine_rtg_grey.name=Radioisotope Thermoelectric Generator +tile.machine_rtg_grey.name=RT Generator +container.rtg=Radioisotope Thermoelectric Generator tile.machine_rtg_red.name=Fulmination Generator tile.machine_rtg_orange.name=Strong RT Generator tile.machine_rtg_yellow.name=Australium Superfuel Reactor tile.machine_rtg_green.name=Verticium Wealth Generator -tile.machine_rtg_cyan.name=Schrabidium Decay Generator +tile.machine_rtg_cyan.name=Schrabidium Decay Generator (WIP) tile.machine_rtg_blue.name=Convection Generator tile.machine_rtg_purple.name=Antimatter Annihilation Generator @@ -429,6 +430,7 @@ item.centrifuge_element.name=Centrifuge Element item.centrifuge_tower.name=Centrifuge Tower item.reactor_core.name=Breeding Reactor Core item.pellet_rtg.name=Plutonium 238 Fuel Pellet +item.pellet_rtg_weak.name=Weak Uranium RTG Pellet item.rtg_unit.name=RTG Unit item.hazmat_cloth.name=Hazmat Cloth item.filter_coal.name=Activated Carbon Filter diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 28019a098..ffe3472de 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -6,6 +6,9 @@ "block.crateBreak": {"category": "block", "sounds": ["block/crateBreak1", "block/crateBreak2", "block/crateBreak3", "block/crateBreak4", "block/crateBreak5"]}, + "item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]}, + "item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]}, + "music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]}, "music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]}, "music.recordVortalCombat": {"category": "record", "sounds": [{"name": "music/recordVortalCombat", "stream": true}]}, @@ -29,6 +32,7 @@ "weapon.immolatorIgnite": {"category": "player", "sounds": [{"name": "weapon/immolatorIgnite", "stream": false}]}, "weapon.immolatorShoot": {"category": "player", "sounds": [{"name": "weapon/immolatorShoot", "stream": false}]}, "weapon.cryolatorShoot": {"category": "player", "sounds": [{"name": "weapon/cryolatorShoot", "stream": false}]}, + "weapon.missileTakeOff": {"category": "player", "sounds": [{"name": "weapon/missileTakeOff", "stream": false}]}, "entity.chopperFlyingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperFlyingLoop", "stream": true}]}, "entity.chopperDrop": {"category": "hostile", "sounds": [{"name": "entity/chopperDrop", "stream": false}]}, diff --git a/assets/hbm/sounds/tool/techBleep.ogg b/assets/hbm/sounds/tool/techBleep.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e777708cdb3dba42fe498a35ef39f2c20dc1d0a9 GIT binary patch literal 3256 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 Hv%r4#+an&{F$d%2WVOo#wQ0ANz46}W^& zCBeEGI1`zR3Y2@HU2Mw3oW(pUPhfb-E+&*llYP8$&%@zlV}P)sgw<5vM@x7;*SDC- zwBLJ!1DvgLIQ4sz^MbP^nRT>JlGr~`8XqWO-9vhfc<(YMa8|+!&R!B`9%7AXpFtUL zw#E^Q@Trz0K$)Cqd?*Q6@C1C@1k8z&jpP5UJ70W0Bofe{&+dz@Gx}B&uz-)O|GeXn zux9|00id7|68{-OL(5V}0dxZZt)e%*#&de@TGqZ19%?db^Gl#G05Wi$=Hn90c#K(+ zqf0(ta1kWCNT9OLrMFI~uWq|pUq?@|tMw#sAH z8??bgwh%?D{3bV~uL<07E((yxHjZdoWpE8RKub~)n$XfryLf09t8c$p7e^G8_(nmB z9;~MXtq1GnDNaJTL2>kkI<>2eC@gL=*SAIqib@p2GyTtj`&SeJ#kq2li2zz4vRFF)izcX#Bwlkg zpG&$^P#^VC}ll+dS)hrGBLFXd});V@<25J zq~MRTa5$NPNHG_DPWFu#BfEm4RVIhV=p!m}Q%04v%A?Q-t@2JZA~DSu0V9X{(;)<) zoo0x5;SwX1i}2Ja;;Aq`*CMg?ajKng`2-SK+0<#~n;`kUTLzw&IthbfF_W&k*oj#! z7vYjgI~QU6q}>1%pL+|6jY+o?EbpAQ>yyM~`huwFQA1FCzFSpOS8kLjb|M$qC)1f3 z(qFrt>3bRNn+l@xM=xoPZk4e-MLZ2O+QLQMAau|qxx}VS-!Ne4KBa0Jr7b{ zMX;-u$Zh#ame2tivJvDS6u)Sg&^nc$^Qx7U6WIr%ii#Kek?kuATema9egGLv#xWL# z+=Q=lq*mZav)uH>r$AJl8wCkB0l=n>2;gXo7T0&~jt4mOfJmio84Oc297LIIO@|cVt*3*#l&6j&AsAdbG7*YnRDqVqAdrHX z`gCN47|sOMk(t^r0|j@$q1ZG8vXV6gEe0u%N`^zBod`q%sAutwmwvQxf$|O`gbTK0 z6amG62H+0uG_pv*Jtl~{!vx_fh65kPrk;pFnZX_FU_?U@XvpwmqLSci1tn;N8>WQ* z)>;W@eZ3sT2+(9ObcW!mKvbBLNn|3fbQ~$nivv;BrqU5mF>33ACIc4`18KO4tz{z< z#6SQPibuoUv7Ol#?lS*H9PU~>k&be!T^mO{h2lU!6F$}O8SW$(v<#dP0bpj~2?kAB z(8xf}c{?+a3ALbELUTR3+v55R3&sMkQ$RkQaKI@0!qj2u(%Uei~I5z zMz@68HPFH(rxsDVG7JD9`U&)V8)asQggq}n3+67Sb|w@p3nmwI(Wq44L9L!#Fz~}c z(@@rg`syjeg&hW!G|O@Na5%P;5w2B^W26KCh!>c;UMU&cc}JcHlXC}#i;)zHsYBN} zB=C?*ob|;)bJ2&d<@(aX$vIOIa5!f)0z?HmEHS}>uS@VUl7a_P`{zKY z+*^a36nU6I1W$SKq=6d*!=jy-hc^k?ZW?0=@o2i83V&KYndH{jG_mNSE8oZp9!M5E zknAg33Tkt5UDG0I3oqi_QhUevQavGq>4w^WX@}QOr*0x`UOn72i z6wjKPYL@_d1tOtIyjfaQWFQlSjQxLNLK@5>=ehj<{{S8p)XRS#_<`=m zk3?;MKj4{7(1R2jQIrH_MqdB`3MB}}4%7uNSXe;wQb0{Tk3zsVL4Splg8>9ic0RDB zB9uXOfr|Tgfc-n`m4RYX2msYVEhxbNp%{XK|6TX*>_5fL|3x6gz?_y8?ROBsdu~H5u_TvnWX!3N1mvDXyRfwYFHnR0Kw+UKuh>Nvg5{r~jZ5 zDQ`?Nf}Arg3AO=A)kg^MrjE)$FwyjII5aI;S+m?P6#?N*BP>osz%_Z(XyFujB}Q1A1jxEOsAVB&ye5&G|Z|A>Rj;8VWr`Vzez7he+`oNVdBmKr^mNxdz?p}TmLL))kghmF00ss$} zqN=KdF9YK>CT5oFtZeKzI5-KHp7W-tsCfR*0gj4_|J;ruwa;Gxgxe9Jz$}b@k_pu@ zLEbg-wsLp(_V;(QceHbMyJvOJ)zQVl*WU5IyN3(P(ZTi}3gzIes$wtwK!F$d)Gy!3 z0zHk(b}E$9K#Bk1pE0`iQI4GyK)4;SN$}9KR((a|v!32fg!yl08%9_=FQjM(sp2iR z7IH3JJ9M%&<2O{V>chr3--Nx?i%@u*EBYH@Nn*a<5uKh_2BErB>JcXrwY#mT$E24d zo$PWNwq7t`n{scHmm;j6zxT&U_BZ>>mq&wDUh!E;Zjv=LGo5Bb>j$>{9R;cesFrtk z#fbokS#$Lpf801u^Q?tG>L$DSHUDI9U1GgGrgU;R+Q9v${^*C?`mt2&-s!i)Z-495>|WjYOtfTLZ3CII4q3fHize!JB%XXqR>9)gF77Ia z2lgO!gl2zx=XXu(TH3SRizC%tinrGKGj-w)`8f1m}apC;zx z^g=~Q(yv2JLo4x2f44fFsZ#OVztoo(^OWEkG!_1>DCntJ|3rI%8?@4o#Y$LyxR>bD zXojL&fHHb5P07b}sv|w@2kL>NWX<69E(7?N*qnkHR_{N4FgL0sOr_!zoaw%4)YbY* z$18#XziVwPzhW?jE4R3{u10%2xl1+owoFQ)vO?Zt$;1W`q3o$7y}!a>)jtT|dwWbW zOMDh8$pT(e961bT(e;1qf39q;NZz@8l7BHjleY5)n^Y2{zKVM}pIx_%(pG>vhlg}r zd}OON2wS9eQ`wTEk)*l0c!gEtdD7>w$gh4dJEELdLS5nOW&^H1OUIxem6SlNgu47I0Xi`gbdZKIzEO&EsaZRBmNGh;?vD1eg0{<@ny2;kU!rJa=gG+eCNd z2()Bn$seE@)_HD)YHSN^+%IxanswHF#^2K-P=Zc<`FXV3O4q2@^kt2Nf~g9s+Oxb; zR&c{z41XX|824q{Z@pRd`;V0B`^s`_m(?|JB}~TBIwrXLy!&^}ExbkI(5-Wdm;R_Z zEw-G|n*jN8d>ll8G|=NX;fOdI%Hy`+o(K+4H^ni~P9?#vhn&V&74sf!u51cfb<}d* zzf{k``rUU(+Nvv$Q$_Vjr(1Z0SJXAej})UkeMl>p(2y38LPhayAhq_ zKg0v`o$9UcDvwkb2`v~1-Y+43cRd~CGC;VG1E|oQo3ZOe>}H(x>5}G+0ICZr?GGtM z4ZJj$r%ZbX1Vou1AeTIN7T&p+H%ATpViMn4_?mdffC0L7n}2-6=qaPIiyocc?5P=~ z)-_4fRd(ue3mL19|8zfZw2g-TNE+I{+|$D| z5?M<$PE}AL@Appgh4SDhjvl{xy)V>2o=-2_P>6g)?$Gh@8!bn*T@Q!p(>@`o2m{(a zYFZDq8B2)7&!-1M+QZ^jsJnsJ-ih;IAonP*`xL(=8z8>ZKT!Zya#PkoXEM+6RrfC4 zqeIrZZ1kFdVvl^;mgUiNikCTB9Mw%1YCj*HVooM_Wj7h!ADz}^U^^4X0+6bQ%G(G1 zg^nJu6Y>4N;bCZ1g|DU1tYLn*$K4j;)w$WAp=seSW;W%e$DPh>qLV3lYojOF)_*8DTF2he_tA>p*cY=*zuquhn4^I_d{DnB;j}2zml15iRT5bk>+1jZ zmtf(NWa-$osgDCj9suM;r4_w{r0b=8ZGzBtLgE0MIW$kllXx2|; z?1}j;r7SPvWi?WTj98nW0$0U4e6n|Chy|(UeXY(qx3I?p$GF@TOa>Jz-_a|3)bU{v zDTVvooF8tlR+|$z3mIUd2R=Pg83{nwy9LmM=(@zgq?@wrpdl~lv~spHeVSVL`EEpEh=d(|>p9(&ypOj8wl&V#H*EH@@ ze(jy*d0++9`1!?d1kq({kaEv?u2*r-T#hJ@9#9Q@$&182>VByy-%gZMW^vEKEGJB3 zHSK1Ax@^uczXvvFgAM*B%bu6BQ*vLAwV_-0qxW!us2f_MI8dq1%aJu)hoA)-#ffa% zt0BKnwRF<;e?8-I*MbbUF3Q|E=Dd7OS7xg^PT>Jo_IU;qrjh3F$@O6JZ7klgs>9D0=?sFar9VbjxD$?PgJ-UKx~{$#;J+0= z=SJV>&c&3g<&eMq)pz2JF5b+>`mFyLo^?Bl32*ii+m-Zm&vJ=KGQM!8P2fj_C|L;f z!lZ|P67YL{Bkt***G0tdn&Q| zl)>C~=98~`M-CU?GOzaYhNe5CvcYnEr?STm6G}dE3D$0Emlq647WvM!F(9D;nos4T zGG&|7TGHe0H!t(EcYPdmA-O8MDSDG+E1z=}`?ZBhLe->)!L5j;F6!bZE%%<&=|3x| zZ(e#gIZIv*_EvpWtap#cJc8#jx83+P$v2#Jr!AK0yK+#SY3>5WS;8fdh-^J&y{@QJ zUwX|=A?)jfkoMhdvzRH70Gk_jz9}NNt3@A6d|10)FxGW)cXJ8#O zE~u47GodDaJKehD@@x$iumCH>DVhnxw9Ha0)2?8k&v~~(f(?a+Gsqg~{KLosO!INC zbx~(aK|kIiQE8g5bIKN`a4wduykP(s{?mPX`yC@?EBc6W1LtZ#& z>Qvlk+uqdn7=HEWj{anGB|{^ zXx02_X(x`1?_l-q^ElPJfB#a*xA{MoD)Q9qdvcUKAKb;eSEua@WP}1vGhbAB7LVe! zkDlC@-oBJl;%)3&`QFGPpVQ&N{hbo-=|W=(@Q7@O+@tV1evduR(_FzF<4yv6Au%hL>)6_MqJzbxTmCe zXR%We@rKf)=Q#IaamVjCkzc01?;S5#i~PlGnK2y16dhi`Qq`s>kG1$TR?Y?#G5#4HuiSnG! zsEJz}XFncS@jklN&1HojMWwU9=}Ne9<((z2%H*bmv3;cX1IhZUzE`cIFKY%JO1@+D zrvQN5-HWrcgIdjZawNj_w4Nj|X-6%WPqSpT-fFJyp@PPSF*=QK2M;Rzk#Do3V9Gl_ zQ}G&p^i{Z3a&?6()oX~&!EfFXA@yX_V^dE{x0aSsSH@tgcY5M=Z+C1;O`|c8FC+=x z`z-s2J?MPU_$NC&{`$<*c@h0aXX?yAG)ZM!V6ox0S9H2@|&+F zx;{ENxWgmO-LSbgDQuvhUusK>aR_xjdp4C*2DM9n8?c_Wl+Z3*kGa7MunV1shA<*E zExNvI?*sMjNmEg`JBgE0+BW~0J^FQ3M3*seK&3QWvNBNiF3Mvhx@>XUh~2$wP;f9k zID zF9{}{{K?o1A3zi+8eF6UZ!d4}JIcvb|MGrQh~M9-@&ohDoMZe@db!XS1Fl%U{2{(MF7PbN|e*UnLurPy_0-Xd6vv}GuUo~Hl<{D++Hq} zm@D!8=$=wE5--$&jcADXx4065asBP}eV8=X7W<=);o=FB%vMLF(nd=#veKAj(v{k- zz$|X1s*8Vh6Z7pgJ<%3JP->`*~dNaV)Ac6p8=p)l(O$%gkgo z_I=s%1T)L9`^tW3R@UcdKSb=wQ->>pq(^;^pX?0MI^7OukWF9U9a(%I>Pxwte8#I$ zlvpMAW4slu{H^Y!(}Eht%N0eOpHNRARKWo0MW#x;*x8}JKVP@7Sba!aXCGHe)vCnK zCGhen=^=u)&*EW7q=JU~oU=$mPq;R<>lgibzd4`x%XfI>pLNPu$-ShA$5K_GZT0G$7Cwz-CFdZO;D1gnK zopI^$roiS?f9)s$!v=e@pB=iIZ)(Crf#okX`eU@k1^$h>gE?F2?bp{- zoWdCIRIyKZs6S57jFg(8Fn;LfX3DDPCV*YC*wc+aE~J4EVt}wdKqI}#e0u~zuXeZ> z$J-zrM#N5au6&!}Y+pS@M1)I?&@4%fc210=+c<5mYf%VFq6>-Fv?mX#Z|x18I{ZDE zm-v1`tDmQS?+hjUPM4QV@(%^2PgVD!vRrm2toWJqcPkv0VHmA?_wu&KGwi#jLln`w z?LJUY)t4Z%4Lrg%ry;HI_0coodo0nxft0dzi0Mu5tH|Aivl%PDo3|D&8uo`oG4}<; zL>4$8b(f%QvhQ`*X4yXLuLspL zLBK!kRG%rP$*gzi?RuX6wzVdoy?!Jy+(DKjQ;FCNri_#LcK7xo&7NRfNA%&V6e;cp zXYCOg#zxi`Ct2zFdGZDKN!e?YR6GiwFqGBbAU;#yAW0H}wLaJO{PbX@qLl_GLwAWh z|9Tbpt&ugd$U|1E{UA;9z;-ksGn1x!&BG|=H2JmDO5%$N^AYjWP5dnuTRnwONLAe@ z>7t0MJ|JJqoq0`ckAyQdCjPLGHxJFuF6MGE#Rq&Z4R%Fplr=SO6b#(?oWGmK{`-jF zm(u$FgO2F@-TB;8mL0Z53VLx=Ok;}gT?J#$71K0*MT!*WbV{=38XBw8hc&~s;GLL? zZ;pDK`13bGWc;ma&7}_NFWU}++xR4WMR?`JuBg$A z1F`qwklpF3d4KdCEc`tgn=G1;X1rHU9~Ls-m>fc@vw~olFTG)v{~WitOy)CHJasEV zip~04r`OYJ6K2bg4TqXE)=EX_g8WYfsm77-G#F@QktOOHJ$6k#8Tphuq<~o@|3POhf4<9dB%fP$(&*H!FA;kzcF^tX^*v@9e>kFw%cpfcP=B| z&7Fh@-M)HQkZ)wvzc=L-O*-!2A-gF4i>&#(>*sF)iEwts#^OOY@J5tK1CV@bD{!4d zOKi}5KK57)5R@60K5#hbS7RT%ec8jS#WnL~4RST*MAB3_JQ5~=r8YclrY+?l=Fg~r~ zQB>$S?2o@{(HIMTeqFA zwRN8|JUTd%6>>CZ3O)s~keJy%V~Ff^Pey%U-wEax9$a!E>97JRCn;7apE!ol8!W?~bkSwHqc%N3U_aYy%4;MVuX@ z+9^wRZ8zoe^a{^7NzN#8#R0Emchj45TJh8wheZz)Z~TqRpw7@<-u0?(*_)SJ-P-P^Z&nDq65(O?mU;HTWyv{zJxTBRpDeen3-MkDveB)CJ_ zEQSU*i_B-zUk6_Z7Zd{TZ-aeXjjPmfZ5`xY$X4#j0LRFZ0fz!3UX@ew-OJ}eu zCV)rt#*WfRoL0PL4bR}0K-Gma(YK8&KeP5!3KQ_hVmZgZio7qO@H+^&F9o}@`m8{Q2V>>C~TmO%=lf3KI zq}YqrM%n(VWOa*{+NOc|T6)mq*wTj`qda+fLA`}%bNl7{;tCiIHE!T!nbT~wN1XgDx<~Mqh22*>W4Farv9r-zJSfrM5)VXL=^(nLostbeLYd zj9%EYgjMt2Fu=Q&-Kvz;-Dvv|T-DK~ZMADK1)-vMVtL1sNCGh0#9Aq-E%Ru-T>3uD zqHqfp;<={u$Kd+B;D(U#`#Pr@wM&(%IcdsfviS}-rR}kvw~_llzl9j`=~_6=H`Zk9 zn4;mdtCmmidd=R>5*fKlt><0eGQ3wm_SrS2l;|DBH*!FztuRVTr$1dC<>n>g?IJj@ zK3z7zB{-0$x>?DVf%R5TnMS}NRon6n{VC?}Ghr!5hEhiZjZ*mM>5(R)b-Z8hPZZk2 z1@&{F_uhV4%!}kxWSA_#JVvkuze#t;frWq&u(Api=1V1 zvEqH(*tcv&j^A%h9QE(3)Zo4x)0CG%%wA6@CusXzT&4Gg^y)r3f@i!*p zza1rdB(V3=Sh+s6tSB53WqQV(04b zeDt9IQu`|GIkoh>jagu+o8jLz`J6pT=0W$u*EhI(BQclxu1mse?NILx{tWIna( zdvv~p=|9CQz$wMvU0`SK2L<(J{+Hr&S*lrPHrKH8pS8ZKqGT&G#{yB^-6X=E?m)ULkM0l9*GD(}>{UWg{B;H6T)S25_ ztccei6NsGJi3lgPnLxo4)NV&Ts4O-hmb43bY$Q%o=O_+OeSUIaT)B$Sb#Nl jmcBX=SF!#!d%N;rEQn|_YW!A4VcOOwW#JJgfaZSyXbIPo literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ingot_lanthanium_alloy.png b/assets/hbm/textures/items/ingot_lanthanium_alloy.png new file mode 100644 index 0000000000000000000000000000000000000000..50c82ae0ebe7ddf92bf5329e4557370c811a6fe4 GIT binary patch literal 442 zcmV;r0Y(0aP)y%0*9LEVDkFWZ3vA7G#1psW@9#gVKr82fe$8l&h8sIpbZEg=Cx7hYP zynRe4@jMUD(|H)6-EIS*l%iU#GPkCc*w}#*Z`cuwMJJXX2B_6)0GOuv<0_u_pp)n# z{eB(;VNB{r; literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/quartz_plutonium.png b/assets/hbm/textures/items/quartz_plutonium.png new file mode 100644 index 0000000000000000000000000000000000000000..84cad9f5a10b906fabb9873dd3500f318d8a85e6 GIT binary patch literal 401 zcmV;C0dD?@P)+n1eAp`(PlAx6OU4-FqNL|-RDFIlmR$Q-Fj4`BX>Hvbi z`E$Pge(&veJ2x7QD2f7rIF2#KP*oL8(>(7W%Q80}j|syNV+`l>nIH(5PN(?3k5UR_ z4AxqTqM)v8@;v8wJbHtEqLdOTC1Dt{TrO$bmdoWr+qP6yh1Qxlj=#n9`$8%8HlNQi z#?W;gzVB0(B|->hvl)}g1Zyp))9Eq&5usO_rf$7n6GajC`<=2Zx!rCAL4ej8;K}?A v&_ntN&VBrwJkJ51%s&Ep$k(&4#y`_LB_^^7;z(Y800000NkvXXu0mjfMPsXW literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/bomb/LaunchPad.java b/com/hbm/blocks/bomb/LaunchPad.java index 509a96d8c..595a199d0 100644 --- a/com/hbm/blocks/bomb/LaunchPad.java +++ b/com/hbm/blocks/bomb/LaunchPad.java @@ -290,6 +290,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_anti_ballistic && entity.power >= 75000) { @@ -298,6 +299,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_incendiary && entity.power >= 75000) { @@ -306,6 +308,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_cluster && entity.power >= 75000) { @@ -314,6 +317,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_buster && entity.power >= 75000) { @@ -322,6 +326,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_strong && entity.power >= 75000) { @@ -330,6 +335,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_incendiary_strong && entity.power >= 75000) { @@ -338,6 +344,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_cluster_strong && entity.power >= 75000) { @@ -346,6 +353,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_buster_strong && entity.power >= 75000) { @@ -354,6 +362,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_burst && entity.power >= 75000) { @@ -362,6 +371,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_inferno && entity.power >= 75000) { @@ -370,6 +380,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_rain && entity.power >= 75000) { @@ -378,6 +389,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_drill && entity.power >= 75000) { @@ -386,6 +398,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_nuclear && entity.power >= 75000) { @@ -394,6 +407,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_endo && entity.power >= 75000) { @@ -402,6 +416,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_exo && entity.power >= 75000) { @@ -410,6 +425,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_nuclear_cluster && entity.power >= 75000) { @@ -418,6 +434,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } if(entity.slots[0] != null && entity.slots[0].getItem() == ModItems.missile_anti_ballistic && entity.power >= 75000) { @@ -426,6 +443,7 @@ public class LaunchPad extends BlockContainer implements IBomb { entity.power -= 75000; entity.slots[0] = null; + p_149695_1_.playSoundEffect(x, y, z, "hbm:weapon.missileTakeOff", 2.0F, 1.0F); } } } diff --git a/com/hbm/blocks/generic/RedBarrel.java b/com/hbm/blocks/generic/RedBarrel.java index 398ad0eae..cb2e96d67 100644 --- a/com/hbm/blocks/generic/RedBarrel.java +++ b/com/hbm/blocks/generic/RedBarrel.java @@ -37,7 +37,8 @@ public class RedBarrel extends BlockContainer { { if (p_149695_1_.getBlock(x + 1, y, z) == Blocks.fire || p_149695_1_.getBlock(x - 1, y, z) == Blocks.fire || p_149695_1_.getBlock(x, y + 1, z) == Blocks.fire || p_149695_1_.getBlock(x, y - 1, z) == Blocks.fire || p_149695_1_.getBlock(x, y, z + 1) == Blocks.fire || p_149695_1_.getBlock(x, y, z - 1) == Blocks.fire) { - explode(p_149695_1_, x, y, z); + if(!p_149695_1_.isRemote) + explode(p_149695_1_, x, y, z); } } diff --git a/com/hbm/blocks/machine/BlockSeal.java b/com/hbm/blocks/machine/BlockSeal.java index 4f558ab44..f420ae38e 100644 --- a/com/hbm/blocks/machine/BlockSeal.java +++ b/com/hbm/blocks/machine/BlockSeal.java @@ -9,6 +9,7 @@ import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityCoreAdvanced; import com.hbm.tileentity.TileEntityCoreTitanium; import com.hbm.tileentity.TileEntityHatch; +import com.hbm.tileentity.TileEntityMachineBattery; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; @@ -46,6 +47,9 @@ public class BlockSeal extends Block implements IBomb { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { + metadata = metadata % 4; + if(metadata == 0 || metadata == 1) + metadata += 4; return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : (metadata == 0 && side == 3 ? this.blockIcon : (side == metadata ? this.blockIcon : this.iconTop))); } @@ -81,11 +85,11 @@ public class BlockSeal extends Block implements IBomb { } if(block3.func_149730_j() && !block4.func_149730_j()) { - b0 = 5; + b0 = 1; } if(block4.func_149730_j() && !block3.func_149730_j()) { - b0 = 4; + b0 = 0; } world.setBlockMetadataWithNotify(x, y, z, b0, 2); @@ -102,7 +106,7 @@ public class BlockSeal extends Block implements IBomb { } if(i == 1) { - world.setBlockMetadataWithNotify(x, y, z, 5, 2); + world.setBlockMetadataWithNotify(x, y, z, 1, 2); } if(i == 2) { @@ -110,7 +114,7 @@ public class BlockSeal extends Block implements IBomb { } if(i == 3) { - world.setBlockMetadataWithNotify(x, y, z, 4, 2); + world.setBlockMetadataWithNotify(x, y, z, 0, 2); } } @@ -145,13 +149,13 @@ public class BlockSeal extends Block implements IBomb { int xOff = 0; int zOff = 0; - if(world.getBlockMetadata(x, y, z) == 2) + if(world.getBlockMetadata(x, y, z) % 4 == 2) zOff += size; - if(world.getBlockMetadata(x, y, z) == 3) + if(world.getBlockMetadata(x, y, z) % 4 == 3) zOff -= size; - if(world.getBlockMetadata(x, y, z) == 4) + if(world.getBlockMetadata(x, y, z) % 4 == 0) xOff += size; - if(world.getBlockMetadata(x, y, z) == 5) + if(world.getBlockMetadata(x, y, z) % 4 == 1) xOff -= size; for(int X = x - size; X <= x + size; X ++) { @@ -195,13 +199,13 @@ public class BlockSeal extends Block implements IBomb { int xOff = 0; int zOff = 0; - if(world.getBlockMetadata(x, y, z) == 2) + if(world.getBlockMetadata(x, y, z) % 4 == 2) zOff += size; - if(world.getBlockMetadata(x, y, z) == 3) + if(world.getBlockMetadata(x, y, z) % 4 == 3) zOff -= size; - if(world.getBlockMetadata(x, y, z) == 4) + if(world.getBlockMetadata(x, y, z) % 4 == 0) xOff += size; - if(world.getBlockMetadata(x, y, z) == 5) + if(world.getBlockMetadata(x, y, z) % 4 == 1) xOff -= size; for(int X = x - size + 1; X <= x + size - 1; X++) { @@ -221,13 +225,13 @@ public class BlockSeal extends Block implements IBomb { int xOff = 0; int zOff = 0; - if(world.getBlockMetadata(x, y, z) == 2) + if(world.getBlockMetadata(x, y, z) % 4 == 2) zOff += size; - if(world.getBlockMetadata(x, y, z) == 3) + if(world.getBlockMetadata(x, y, z) % 4 == 3) zOff -= size; - if(world.getBlockMetadata(x, y, z) == 4) + if(world.getBlockMetadata(x, y, z) % 4 == 0) xOff += size; - if(world.getBlockMetadata(x, y, z) == 5) + if(world.getBlockMetadata(x, y, z) % 4 == 1) xOff -= size; for(int X = x - size + 1; X <= x + size - 1; X++) { @@ -243,13 +247,13 @@ public class BlockSeal extends Block implements IBomb { int xOff = 0; int zOff = 0; - if(world.getBlockMetadata(x, y, z) == 2) + if(world.getBlockMetadata(x, y, z) % 4 == 2) zOff += size; - if(world.getBlockMetadata(x, y, z) == 3) + if(world.getBlockMetadata(x, y, z) % 4 == 3) zOff -= size; - if(world.getBlockMetadata(x, y, z) == 4) + if(world.getBlockMetadata(x, y, z) % 4 == 0) xOff += size; - if(world.getBlockMetadata(x, y, z) == 5) + if(world.getBlockMetadata(x, y, z) % 4 == 1) xOff -= size; for(int X = x - size + 1; X <= x + size - 1; X++) { @@ -274,5 +278,32 @@ public class BlockSeal extends Block implements IBomb { this.closeSeal(world, x, y, z, i); } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) + { + if (world.isBlockIndirectlyGettingPowered(x, y, z)) + { + int meta = world.getBlockMetadata(x, y, z); + if(meta < 4) { + world.setBlockMetadataWithNotify(x, y, z, meta + 4, 2); + + int i = this.getFrameSize(world, x, y, z); + + if(i != 0) + if(this.isSealClosed(world, x, y, z, i)) + this.openSeal(world, x, y, z, i); + else + this.closeSeal(world, x, y, z, i); + } + } + else + { + int meta = world.getBlockMetadata(x, y, z); + if(meta >= 4) { + world.setBlockMetadataWithNotify(x, y, z, meta % 4, 2); + } + } + } } diff --git a/com/hbm/explosion/ExplosionNukeGeneric.java b/com/hbm/explosion/ExplosionNukeGeneric.java index 59834e02d..67ae5c7f0 100644 --- a/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/com/hbm/explosion/ExplosionNukeGeneric.java @@ -198,6 +198,9 @@ public class ExplosionNukeGeneric { && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_off && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_on && world.getBlock(x, y, z) != ModBlocks.cmb_brick + && world.getBlock(x, y, z) != ModBlocks.crystal_virus + && world.getBlock(x, y, z) != ModBlocks.crystal_hardened + && world.getBlock(x, y, z) != ModBlocks.crystal_pulsar && world.getBlock(x, y, z) != ModBlocks.cmb_brick_reinforced && !(world.getBlock(x, y, z) instanceof DecoBlockAlt)) { if (world.getBlock(x, y, z) == ModBlocks.brick_concrete) { diff --git a/com/hbm/gui/container/ContainerMachineRTG.java b/com/hbm/gui/container/ContainerMachineRTG.java index 642eccd96..ece82d7ef 100644 --- a/com/hbm/gui/container/ContainerMachineRTG.java +++ b/com/hbm/gui/container/ContainerMachineRTG.java @@ -77,7 +77,7 @@ public class ContainerMachineRTG extends Container { return null; } } - else if (!this.mergeItemStack(var5, 0, 16, false)) + else if (!this.mergeItemStack(var5, 0, 15, false)) { return null; } diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index b7f9fce07..db48c949f 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -47,6 +47,11 @@ public class ItemCustomLore extends ItemRadioactive { list.add("RTG fuel pellet for infinite energy! (almost)"); } + if(this == ModItems.pellet_rtg_weak) + { + list.add("Cheaper and weaker pellet, now with more U238!"); + } + if(this == ModItems.pellet_cluster) { list.add("Used in multi purpose bombs:"); @@ -384,7 +389,7 @@ public class ItemCustomLore extends ItemRadioactive { @Override public EnumRarity getRarity(ItemStack p_77613_1_) { - if(this == ModItems.nugget_euphemium || this == ModItems.ingot_euphemium || this == ModItems.rod_quad_euphemium || this == ModItems.watch || this == ModItems.powder_iodine || this == ModItems.powder_thorium || this == ModItems.powder_neodymium || this == ModItems.powder_neptunium || this == ModItems.powder_astatine || this == ModItems.powder_caesium) + if(this == ModItems.nugget_euphemium || this == ModItems.ingot_euphemium || this == ModItems.rod_quad_euphemium || this == ModItems.watch || this == ModItems.powder_iodine || this == ModItems.powder_thorium || this == ModItems.powder_neodymium || this == ModItems.powder_neptunium || this == ModItems.powder_astatine || this == ModItems.powder_caesium || this == ModItems.powder_strontium || this == ModItems.powder_cobalt || this == ModItems.powder_bromine || this == ModItems.powder_niobium || this == ModItems.powder_tennessine || this == ModItems.powder_cerium) { return EnumRarity.epic; } diff --git a/com/hbm/items/special/ItemFuelRod.java b/com/hbm/items/special/ItemFuelRod.java index d11ea5f92..f7592d8e3 100644 --- a/com/hbm/items/special/ItemFuelRod.java +++ b/com/hbm/items/special/ItemFuelRod.java @@ -17,84 +17,84 @@ public class ItemFuelRod extends ItemRadioactive { if(this == ModItems.rod_uranium_fuel) { - list.add("Generates 10 power per tick"); + list.add("Generates 100 power per tick"); list.add("Generates 1 heat per tick"); list.add("Lasts 10000 ticks"); } if(this == ModItems.rod_dual_uranium_fuel) { - list.add("Generates 10 power per tick"); + list.add("Generates 100 power per tick"); list.add("Generates 1 heat per tick"); list.add("Lasts 20000 ticks"); } if(this == ModItems.rod_quad_uranium_fuel) { - list.add("Generates 10 power per tick"); + list.add("Generates 100 power per tick"); list.add("Generates 1 heat per tick"); list.add("Lasts 40000 ticks"); } if(this == ModItems.rod_plutonium_fuel) { - list.add("Generates 15 power per tick"); + list.add("Generates 150 power per tick"); list.add("Generates 2 heat per tick"); list.add("Lasts 25000 ticks"); } if(this == ModItems.rod_dual_plutonium_fuel) { - list.add("Generates 15 power per tick"); + list.add("Generates 150 power per tick"); list.add("Generates 2 heat per tick"); list.add("Lasts 50000 ticks"); } if(this == ModItems.rod_quad_plutonium_fuel) { - list.add("Generates 15 power per tick"); + list.add("Generates 150 power per tick"); list.add("Generates 2 heat per tick"); list.add("Lasts 100000 ticks"); } if(this == ModItems.rod_mox_fuel) { - list.add("Generates 5 power per tick"); + list.add("Generates 50 power per tick"); list.add("Generates 1 heat per tick"); list.add("Lasts 100000 ticks"); } if(this == ModItems.rod_dual_mox_fuel) { - list.add("Generates 5 power per tick"); + list.add("Generates 50 power per tick"); list.add("Generates 1 heat per tick"); list.add("Lasts 200000 ticks"); } if(this == ModItems.rod_quad_mox_fuel) { - list.add("Generates 5 power per tick"); + list.add("Generates 50 power per tick"); list.add("Generates 1 heat per tick"); list.add("Lasts 400000 ticks"); } if(this == ModItems.rod_schrabidium_fuel) { - list.add("Generates 25 power per tick"); + list.add("Generates 25000 power per tick"); list.add("Generates 10 heat per tick"); list.add("Lasts 2500000 ticks"); } if(this == ModItems.rod_dual_schrabidium_fuel) { - list.add("Generates 25 power per tick"); + list.add("Generates 25000 power per tick"); list.add("Generates 10 heat per tick"); list.add("Lasts 5000000 ticks"); } if(this == ModItems.rod_quad_schrabidium_fuel) { - list.add("Generates 25 power per tick"); + list.add("Generates 25000 power per tick"); list.add("Generates 10 heat per tick"); list.add("Lasts 10000000 ticks"); } diff --git a/com/hbm/items/tool/ItemCrateCaller.java b/com/hbm/items/tool/ItemCrateCaller.java index 3676db8c1..1ad25d19f 100644 --- a/com/hbm/items/tool/ItemCrateCaller.java +++ b/com/hbm/items/tool/ItemCrateCaller.java @@ -46,6 +46,8 @@ public class ItemCrateCaller extends Item { { player.addChatMessage(new ChatComponentText("Called in supply drop!")); } + + world.playSoundAtEntity(player, "hbm:item.techBleep", 1.0F, 1.0F); player.swingItem(); diff --git a/com/hbm/items/tool/ItemDesingator.java b/com/hbm/items/tool/ItemDesingator.java index 57b153d5a..293d0fd9d 100644 --- a/com/hbm/items/tool/ItemDesingator.java +++ b/com/hbm/items/tool/ItemDesingator.java @@ -51,6 +51,9 @@ public class ItemDesingator extends Item { { p_77648_2_.addChatMessage(new ChatComponentText("Position set!")); } + + p_77648_3_.playSoundAtEntity(p_77648_2_, "hbm:item.techBleep", 1.0F, 1.0F); + return true; } diff --git a/com/hbm/items/tool/ItemDesingatorRange.java b/com/hbm/items/tool/ItemDesingatorRange.java index 78cb9a915..d5dba5e1f 100644 --- a/com/hbm/items/tool/ItemDesingatorRange.java +++ b/com/hbm/items/tool/ItemDesingatorRange.java @@ -56,6 +56,9 @@ public class ItemDesingatorRange extends Item { { player.addChatMessage(new ChatComponentText("Position set to X:" + x + ", Z:" + z)); } + + world.playSoundAtEntity(player, "hbm:item.techBleep", 1.0F, 1.0F); + return stack; } diff --git a/com/hbm/items/tool/ItemDetonator.java b/com/hbm/items/tool/ItemDetonator.java index 71cc05260..7167d8487 100644 --- a/com/hbm/items/tool/ItemDetonator.java +++ b/com/hbm/items/tool/ItemDetonator.java @@ -45,6 +45,9 @@ public class ItemDetonator extends Item { { player.addChatMessage(new ChatComponentText("Position set!")); } + + world.playSoundAtEntity(player, "hbm:item.techBoop", 2.0F, 1.0F); + return true; } @@ -56,7 +59,8 @@ public class ItemDetonator extends Item { if(stack.stackTagCompound == null) { - player.addChatMessage(new ChatComponentText("Error: Position not set.")); + if(world.isRemote) + player.addChatMessage(new ChatComponentText("Error: Position not set.")); } else { int x = stack.stackTagCompound.getInteger("x"); int y = stack.stackTagCompound.getInteger("y"); @@ -64,6 +68,7 @@ public class ItemDetonator extends Item { if(world.getBlock(x, y, z) instanceof IBomb) { + world.playSoundAtEntity(player, "hbm:item.techBleep", 1.0F, 1.0F); if(!world.isRemote) { ((IBomb)world.getBlock(x, y, z)).explode(world, x, y, z); diff --git a/com/hbm/items/tool/ItemMultitoolPassive.java b/com/hbm/items/tool/ItemMultitoolPassive.java index b445969eb..1458afb02 100644 --- a/com/hbm/items/tool/ItemMultitoolPassive.java +++ b/com/hbm/items/tool/ItemMultitoolPassive.java @@ -44,6 +44,9 @@ public class ItemMultitoolPassive extends Item { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(player.isSneaking()) { + + world.playSoundAtEntity(player, "hbm:item.techBoop", 2.0F, 1.0F); + if (this == ModItems.multitool_ext) { return new ItemStack(ModItems.multitool_miner, 1, stack.getItemDamage()); } else if(this == ModItems.multitool_miner) { @@ -72,6 +75,7 @@ public class ItemMultitoolPassive extends Item { item.addEnchantment(Enchantment.fortune, 3); return item; } + } else { if(this == ModItems.multitool_ext) { return stack; diff --git a/com/hbm/items/tool/ItemMultitoolTool.java b/com/hbm/items/tool/ItemMultitoolTool.java index 21f9d89cd..ce82cf314 100644 --- a/com/hbm/items/tool/ItemMultitoolTool.java +++ b/com/hbm/items/tool/ItemMultitoolTool.java @@ -41,6 +41,9 @@ public class ItemMultitoolTool extends ItemTool { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(player.isSneaking()) { + + world.playSoundAtEntity(player, "hbm:item.techBoop", 2.0F, 1.0F); + if(this == ModItems.multitool_dig) { ItemStack item = new ItemStack(ModItems.multitool_silk, 1, stack.getItemDamage()); item.addEnchantment(Enchantment.silkTouch, 3); diff --git a/com/hbm/items/weapon/GunJack.java b/com/hbm/items/weapon/GunJack.java index b2bc1202b..eddc8671f 100644 --- a/com/hbm/items/weapon/GunJack.java +++ b/com/hbm/items/weapon/GunJack.java @@ -129,9 +129,9 @@ public class GunJack extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - //list.add("POW! Haha!"); - list.add("Alright, alright, I couldn't think of a proper name,"); - list.add("are you happy now?"); + list.add("One barrel? Boring."); + list.add("Two barrels? Nah."); + list.add("Four barrels? Heck yes!"); list.add(""); list.add("Ammo: Quadruple Shotgun Shells"); list.add("Damage: 12 - 24"); diff --git a/com/hbm/lib/SPCLStrings.java b/com/hbm/lib/SPCLStrings.java new file mode 100644 index 000000000..050e65744 --- /dev/null +++ b/com/hbm/lib/SPCLStrings.java @@ -0,0 +1,12 @@ +package com.hbm.lib; + +public class SPCLStrings { + + //Cheeky easter egg + String stringStanley = "54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52 20 54 48 45 20 45 4e 44 20 49 53 20 4e 45 56 45 52"; + //Replace e998, universal task + String stringQuestion = "41 4d 20 4e 4f 54 20 4f 46 20 55 4e 44 45 52 53 54 41 4e 44 49 4e 47 20 48 4f 57 20 4d 41 4e 45 20 49 53 20 4f 46 20 57 41 56 49 4e 47"; + //Hash value for error reports + String stringError = "T1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVM"; + +} diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 57cd6c205..2cfad418d 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -326,6 +326,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 9, 34), new Object[] { "#", '#', new ItemStack(ModItems.ingot_euphemium, 1, 34) }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "tinyPu238" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_rtg_weak, 1), new Object[] { "IUI", "UPU", "IUI", 'I', "plateIron", 'P', "tinyPu238", 'U', "tinyU238" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tritium_deuterium_cake, 1), new Object[] { "DLD", "LTL", "DLD", 'L', "ingotLithium", 'D', ModItems.cell_deuterium, 'T', ModItems.cell_tritium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pellet_schrabidium, 1), new Object[] { "IPI", "PPP", "IPI", 'I', "plateIron", 'P', "ingotSchrabidium" })); @@ -381,7 +382,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.warhead_generic_large, 1), new Object[] { "PTP", "PTP", "TTT", 'P', "plateTitanium", 'T', Item.getItemFromBlock(Blocks.tnt) })); GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_large, 'X', Items.lava_bucket }); GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_large, 'X', Item.getItemFromBlock(ModBlocks.det_cord) }); - GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_large, 'X', Item.getItemFromBlock(Blocks.tnt) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_large, 'X', ModBlocks.det_charge }); GameRegistry.addRecipe(new ItemStack(ModItems.warhead_nuclear, 1), new Object[] { " N ", "TZT", "TBT", 'N', ModItems.boy_shielding, 'Z', ModItems.boy_target, 'B', ModItems.boy_bullet, 'T', ModItems.plate_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirvlet, 1), new Object[] { " S ", "SPS", "STS", 'S', ModItems.plate_steel, 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt) }); GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirv, 1), new Object[] { "MMM", "MWM", "MMM", 'M', ModItems.warhead_mirvlet, 'W', ModItems.warhead_generic_large }); @@ -452,6 +453,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_shredder), 1), new Object[] { "SHS", "MBM", "CFC", 'H', ModItems.hull_big_steel, 'S', ModBlocks.steel_beam, 'M', ModItems.motor, 'B', Blocks.iron_bars, 'C', ModBlocks.red_wire_coated, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_combine_factory), 1), new Object[] { "HCH", "STS", "RFR", 'H', ModItems.tank_steel, 'C', ModItems.coil_advanced_torus, 'S', "plateSteel", 'T', ModBlocks.block_magnetized_tungsten, 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "PTP", "FKF", "BBB", 'P', "plateTitanium", 'T', ModItems.telepad, 'F', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'K', ModItems.entanglement_kit, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 1), new Object[] { "UPU", "UWU", "UPU", 'P', "plateSteel", 'U', ModItems.rtg_unit, 'W', ModBlocks.red_wire_coated })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', "plateTitanium", 'I', "ingotTitanium" })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) }); @@ -478,6 +480,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.screwdriver, 1), new Object[] { " I", " I ", "S ", 'S', "ingotSteel", 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.screwdriver, "dustNeptunium", ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.board_copper, ModItems.black_hole, ModItems.powder_caesium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.screwdriver, ModItems.powder_strontium, ModItems.powder_bromine, ModItems.powder_cobalt, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.board_copper, ModItems.black_hole, ModItems.powder_cerium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thermo_element, 1), new Object[] { "GRG", "APA", "GRG", 'P', "plateSteel", 'G', Items.gold_nugget, 'R', ModItems.wire_red_copper, 'A', ModItems.wire_aluminium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.limiter, 1), new Object[] { "SC", "SC", "LS", 'S', "plateSteel", 'C', ModItems.circuit_copper, 'L', "plateLead" })); @@ -669,6 +672,8 @@ public class CraftingManager { 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(ModItems.syringe_metal_medx, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.quartz, 'S', ModItems.syringe_metal_empty }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_psycho, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.glowstone_dust, 'S', ModItems.syringe_metal_empty }); + GameRegistry.addRecipe(new ItemStack(ModItems.pill_iodine, 8), new Object[] { "IF", 'I', ModItems.powder_iodine, 'F', ModItems.fluorite }); + GameRegistry.addRecipe(new ItemStack(ModItems.plan_c, 1), new Object[] { "PFP", 'P', ModItems.powder_poison, 'F', ModItems.fluorite }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Item.getItemFromBlock(Blocks.stone_button), 'L', Items.leather, 'I', "ingotSteel", 'C', ModItems.circuit_red_copper })); @@ -852,6 +857,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.emerald, 1), new Object[] { "#", '#', "dustEmerald" })); if(MainRegistry.enableNITAN) GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_neptunium, ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.powder_caesium }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_lc, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustLapis" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.record_ss, 1), new Object[] { " S ", "SDS", " S ", 'S', "ingotSteel", 'D', "dustAdvanced" })); diff --git a/com/hbm/tileentity/TileEntityBombMulti.java b/com/hbm/tileentity/TileEntityBombMulti.java index ec3c4d64c..395c67a68 100644 --- a/com/hbm/tileentity/TileEntityBombMulti.java +++ b/com/hbm/tileentity/TileEntityBombMulti.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -267,4 +269,11 @@ public class TileEntityBombMulti extends TileEntity implements ISidedInventory { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } \ No newline at end of file diff --git a/com/hbm/tileentity/TileEntityCable.java b/com/hbm/tileentity/TileEntityCable.java index fab71442b..92c3cc72b 100644 --- a/com/hbm/tileentity/TileEntityCable.java +++ b/com/hbm/tileentity/TileEntityCable.java @@ -7,6 +7,8 @@ import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.interfaces.IConductor; import com.hbm.lib.Library; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import scala.Int; @@ -44,5 +46,12 @@ public class TileEntityCable extends TileEntity implements IConductor { if(Library.checkConnectables(this.worldObj, xCoord - 1, yCoord, zCoord)) connections[5] = ForgeDirection.WEST; else connections[5] = null; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoBlock.java b/com/hbm/tileentity/TileEntityDecoBlock.java index 6d24a9ead..906238b95 100644 --- a/com/hbm/tileentity/TileEntityDecoBlock.java +++ b/com/hbm/tileentity/TileEntityDecoBlock.java @@ -1,5 +1,7 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -9,5 +11,12 @@ public class TileEntityDecoBlock extends TileEntity { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoBlockAlt.java b/com/hbm/tileentity/TileEntityDecoBlockAlt.java index d959bbb9c..418516e73 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAlt.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAlt.java @@ -1,5 +1,7 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -9,5 +11,12 @@ public class TileEntityDecoBlockAlt extends TileEntity { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoBlockAltF.java b/com/hbm/tileentity/TileEntityDecoBlockAltF.java index f519d1feb..cbaa3f762 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAltF.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAltF.java @@ -3,6 +3,8 @@ package com.hbm.tileentity; import java.util.HashSet; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -67,4 +69,11 @@ public class TileEntityDecoBlockAltF extends TileEntity { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoBlockAltG.java b/com/hbm/tileentity/TileEntityDecoBlockAltG.java index f2ea2ef2a..c7bfff3e0 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAltG.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAltG.java @@ -1,5 +1,7 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -9,5 +11,12 @@ public class TileEntityDecoBlockAltG extends TileEntity { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoBlockAltW.java b/com/hbm/tileentity/TileEntityDecoBlockAltW.java index a03331de5..53cfe63ff 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAltW.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAltW.java @@ -1,5 +1,7 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -9,5 +11,12 @@ public class TileEntityDecoBlockAltW extends TileEntity { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java b/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java index 48971f53f..8ff4c9035 100644 --- a/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java +++ b/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java @@ -1,7 +1,16 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; public class TileEntityDecoPoleSatelliteReceiver extends TileEntity { + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoPoleTop.java b/com/hbm/tileentity/TileEntityDecoPoleTop.java index 26ec8ecb4..8a05243e6 100644 --- a/com/hbm/tileentity/TileEntityDecoPoleTop.java +++ b/com/hbm/tileentity/TileEntityDecoPoleTop.java @@ -1,7 +1,16 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; public class TileEntityDecoPoleTop extends TileEntity { + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoSteelPoles.java b/com/hbm/tileentity/TileEntityDecoSteelPoles.java index 7fcdbfd7e..bd931d92c 100644 --- a/com/hbm/tileentity/TileEntityDecoSteelPoles.java +++ b/com/hbm/tileentity/TileEntityDecoSteelPoles.java @@ -1,7 +1,16 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; public class TileEntityDecoSteelPoles extends TileEntity { + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDecoTapeRecorder.java b/com/hbm/tileentity/TileEntityDecoTapeRecorder.java index c8109aed6..374c7dac0 100644 --- a/com/hbm/tileentity/TileEntityDecoTapeRecorder.java +++ b/com/hbm/tileentity/TileEntityDecoTapeRecorder.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.blocks.generic.DecoTapeRecorder; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; public class TileEntityDecoTapeRecorder extends TileEntity { @@ -26,4 +28,11 @@ public class TileEntityDecoTapeRecorder extends TileEntity { return 0; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityDiFurnace.java b/com/hbm/tileentity/TileEntityDiFurnace.java index b27b29d6a..5baa6903b 100644 --- a/com/hbm/tileentity/TileEntityDiFurnace.java +++ b/com/hbm/tileentity/TileEntityDiFurnace.java @@ -160,7 +160,7 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory { super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.dualPower = nbt.getShort("powerTime"); + this.dualPower = nbt.getInteger("powerTime"); this.dualCookTime = nbt.getShort("cookTime"); slots = new ItemStack[getSizeInventory()]; @@ -178,7 +178,7 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory { @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("powerTime", (short) dualPower); + nbt.setInteger("powerTime", dualPower); nbt.setShort("cookTime", (short) dualCookTime); NBTTagList list = new NBTTagList(); diff --git a/com/hbm/tileentity/TileEntityFWatzCore.java b/com/hbm/tileentity/TileEntityFWatzCore.java index bbbadd9f6..30488cce8 100644 --- a/com/hbm/tileentity/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/TileEntityFWatzCore.java @@ -165,10 +165,10 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - cool = nbt.getShort("cool") * 10000; - power = nbt.getShort("power") * 10000; - amat = nbt.getShort("amat") * 10000; - aSchrab = nbt.getShort("aSchrab") * 10000; + cool = nbt.getInteger("cool"); + power = nbt.getInteger("power"); + amat = nbt.getInteger("amat"); + aSchrab = nbt.getInteger("aSchrab"); slots = new ItemStack[getSizeInventory()]; @@ -186,10 +186,10 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("cool", (short) (cool/10000)); - nbt.setShort("power", (short) (power/10000)); - nbt.setShort("amat", (short) (amat/10000)); - nbt.setShort("aSchrab", (short) (aSchrab/10000)); + nbt.setInteger("cool", cool); + nbt.setInteger("power", power); + nbt.setInteger("amat", amat); + nbt.setInteger("aSchrab", aSchrab); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) diff --git a/com/hbm/tileentity/TileEntityFusionMultiblock.java b/com/hbm/tileentity/TileEntityFusionMultiblock.java index ab4e72c65..b16698d98 100644 --- a/com/hbm/tileentity/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/TileEntityFusionMultiblock.java @@ -32,7 +32,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve public int trit; public final static int tritMax = 10000000; public int power; - public final static int maxPower = 10000000; + public final static int maxPower = 100000000; private ItemStack slots[]; public int age = 0; public List list = new ArrayList(); @@ -155,10 +155,10 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - water = nbt.getShort("water") * 1000; - deut = nbt.getShort("deut") * 1000; - power = nbt.getShort("power") * 1000; - trit = nbt.getShort("trit") * 1000; + water = nbt.getInteger("water"); + deut = nbt.getInteger("deut"); + power = nbt.getInteger("power"); + trit = nbt.getInteger("trit"); slots = new ItemStack[getSizeInventory()]; @@ -176,10 +176,10 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("water", (short) (water/1000)); - nbt.setShort("deut", (short) (deut/1000)); - nbt.setShort("power", (short) (power/1000)); - nbt.setShort("trit", (short) (trit/1000)); + nbt.setInteger("water", water); + nbt.setInteger("deut", deut); + nbt.setInteger("power", power); + nbt.setInteger("trit", trit); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -197,6 +197,9 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve @Override public boolean isStructureValid(World world) { + + //...and I wrote all of this by hand! Ha! + if(world.getBlock(this.xCoord + 5, this.yCoord - 2, this.zCoord - 3) == ModBlocks.fusion_conductor && world.getBlock(this.xCoord + 5, this.yCoord - 2, this.zCoord - 2) == ModBlocks.fusion_conductor && world.getBlock(this.xCoord + 5, this.yCoord - 2, this.zCoord - 1) == ModBlocks.fusion_conductor && @@ -1088,14 +1091,14 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve deut -= 100; trit -= 100; - if(water - 1000 >= 0) + if(water - 100 >= 0) { - water -= 1000; - power += 10000; + water -= 100; + power += 100000; if(isCoatingValid(worldObj)) { - power += 10000; + power += 100000; } if(power > maxPower) diff --git a/com/hbm/tileentity/TileEntityIGenerator.java b/com/hbm/tileentity/TileEntityIGenerator.java index 0e9858d29..38ef02c55 100644 --- a/com/hbm/tileentity/TileEntityIGenerator.java +++ b/com/hbm/tileentity/TileEntityIGenerator.java @@ -12,6 +12,8 @@ import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -36,7 +38,7 @@ public class TileEntityIGenerator extends TileEntity implements ISidedInventory, public int fuel; public int burn; public int soundCycle = 0; - public static final int maxPower = 100000; + public static final int maxPower = 10000; public static final int maxTorque = 2500; public static final int maxHeat = 7500; public static final int maxWater = 10000; @@ -679,5 +681,12 @@ public class TileEntityIGenerator extends TileEntity implements ISidedInventory, public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityLaunchPad.java b/com/hbm/tileentity/TileEntityLaunchPad.java index 71fd4d3d2..a04e00afc 100644 --- a/com/hbm/tileentity/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/TileEntityLaunchPad.java @@ -5,6 +5,8 @@ import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -135,7 +137,7 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getShort("power"); + power = nbt.getInteger("power"); state = nbt.getShort("state"); slots = new ItemStack[getSizeInventory()]; @@ -154,7 +156,7 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); NBTTagList list = new NBTTagList(); - nbt.setShort("power", (short) power); + nbt.setInteger("power", power); nbt.setShort("state", (short) state); for(int i = 0; i < slots.length; i++) @@ -443,5 +445,12 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, public int getMaxPower() { return maxPower; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityMachineBattery.java b/com/hbm/tileentity/TileEntityMachineBattery.java index 676ea81e0..48d426abe 100644 --- a/com/hbm/tileentity/TileEntityMachineBattery.java +++ b/com/hbm/tileentity/TileEntityMachineBattery.java @@ -25,7 +25,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent private ItemStack slots[]; public int power = 0; - public final int maxPower = 100000; + public final int maxPower = 1000000; public boolean conducts = false; @@ -138,7 +138,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getShort("power"); + this.power = nbt.getInteger("power"); this.conducts = nbt.getBoolean("conducts"); slots = new ItemStack[getSizeInventory()]; @@ -156,7 +156,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("power", (short) power); + nbt.setInteger("power", power); nbt.setBoolean("conducts", conducts); NBTTagList list = new NBTTagList(); diff --git a/com/hbm/tileentity/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/TileEntityMachineCMBFactory.java index ae7dccc23..782478506 100644 --- a/com/hbm/tileentity/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/TileEntityMachineCMBFactory.java @@ -21,7 +21,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv public int process = 0; public int soundCycle = 0; public static final int maxFill = 1000; - public static final int maxPower = 10000; + public static final int maxPower = 100000; public static final int processSpeed = 200; private static final int[] slots_top = new int[] {1, 3}; @@ -151,8 +151,8 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getShort("power"); - waste = nbt.getShort("waste"); + power = nbt.getInteger("power"); + waste = nbt.getInteger("waste"); process = nbt.getShort("process"); slots = new ItemStack[getSizeInventory()]; @@ -170,8 +170,8 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("power", (short) power); - nbt.setShort("waste", (short) waste); + nbt.setInteger("power", power); + nbt.setInteger("waste", waste); nbt.setShort("process", (short) process); NBTTagList list = new NBTTagList(); @@ -246,7 +246,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv public void process() { waste -= 1; - power -= 3; + power -= 15; process++; diff --git a/com/hbm/tileentity/TileEntityMachineCentrifuge.java b/com/hbm/tileentity/TileEntityMachineCentrifuge.java index b8d9759b0..b233de9bb 100644 --- a/com/hbm/tileentity/TileEntityMachineCentrifuge.java +++ b/com/hbm/tileentity/TileEntityMachineCentrifuge.java @@ -3,6 +3,8 @@ package com.hbm.tileentity; import com.hbm.gui.MachineRecipes; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -166,7 +168,7 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - dualPower = nbt.getShort("powerTime"); + dualPower = nbt.getInteger("powerTime"); dualCookTime = nbt.getShort("CookTime"); slots = new ItemStack[getSizeInventory()]; @@ -184,7 +186,7 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("powerTime", (short) dualPower); + nbt.setInteger("powerTime", dualPower); nbt.setShort("cookTime", (short) dualCookTime); NBTTagList list = new NBTTagList(); @@ -392,4 +394,11 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityMachineCoal.java b/com/hbm/tileentity/TileEntityMachineCoal.java index fe1debaa8..40bd731d6 100644 --- a/com/hbm/tileentity/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/TileEntityMachineCoal.java @@ -31,7 +31,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory public int power; public int water; public int burnTime; - public static final int maxPower = 10000; + public static final int maxPower = 100000; public static final int maxWater = 10000; public int age = 0; public List list = new ArrayList(); @@ -154,8 +154,8 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getShort("powerTime"); - this.water = nbt.getShort("water"); + this.power = nbt.getInteger("powerTime"); + this.water = nbt.getInteger("water"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -172,8 +172,8 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("powerTime", (short) power); - nbt.setShort("water", (short) water); + nbt.setInteger("powerTime", power); + nbt.setInteger("water", water); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -360,9 +360,9 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory { water -= 1; - if(power + 10 <= maxPower) + if(power + 100 <= maxPower) { - power += 10; + power += 100; } else { power = maxPower; } diff --git a/com/hbm/tileentity/TileEntityMachineDeuterium.java b/com/hbm/tileentity/TileEntityMachineDeuterium.java index 7098fc354..c26b526e0 100644 --- a/com/hbm/tileentity/TileEntityMachineDeuterium.java +++ b/com/hbm/tileentity/TileEntityMachineDeuterium.java @@ -22,7 +22,7 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve public int sulfur = 0; public int process = 0; public static final int maxFill = 1000; - public static final int maxPower = 10000; + public static final int maxPower = 100000; public static final int processSpeed = 200; private static final int[] slots_top = new int[] {3}; @@ -152,10 +152,10 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - power = nbt.getShort("power"); - water = nbt.getShort("water"); - sulfur = nbt.getShort("sulfur"); - process = nbt.getShort("process"); + power = nbt.getInteger("power"); + water = nbt.getInteger("water"); + sulfur = nbt.getInteger("sulfur"); + process = nbt.getInteger("process"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -172,10 +172,10 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("power", (short) power); - nbt.setShort("water", (short) water); - nbt.setShort("sulfur", (short) sulfur); - nbt.setShort("process", (short) process); + nbt.setInteger("power", power); + nbt.setInteger("water", water); + nbt.setInteger("sulfur", sulfur); + nbt.setInteger("process", process); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -247,7 +247,7 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve public void process() { water -= 2; sulfur -= 1; - power -= 5; + power -= 25; process++; diff --git a/com/hbm/tileentity/TileEntityMachineDiesel.java b/com/hbm/tileentity/TileEntityMachineDiesel.java index 89837bce9..e11a55641 100644 --- a/com/hbm/tileentity/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/TileEntityMachineDiesel.java @@ -30,7 +30,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento public int power; public int diesel; public int soundCycle = 0; - public static final int maxPower = 10000; + public static final int maxPower = 100000; public int powerCap = 10000; public int superTimer; public static final int maxDiesel = 10000; @@ -151,7 +151,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento NBTTagList list = nbt.getTagList("items", 10); this.power = nbt.getInteger("powerTime"); - this.diesel = nbt.getShort("diesel"); + this.diesel = nbt.getInteger("diesel"); this.powerCap = nbt.getInteger("powerCap"); this.superTimer = nbt.getInteger("superTimer"); slots = new ItemStack[getSizeInventory()]; @@ -169,7 +169,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); nbt.setInteger("powerTime", power); - nbt.setShort("diesel", (short) diesel); + nbt.setInteger("diesel", diesel); nbt.setInteger("powerCap", powerCap); nbt.setInteger("superTimer", superTimer); NBTTagList list = new NBTTagList(); @@ -344,8 +344,8 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento if (diesel < 0) diesel = 0; - if (power + 25 <= powerCap && this.superTimer <= 0) { - power += 25; + if (power + 250 <= powerCap && this.superTimer <= 0) { + power += 250; } else if (power + 1000000000 <= powerCap && this.superTimer > 0) { power += 1000000000; } else { diff --git a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java index 66ad64691..3334f05f9 100644 --- a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java +++ b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java @@ -22,7 +22,7 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid public int dualCookTime; public int power; - public static final int maxPower = 10000; + public static final int maxPower = 100000; public static final int processingSpeed = 100; private static final int[] slots_top = new int[] {1}; @@ -140,8 +140,8 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getShort("powerTime"); - this.dualCookTime = nbt.getShort("cookTime"); + this.power = nbt.getInteger("powerTime"); + this.dualCookTime = nbt.getInteger("cookTime"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -158,8 +158,8 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("powerTime", (short) power); - nbt.setShort("cookTime", (short) dualCookTime); + nbt.setInteger("powerTime", power); + nbt.setInteger("cookTime", dualCookTime); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -280,7 +280,7 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid { dualCookTime++; - power -= 5; + power -= 50; if(this.dualCookTime == TileEntityMachineElectricFurnace.processingSpeed) { diff --git a/com/hbm/tileentity/TileEntityMachineGenerator.java b/com/hbm/tileentity/TileEntityMachineGenerator.java index c2e629a28..ff84b2f11 100644 --- a/com/hbm/tileentity/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/TileEntityMachineGenerator.java @@ -170,10 +170,10 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - water = nbt.getShort("water") * 100; - cool = nbt.getShort("cool") * 100; - power = nbt.getShort("power") * 100; - heat = nbt.getShort("heat") * 100; + water = nbt.getInteger("water"); + cool = nbt.getInteger("cool"); + power = nbt.getInteger("power"); + heat = nbt.getInteger("heat"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -190,10 +190,10 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("water", (short) (water/100)); - nbt.setShort("cool", (short) (cool/100)); - nbt.setShort("power", (short) (power/100)); - nbt.setShort("heat", (short) (heat/100)); + nbt.setInteger("water", water); + nbt.setInteger("cool", cool); + nbt.setInteger("power", power); + nbt.setInteger("heat", heat); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -385,7 +385,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(10); + attemptPower(100); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -397,7 +397,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(10); + attemptPower(100); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -409,7 +409,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(10); + attemptPower(100); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -421,7 +421,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(2); - attemptPower(15); + attemptPower(150); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -433,7 +433,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(2); - attemptPower(15); + attemptPower(150); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -445,7 +445,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(2); - attemptPower(15); + attemptPower(150); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -457,7 +457,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(5); + attemptPower(50); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -469,7 +469,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(5); + attemptPower(50); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -481,7 +481,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(5); + attemptPower(50); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -493,7 +493,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(10); - attemptPower(25); + attemptPower(25000); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -505,7 +505,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(10); - attemptPower(25); + attemptPower(25000); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -517,7 +517,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(10); - attemptPower(25); + attemptPower(25000); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -546,10 +546,10 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve ((slots[7] != null && !(slots[7].getItem() instanceof ItemFuelRod)) || slots[7] == null) && ((slots[8] != null && !(slots[8].getItem() instanceof ItemFuelRod)) || slots[8] == null)) { - if(this.heat - 10 >= 0 && this.cool - 10 >= 0) + if(this.heat - 10 >= 0 && this.cool - 2 >= 0) { this.heat -= 10; - this.cool -= 10; + this.cool -= 2; } if(this.heat < 10 && this.cool != 0) diff --git a/com/hbm/tileentity/TileEntityMachinePuF6Tank.java b/com/hbm/tileentity/TileEntityMachinePuF6Tank.java index 18114dfcd..81641e156 100644 --- a/com/hbm/tileentity/TileEntityMachinePuF6Tank.java +++ b/com/hbm/tileentity/TileEntityMachinePuF6Tank.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -264,4 +266,11 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java b/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java index 0750c5b26..76c91960e 100644 --- a/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java +++ b/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java @@ -20,7 +20,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme public int power = 0; public int process = 0; public int soundCycle = 0; - public static final int maxPower = 500000000; + public static final int maxPower = 5000000; public static final int processSpeed = 60; Random rand = new Random(); @@ -158,7 +158,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setInteger("power", (short) (power)); + nbt.setInteger("power", power); nbt.setShort("process", (short) process); NBTTagList list = new NBTTagList(); @@ -202,10 +202,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme } public int getPowerScaled(int i) { - int p = (int) (power / 50000); - int m = (int) (maxPower / 50000); - int r = (p * i) / m; - return r; + return (power * i) / maxPower; } public int getProgressScaled(int i) { @@ -213,7 +210,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme } public boolean canProcess() { - if (power >= 499000000 && slots[0] != null && slots[0].getItem() == ModItems.ingot_uranium && slots[2] != null + if (power >= 4990000 && slots[0] != null && slots[0].getItem() == ModItems.ingot_uranium && slots[2] != null && slots[2].getItem() == ModItems.redcoil_capacitor && slots[2].getItemDamage() < slots[2].getMaxDamage() && (slots[1] == null || (slots[1] != null && slots[1].getItem() == ModItems.ingot_schrabidium diff --git a/com/hbm/tileentity/TileEntityMachineShredder.java b/com/hbm/tileentity/TileEntityMachineShredder.java index f22824d80..7b2817f56 100644 --- a/com/hbm/tileentity/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/TileEntityMachineShredder.java @@ -148,7 +148,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - this.power = nbt.getShort("powerTime"); + this.power = nbt.getInteger("powerTime"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -165,7 +165,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("powerTime", (short) power); + nbt.setInteger("powerTime", power); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) diff --git a/com/hbm/tileentity/TileEntityMachineUF6Tank.java b/com/hbm/tileentity/TileEntityMachineUF6Tank.java index d0b9dcfd6..3b7913045 100644 --- a/com/hbm/tileentity/TileEntityMachineUF6Tank.java +++ b/com/hbm/tileentity/TileEntityMachineUF6Tank.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -264,4 +266,11 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukeBoy.java b/com/hbm/tileentity/TileEntityNukeBoy.java index 2a0c368cb..fa886823b 100644 --- a/com/hbm/tileentity/TileEntityNukeBoy.java +++ b/com/hbm/tileentity/TileEntityNukeBoy.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -190,4 +192,11 @@ public class TileEntityNukeBoy extends TileEntity implements ISidedInventory { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukeCustom.java b/com/hbm/tileentity/TileEntityNukeCustom.java index 8fbac598c..0147e945e 100644 --- a/com/hbm/tileentity/TileEntityNukeCustom.java +++ b/com/hbm/tileentity/TileEntityNukeCustom.java @@ -3,6 +3,8 @@ package com.hbm.tileentity; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -458,4 +460,11 @@ public class TileEntityNukeCustom extends TileEntity implements ISidedInventory public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukeFleija.java b/com/hbm/tileentity/TileEntityNukeFleija.java index 176ba784c..9fb34c8a0 100644 --- a/com/hbm/tileentity/TileEntityNukeFleija.java +++ b/com/hbm/tileentity/TileEntityNukeFleija.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -199,5 +201,12 @@ public class TileEntityNukeFleija extends TileEntity implements ISidedInventory public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukeGadget.java b/com/hbm/tileentity/TileEntityNukeGadget.java index f75c5c1f6..ae5d8038c 100644 --- a/com/hbm/tileentity/TileEntityNukeGadget.java +++ b/com/hbm/tileentity/TileEntityNukeGadget.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -252,4 +254,11 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukeMan.java b/com/hbm/tileentity/TileEntityNukeMan.java index b02a187e1..4798a266e 100644 --- a/com/hbm/tileentity/TileEntityNukeMan.java +++ b/com/hbm/tileentity/TileEntityNukeMan.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -226,4 +228,11 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukeMike.java b/com/hbm/tileentity/TileEntityNukeMike.java index d8a1d2006..b5dbafac2 100644 --- a/com/hbm/tileentity/TileEntityNukeMike.java +++ b/com/hbm/tileentity/TileEntityNukeMike.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -211,5 +213,12 @@ public class TileEntityNukeMike extends TileEntity implements ISidedInventory { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukePrototype.java b/com/hbm/tileentity/TileEntityNukePrototype.java index 6ce3d9e48..e6d6098a4 100644 --- a/com/hbm/tileentity/TileEntityNukePrototype.java +++ b/com/hbm/tileentity/TileEntityNukePrototype.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -202,4 +204,11 @@ public class TileEntityNukePrototype extends TileEntity implements ISidedInvento public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityNukeTsar.java b/com/hbm/tileentity/TileEntityNukeTsar.java index a1f2e28fa..f9f8dd0b5 100644 --- a/com/hbm/tileentity/TileEntityNukeTsar.java +++ b/com/hbm/tileentity/TileEntityNukeTsar.java @@ -2,6 +2,8 @@ package com.hbm.tileentity; import com.hbm.items.ModItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; @@ -209,4 +211,11 @@ public class TileEntityNukeTsar extends TileEntity implements ISidedInventory { public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityReactorMultiblock.java b/com/hbm/tileentity/TileEntityReactorMultiblock.java index e1f416735..b43c52cac 100644 --- a/com/hbm/tileentity/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/TileEntityReactorMultiblock.java @@ -176,10 +176,10 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - water = nbt.getShort("water") * 1000; - cool = nbt.getShort("cool") * 1000; - power = nbt.getShort("power") * 100; - heat = nbt.getShort("heat") * 100; + water = nbt.getInteger("water"); + cool = nbt.getInteger("cool"); + power = nbt.getInteger("power"); + heat = nbt.getInteger("heat"); slots = new ItemStack[getSizeInventory()]; @@ -197,10 +197,10 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("water", (short) (water/1000)); - nbt.setShort("cool", (short) (cool/1000)); - nbt.setShort("power", (short) (power/100)); - nbt.setShort("heat", (short) (heat/100)); + nbt.setInteger("water", water); + nbt.setInteger("cool", cool); + nbt.setInteger("power", power); + nbt.setInteger("heat", heat); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -317,7 +317,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(10); + attemptPower(250); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -329,7 +329,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(10); + attemptPower(250); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -341,7 +341,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(10); + attemptPower(250); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -353,7 +353,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(2); - attemptPower(15); + attemptPower(375); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -365,7 +365,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(2); - attemptPower(15); + attemptPower(375); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -377,7 +377,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(2); - attemptPower(15); + attemptPower(375); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -389,7 +389,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(5); + attemptPower(125); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -401,7 +401,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(5); + attemptPower(125); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -413,7 +413,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(1); - attemptPower(5); + attemptPower(125); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -425,7 +425,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(10); - attemptPower(25); + attemptPower(62500); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -437,7 +437,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(10); - attemptPower(25); + attemptPower(62500); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -449,7 +449,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv int j = slots[i].getItemDamage(); this.slots[i].setItemDamage(j += 1); attemptHeat(10); - attemptPower(25); + attemptPower(62500); if(this.slots[i].getItemDamage() == this.slots[i].getMaxDamage()) { @@ -503,7 +503,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv if(this.heat - 10 >= 0 && this.cool - 10 >= 0) { this.heat -= 10; - this.cool -= 10; + this.cool -= 2; } if(this.heat < 10 && this.cool != 0) diff --git a/com/hbm/tileentity/TileEntityRedBarrel.java b/com/hbm/tileentity/TileEntityRedBarrel.java index 22d9cba8a..bfb0cccd1 100644 --- a/com/hbm/tileentity/TileEntityRedBarrel.java +++ b/com/hbm/tileentity/TileEntityRedBarrel.java @@ -1,7 +1,16 @@ package com.hbm.tileentity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; public class TileEntityRedBarrel extends TileEntity { + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/TileEntityWatzCore.java b/com/hbm/tileentity/TileEntityWatzCore.java index 4a57d2d60..6d0310b3a 100644 --- a/com/hbm/tileentity/TileEntityWatzCore.java +++ b/com/hbm/tileentity/TileEntityWatzCore.java @@ -167,8 +167,8 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I super.readFromNBT(nbt); NBTTagList list = nbt.getTagList("items", 10); - waste = nbt.getShort("deut") * 1000; - power = nbt.getShort("power") * 10000; + waste = nbt.getInteger("deut"); + power = nbt.getInteger("power"); slots = new ItemStack[getSizeInventory()]; @@ -186,8 +186,8 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setShort("deut", (short) (waste/1000)); - nbt.setShort("power", (short) (power/10000)); + nbt.setInteger("deut", waste); + nbt.setInteger("power", power); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) diff --git a/com/hbm/tileentity/TileEntityYellowBarrel.java b/com/hbm/tileentity/TileEntityYellowBarrel.java index 905ad2e3f..9d4d6b954 100644 --- a/com/hbm/tileentity/TileEntityYellowBarrel.java +++ b/com/hbm/tileentity/TileEntityYellowBarrel.java @@ -6,6 +6,8 @@ import java.util.List; import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.lib.Library; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; @@ -94,4 +96,11 @@ public class TileEntityYellowBarrel extends TileEntity { strength = (int)f; } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } }