From 55b23413d4f1d265bbafa0375ee45e1b78cedad6 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 4 Dec 2018 20:19:01 +0100 Subject: [PATCH] forcefield textures, localization, particles --- assets/hbm/lang/de_DE.lang | 4 ++ assets/hbm/lang/en_US.lang | 4 ++ .../textures/blocks/machine_forcefield.png | Bin 0 -> 255 bytes .../hbm/textures/models/forcefield_base.png | Bin 0 -> 4325 bytes assets/hbm/textures/models/forcefield_top.png | Bin 0 -> 3685 bytes com/hbm/blocks/machine/MachineForceField.java | 38 ++++++++++++++++++ com/hbm/main/ResourceManager.java | 4 ++ .../tileentity/RenderMachineForceField.java | 4 +- 8 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 assets/hbm/textures/blocks/machine_forcefield.png create mode 100644 assets/hbm/textures/models/forcefield_base.png create mode 100644 assets/hbm/textures/models/forcefield_top.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index b9eb2e2c6..0bee8623f 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -257,6 +257,8 @@ tile.turret_cwis.name=Phalanx Mk-15 CIWS tile.turret_cheapo.name=Billigsdorfer Gatling-Geschütz tile.machine_radar.name=Radar container.radar=Radar +tile.machine_forcefield.name=Kraftfeldgenerator +container.forceField=Kraftfeldgenerator tile.machine_satlinker.name=Satelliten-ID-Manager container.satLinker=SatLink-Gerät tile.machine_telelinker.name=Geschütz-Telemetrie-Manager @@ -848,6 +850,8 @@ item.upgrade_fortune_3.name=Lila Maschinenupgrade Mk.III item.upgrade_afterburn_1.name=Pinkes Maschinenupgrade Mk.I item.upgrade_afterburn_2.name=Pinkes Maschinenupgrade Mk.II item.upgrade_afterburn_3.name=Pinkes Maschinenupgrade Mk.III +item.upgrade_radius.name=Türkises Emitterupgrade +item.upgrade_health.name=Pinkes Emitterupgrade item.fusion_core.name=Fusionskern item.energy_core.name=Selbstgebauter Energiekern diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index d79432fa3..86391ba4e 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -270,6 +270,8 @@ tile.turret_cwis.name=Phalanx Mk-15 CIWS tile.turret_cheapo.name=Cheapo Gatling Sentry tile.machine_radar.name=Radar container.radar=Radar +tile.machine_forcefield.name=Forcefield Emitter +container.forceField=Forcefield Emitter tile.machine_satlinker.name=Satellite ID Manager container.satLinker=SatLink Device tile.machine_telelinker.name=Turret Telemetry Linker @@ -848,6 +850,8 @@ item.upgrade_fortune_3.name=Purple Machine Upgrade Mk.III item.upgrade_afterburn_1.name=Pink Machine Upgrade Mk.I item.upgrade_afterburn_2.name=Pink Machine Upgrade Mk.II item.upgrade_afterburn_3.name=Pink Machine Upgrade Mk.III +item.upgrade_radius.name=Teal Emitter Upgrade +item.upgrade_health.name=Pink Emitter Upgrade item.fusion_core.name=Fusion Core item.energy_core.name=Makeshift Energy Core diff --git a/assets/hbm/textures/blocks/machine_forcefield.png b/assets/hbm/textures/blocks/machine_forcefield.png new file mode 100644 index 0000000000000000000000000000000000000000..3173128240223a7bd9da5794082863d795aa6621 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfkofLOi)eR#3{U3o;9JOaf0@Q z+~eFbGBW>?lP9x)XyHp|n*2XqTN}-yd+?<^GjsEQ`?@~~An@S9gM=Lg51GQY`rKgA z)zLAS)9cH#oY7!I?CkEuxmN6Usy}#t{Ch5c_`Ci84^j>00?m0!hZw{Ua7ZvSGw+E1 v|L143()Z`*<=dpq^A@}~_=+h literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/forcefield_base.png b/assets/hbm/textures/models/forcefield_base.png new file mode 100644 index 0000000000000000000000000000000000000000..a023faa6f9106da08cfd9d0cb9ba42da48d09fbc GIT binary patch literal 4325 zcmeHK`8U)J7ymMd8T&BVmq8+pnaP%z>`TVX5TPXdnw>C_;VHZ9Ygu|kb{e82O|}dX zgGZKR7iBBEq1W?gyyt!IIiLGE_jAtu<#X@-;l>kih8$oaFaQ7?#zuPPr%d`6tf14p zJ(G5DN(_PKhB`p)fXK>e!Q`fGsto`yQy_E)W&i*I1gwSrsV*oeC?q5#EG&#bAQTl9 zkw_#8g+imz7!2m>)vH=sT1G}j#>U2YJf1)x)DzTSnq48AYcyQfY_!0fw*No=@4$br z0~g~a)K2dN2r|cA|MR~c!1cW|GN+Sd^E0vu1ON!{zhIz!eLz1I1%vdhgRc9!28B2T zxBz|*9zH<`AD18rB?J#3MX24{%^yVQTh5D_cDV7oLg{;vqhd9Q z&SB}u0k-hXdF->i#EXg-FH#FfxWps(L-#x8BkAIlj*o64DJk@Q`T-RGYfQFaS-06E zCuK;C<77{Z7f9ar_sh#Yd_iG-e!qOB4j>fLoZE+tN!&)ys8`fK*4zh_e3gUf0=iPA z>raQ71@;)fGZ;O1)G@?1VYm=c#$^`3MS_JN74j6qHO~vEi{`E~Nn90h4_h>9Hp=9y z(pGUSo8l;b3R}wp$#jcJtFDvxWq_E;q9pAQvDtZv^U(GnP2OL(flQ~S3oPhiOPBnQ zQd%(ys}-$-bo|cpoE-JN67vljjhRjr?srqj=QGKcgGQXF1Ny;MA6VuE zt@b?ZGn_BywyLttN$DfD&l7c!+BfGgx=gctHB83QhEueTQHU4W}F@@Zl?0@}H z9*?|4Er>?RzI?P=+&yjc2P|F z4di>86YFD(T+W@GS$=+djAKmc>{5^d*gDq7vG~ms(3QsE3a>uDR*e^!+X-%**~;}_ zHbaz;AZ^b*Ez7JHuDwF-AnR3hMA~~~Iwz(lOXTe~>posB`5YsCjk^ud;VG84BKeFu@>bAeLChVJh z6m~OZ)xSv&KayoYQ^0laAZxgl?on;s6hUdp6t@6*v0Ls_`#(8N$u*dwALcfL!=59P zlD~-4Z9O$3CV~T1ajp%e%$>IJ#U6Zs=ckvu6F9>>7R$$h$qP?=NBZf#2T~?#TkO&u zPCzb9!}8Kd8M^5}wI;PPY4*vdYxv<|tBfw|I`o$L!P(5YZ_0fN6W;9fxcN}Eleox@ ztDIZE=Yx`Nz3wplsM{>awF%`K&pea=Hh2m%BZS{l6Y5@MCU8(thZLrdWa@W;tN#2c zoKO;INZ+K`{_2Uk*lg4%AlGlkM=kj9GN6=FwlVbkA!3NDAbyebHUlK4;{+-aK;HQX z=PI0cC{`DXKqz-As?zel?bEiU3K2Fyh~eJGw|A7e*kI!3SBo)E*_S22GPa{weln zSI^y7D~D0b;4$&fOKXD&sKUqzlq@<5_SIf!kw)4t?~(7 zIfA-i!8qlSLaKeAM;T@`t~bevlOa)}E9UXW=18HHBhAs3<^%IfBB-pm;nKO}R?EfEnCrBcH~f$2!^B$WcV=@{=w}KN@t-r6KXtn5cUq@!B4>55 ziL!AAXj1;`A(JXrPjN4S==YLL-5W?x)0j_i;n+SQiMf!Z1PimBG}!QjIxxxsW5h*v z6b77-S+lMnAPAdRoUJktZl&7qNd-blElH{63$|27w>Hrmf>fP*QUIrcy5^JX882~q z`Yq{r_TX&E^t8)*Lbb-S1uO7v=bu@owxvu;rsB1hI@j#99ar;tvbJBpuVpZhaMiWs z7l^ZDgFE5s9?odmEHhFkOxO(Atr%Dp4Z0nTOxV(YoY}~^=w=7caB(~lN;L8>7slCsB_*Z2f;Bmox&_EcLAe0qP zL(PDGmnP#r0w6Pdmslw92$^q>>e4v(=03pZk$`h!+7OXGTClXUvA+Ejt>(vR( zQ7Si3flK`45CFAodxTdFde&>ZgSA`%A1sL+6^DjFvIs&d^x5!;9qn_XXVJt2y`MlU zF*U%FfyAir-BXq+zvY-EwnyI}!N0@&B|e(jr4n>aMByVkumCK3WB1)S@_4=#!D116 z@T`%>0Xz%IxK7-owU26A;~EPml-iy%SbnDD-|0=|j`*!FUu|N#L9d*_f&l)E&{fOy zZbd|ONCRowV|Un{{m5^s>#Ogx$$EK3jS#W~QG2P9EF7J`EobkpjXE1MvMmuU58r#gHhX8&<<*}h&0XLi<@1|M*K#JLG9%C4%Q)cL-5EQYGI-gT zw+y{!3V#8 znGFv&N?Foyh-%o~wrThMdPB9D%!dcrv`(U*xcn^>9&cZNqpP}F0hv0Wga`A)ipr%j z5W|Q(#V=Eo*`AaLSX~h6*|HrwU((KP_2i~fcW-^w;pb5Y|Hzj*NUDm0CH?(2_1Wb- zr+5*5x%5Z8=F-)7SBU$eM~6FAC+}zHe@sROX+92}b8E@Le}#-4s$N~{Z?1bQxgWB; z-!^7Xd@xNEr|hll?;XAW)&XAclEZJtztz~$ELeRko&*h{9p46^lgTr%tOGt#I5x02 z`iE)^!GY-@VR8~dGR>m4LKq@eDwOr?JSNdHW6bX`k|A>^Xp)(_g_XgLv^i95Bc)T z_GQzn3@@Ej3HYxW4|8G2(pHc~A4;l1XgtF-9Hzwm5B1#%f5>r?4}Y6yss2=UpH%6LL)-!OBTcIcs0h8fiU{UiNNQ^(VHn7_@ebJyq5WM$|nPl~MKGxv8 zSC07^jBsr6Yx?ssTJ$3WN1^;GJhaXQ}~|js}E|pducxdAjXu3 ru{MVe8zpDZx_L?8c1Jt%Xa6u75Ix*@uTAa$`%D_^FAQkM%28u4rp(>*(m% z=xCu(C^Q&9~+x+7_?=e!$0XO0rUFs$R-PT28z4$_org~FRO$^ zMeW5Mj~?+#2kv@frls}x*8BbK_4)DX*ndJ-dG-~-KbYMOq5Fo6(1~y+bMyD8LS}zz zs=BX6H>7E?xfq`K{dubqTs>&{-rQNS#?PSe(E4;xxg>p8Zur*pr_4)e)CokcNq#c4 ziNDOTOFloOsL@8#ms9nESd`-TjL?;v4_ifpgLFo-X3Ez>{iJo)y8ROx8B#*-S*%KJ z?0X(jjKRl~;+t#*Ti8n%^wn~AI!6==WQ@41f4ekSV30$Uh4EtTn|&uu?Zil2Md&X5V+;|muhgP`DIdZ>AdqJ6}dhWYE@ar5s?{}H0h?5OE z_+^?DINjBpWZT}oX}ictSmpbf)kAV)N1Ax68T7+}ycV#xdk@baft*Bah#yzIi$Ve2QBWZMsKodF>(*~17EQgbdN%2gJDoA z@2g9!bB-V#d)@)Xx%kMc({9R-{!`&7NvpNCshvl)$q2nc9OmWvjXKO+U$_0N*Rts0 zw(c)+@i*z#Z609b+4~2H*Vr(fJ1@C$I6iY|YF#|!gHld@u2h?jVTQeHd?pl@h!(z z$l6_u^m87T6*}k8H^dYocYRAXIM7iP2FqGTQizh8sGT=h9v+T*vP;gzBGOw^4Tb>t zsDBb_?K}aH?X>VMy`nocKQ`lZZltWSuO73JKRi^t@i8&zu>Z+;f@Z~;KV;lvIeg66 zGZ&p02ydnPX6iR3kRI=-7;CDDZI!JJtL%O^h3*g+M=zj{l{H;^~OwJ`|>iD8{@?;5+sM#6NFltJ zVMAxhzUVW4oxrQ<_k$+R>+r24hDEtDC-tzTpA9u|l|{Qe>a-^OXW9WLGs#QV<%XfG z6=P%O0!w-pwN2|hf0dw>HZqBq^CfI0oIkV`S-Zft;v`S%;25rO6r}Q0!9YPT@PIZ;h9tQ35$mPF7^x24!L`c{!ZlrvucF=T= zX;L;Q1gq80XAYHaixnFF&KvR9qPRKo)GnT)?zMM;Os)A1aCTU`Z|BW$nF4^ngtHr4 zq0P%jWl?#-$xFZouNT*__OZHF z5(KF~sVuSlkMLb$Qps{g7VU>LrkJ&N?WO%}$mwMoQ)Gf~f-g`5oKVzobU=$g=JeHH znihkViSJfS{gOo2aul|Asbl=zK6|>JoR4IdzuMft6I^V6cIkAHt3N%vG*)|1ol%}b z_7N}b$jLYw^)O75h<%9qybV2)ZJdR@QKq#%8wul=3hWJ^lCn^?karz7U=5K^`=~3G{VJb_ z=i%HNC4JJvm*Qcy^pNy&^G=&}PvpS0p)@I|g~{@_wdUCi3CqF>anXLAYK;up6G*ol zL^CnZD|(eF7>gRq$bO$z&)Tj)auP|6vb>XYqNAvYyxTBMS) zzk~)72t9k5S#iZY5AVU#$TL$H!}LWu+*nPCvD*-J$h0vW(1IQtGh=p(LFip z15{F84=1$Iv3L{Hk#@G>V>Z7+eCbfddzl`B-C~M6{5s1PT-7W+eYJPt0T@40{jOdn zVL&SzB+;LSfG=-Ka#d}pJW`d%E@hqzaAWopst_h@YO!+dy^WERxL)%cym?)=r-J;E zdtFl3-@gzjAw3RT>6M=6j~dM;*SQbkuB-hjaZQ87DhkAF1o~5y3dL&4*g}_3Lu$8t zy9J*NH91l$yrenTeTk>hu;Waj2fpLJ%on<{a_%ScRsi!$_a}lKCtOWxNxqmft;72> z@1v2$C*rnd+&s8c5%ve6m+uhkGZ_m$NtZtWCAvm%gx5y)s%hr=ljao3vt!;%*Ie}5 zh73mQu+qg`Ukf7FatMN9e1YUcAq`?meAXG?*|R# znriCWKa@c?KFjczR!Sb?VjlsP 0) { + for(int i = 0; i < 4; i++) { + float f = x; + float f1 = y + 2F; + float f2 = z; + float f3 = 0.52F; + float f4 = rand.nextFloat(); + float f5 = rand.nextFloat(); + + if(te.color == 0xFF0000) + world.spawnParticle("lava", f + f4, f1, f2 + f5, 0.0D, 0.0D, 0.0D); + else + world.spawnParticle("reddust", f + f4, f1, f2 + f5, 0.0D, 0.0D, 0.0D); + } + } else if(te.cooldown > 0) { + for(int i = 0; i < 4; i++) { + float f = x; + float f1 = y + 2F; + float f2 = z; + float f3 = 0.52F; + float f4 = rand.nextFloat(); + float f5 = rand.nextFloat(); + + world.spawnParticle("smoke", f + f4, f1, f2 + f5, 0.0D, 0.0D, 0.0D); + } + } + } } diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index 1af71c52a..4b9fecbb9 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -203,6 +203,10 @@ public class ResourceManager { public static final ResourceLocation radar_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radar_base.png"); public static final ResourceLocation radar_head_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radar_head.png"); + //Forcefield + public static final ResourceLocation forcefield_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/forcefield_base.png"); + public static final ResourceLocation forcefield_top_tex = new ResourceLocation(RefStrings.MODID, "textures/models/forcefield_top.png"); + //Bombs public static final ResourceLocation bomb_solinium_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ufp.png"); public static final ResourceLocation n2_tex = new ResourceLocation(RefStrings.MODID, "textures/models/n2.png"); diff --git a/com/hbm/render/tileentity/RenderMachineForceField.java b/com/hbm/render/tileentity/RenderMachineForceField.java index d5aedfd1f..e48ea7abc 100644 --- a/com/hbm/render/tileentity/RenderMachineForceField.java +++ b/com/hbm/render/tileentity/RenderMachineForceField.java @@ -21,7 +21,7 @@ public class RenderMachineForceField extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); - bindTexture(ResourceManager.radar_body_tex); + bindTexture(ResourceManager.forcefield_base_tex); ResourceManager.radar_body.renderAll(); @@ -33,7 +33,7 @@ public class RenderMachineForceField extends TileEntitySpecialRenderer { int segments = (int)(16 + ff.radius * 0.125); - bindTexture(ResourceManager.universal); + bindTexture(ResourceManager.forcefield_top_tex); if(ff.isOn && ff.health > 0 && ff.power > 0 && ff.cooldown == 0) { generateSphere(segments, segments * 2, ff.radius, ff.color);