From 07828dfeb2378a95ac5e84007fb0996c6c72bdb0 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sat, 3 Sep 2016 09:55:51 +0200 Subject: [PATCH] Item renderers, models, dusts and cmb factory --- assets/hbm/lang/de_DE.lang | 11 + assets/hbm/lang/en_US.lang | 11 + .../hbm/textures/blocks/machine_cmb_side.png | Bin 0 -> 446 bytes .../hbm/textures/blocks/machine_cmb_top.png | Bin 0 -> 474 bytes assets/hbm/textures/items/ingot_astatine.png | Bin 0 -> 300 bytes assets/hbm/textures/items/ingot_iodine.png | Bin 0 -> 301 bytes assets/hbm/textures/items/ingot_neodymium.png | Bin 0 -> 298 bytes assets/hbm/textures/items/ingot_thorium.png | Bin 0 -> 303 bytes assets/hbm/textures/items/powder_astatine.png | Bin 0 -> 269 bytes assets/hbm/textures/items/powder_iodine.png | Bin 0 -> 268 bytes .../hbm/textures/items/powder_neodymium.png | Bin 0 -> 267 bytes assets/hbm/textures/items/powder_thorium.png | Bin 0 -> 271 bytes assets/hbm/textures/models/ModelMP.png | Bin 0 -> 973 bytes assets/hbm/textures/models/ModelOSIPR.png | Bin 764 -> 1255 bytes com/hbm/blocks/MachineCMBFactory.java | 19 +- com/hbm/blocks/ModBlocks.java | 3 +- com/hbm/entity/EntityCombineBall.java | 2 - com/hbm/entity/EntityRocket.java | 2 - com/hbm/gui/ContainerMachineCMBFactory.java | 140 ++++++++++ com/hbm/gui/GUIMachineCMBFactory.java | 47 ++++ com/hbm/handler/ShredderRecipeHandler.java | 2 +- com/hbm/items/{GunPM.java => GunMP.java} | 16 +- com/hbm/items/GunRpg.java | 2 +- com/hbm/items/ItemCustomLore.java | 4 +- com/hbm/items/ItemRamManipulator.java | 4 - com/hbm/items/ModItems.java | 35 ++- com/hbm/main/ClientProxy.java | 2 + com/hbm/main/GUIHandler.java | 19 ++ com/hbm/render/ItemRenderMP.java | 72 +++++ com/hbm/render/ItemRenderOSIPR.java | 2 +- com/hbm/render/ModelMP.java | 247 ++++++++++++++++++ .../TileEntityMachineCMBFactory.java | 2 +- 32 files changed, 594 insertions(+), 48 deletions(-) create mode 100644 assets/hbm/textures/blocks/machine_cmb_side.png create mode 100644 assets/hbm/textures/blocks/machine_cmb_top.png create mode 100644 assets/hbm/textures/items/ingot_astatine.png create mode 100644 assets/hbm/textures/items/ingot_iodine.png create mode 100644 assets/hbm/textures/items/ingot_neodymium.png create mode 100644 assets/hbm/textures/items/ingot_thorium.png create mode 100644 assets/hbm/textures/items/powder_astatine.png create mode 100644 assets/hbm/textures/items/powder_iodine.png create mode 100644 assets/hbm/textures/items/powder_neodymium.png create mode 100644 assets/hbm/textures/items/powder_thorium.png create mode 100644 assets/hbm/textures/models/ModelMP.png create mode 100644 com/hbm/gui/ContainerMachineCMBFactory.java create mode 100644 com/hbm/gui/GUIMachineCMBFactory.java rename com/hbm/items/{GunPM.java => GunMP.java} (82%) create mode 100644 com/hbm/render/ItemRenderMP.java create mode 100644 com/hbm/render/ModelMP.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 8f7dc087c..1ff2586ef 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -120,6 +120,7 @@ tile.machine_diesel.name=Dieselgenerator container.machineDiesel=Dieselgenerator tile.machine_shredder.name=Shredder container.machineShredder=Shredder +tile.machine_combine_factory.name=CMB-Stahl Hochofen tile.factory_titanium_hull.name=Einfache Fabrikshülle tile.factory_titanium_furnace.name=Einfache Fabrikzugriffsluke @@ -205,6 +206,9 @@ item.ingot_magnetized_tungsten.name=Magnetisierter Wolframbarren item.ingot_combine_steel.name=CMB-Stahlbarren item.plate_combine_steel.name=CMB-Stahlplatte item.wire_magnetized_tungsten.name=4000K Hochtemperaturensupraleiter +item.coil_magnetized_tungsten.name=4000K Hochtemperaturensupraleitermagnetspule +item.plate_mixed.name=Gemischte Platte +item.plate_paa.name=PaA-Legierungsplatte item.nugget_u235.name=U235-Nugget item.nugget_u238.name=U238-Nugget @@ -300,6 +304,10 @@ item.powder_lithium.name=Lithiumstaub item.powder_advanced_alloy.name=Fortgeschrittener Legierungsstaub item.powder_quartz.name=Quarzstaub item.powder_power.name=Energiepulver +item.powder_iodine.name=Iodpulver +item.powder_thorium.name=Thoriumpulver +item.powder_neodymium.name=Neodympulver +item.powder_astatine.name=Astatpulver item.battery_generic.name=Batterie item.battery_advanced.name=Fortgeschrittene Batterie @@ -536,6 +544,7 @@ item.gun_revolver_cursed.name=Verfluchte Pistole item.gun_fatman.name=M42 Nukleares Katapult "Fat Man" item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte +item.gun_mp.name=Des Pazifistens Machinegewehr item.gun_zomg.name=Singularitätsbetriebener Paarvernichtungsstrahl "ZOMG Kanone" item.gun_super_shotgun.name=Super Shotgun item.gun_moist_nugget.name=Moisn-Nagant @@ -550,6 +559,7 @@ item.gun_fatman_ammo.name=Miniatombombe item.gun_xvl1456_ammo.name=Kiste mit erschöpftem Uran-235 item.gun_osipr_ammo.name=Dunker Energiepuls-Plug item.gun_osipr_ammo2.name=Combine Ball +item.gun_mp_ammo.name=Kleine treibmittellose MG-Patrone item.clip_revolver_iron.name=Box voll Eisenkugeln item.clip_revolver.name=.357 Magnum Patronen @@ -741,6 +751,7 @@ tile.machine_converter_rf_he.name=RF zu HE Konverter item.schrabidium_hammer.name=Schrabidiumhammer item.euphemium_stopper.name=Stopper item.matchstick.name=Streichholz +item.remote.name=Kaputte Fernbedienung item.redcoil_capacitor.name=Rotspulenkondensator item.detonator.name=Fernzünder diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 9d7b69d2d..9af113eda 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -120,6 +120,7 @@ tile.machine_diesel.name=Diesel Generator container.machineDiesel=Diesel Generator tile.machine_shredder.name=Shredder container.machineShredder=Shredder +tile.machine_combine_factory.name=CMB Steel Furnace tile.factory_titanium_hull.name=Basic Factory Casing tile.factory_titanium_furnace.name=Basic Factory Access Hatch @@ -205,6 +206,9 @@ item.ingot_magnetized_tungsten.name=Magnetized Tungsten Ingot item.ingot_combine_steel.name=CMB Steel Ingot item.plate_combine_steel.name=CMB Steel Plate item.wire_magnetized_tungsten.name=4000K High Temperature Super Conductor +item.coil_magnetized_tungsten.name=4000K High Temperature Super Conducting Coil +item.plate_mixed.name=Mixed Plate +item.plate_paa.name=PaA Alloy Plate item.nugget_u235.name=U235 Nugget item.nugget_u238.name=U238 Nugget @@ -300,6 +304,10 @@ item.powder_lithium.name=Lithium Powder item.powder_advanced_alloy.name=Advanced Alloy Powder item.powder_quartz.name=Quartz Powder item.powder_power.name=Energy Powder +item.powder_iodine.name=Iodine Powder +item.powder_thorium.name=Thorium Powder +item.powder_neodymium.name=Neodymium Powder +item.powder_astatine.name=Astatine Powder item.battery_generic.name=Battery item.battery_advanced.name=Advanced Battery @@ -536,6 +544,7 @@ item.gun_revolver_cursed.name=Cursed Revolver item.gun_fatman.name=M42 Nuclear Catapult "Fat Man" item.gun_xvl1456.name=XVL1456 Tau Cannon Prototype item.gun_osipr.name=Overwatch Standard Issue Pulse Rifle +item.gun_mp.name=Pacifist's Machine Gun item.gun_zomg.name=Singularity Powered Annihilation Ray "ZOMG Cannon" item.gun_super_shotgun.name=Super Shotgun item.gun_moist_nugget.name=Moisn-Nagant @@ -550,6 +559,7 @@ item.gun_fatman_ammo.name=Mini Nuke item.gun_xvl1456_ammo.name=Depleted Uranium-235 Box item.gun_osipr_ammo.name=Dark Energy Pulse Plug item.gun_osipr_ammo2.name=Combine Ball +item.gun_mp_ammo.name=Small Propellantless Machine Gun Round item.clip_revolver_iron.name=Box of Iron Rounds item.clip_revolver.name=Box of .357 Rounds @@ -741,6 +751,7 @@ tile.machine_converter_rf_he.name=RF to HE Converter item.schrabidium_hammer.name=Schrabidium Hammer item.euphemium_stopper.name=Stopper item.matchstick.name=Matchstick +item.remote.name=Broken Remote item.redcoil_capacitor.name=Redcoil Capacitor item.detonator.name=Detonator diff --git a/assets/hbm/textures/blocks/machine_cmb_side.png b/assets/hbm/textures/blocks/machine_cmb_side.png new file mode 100644 index 0000000000000000000000000000000000000000..5c18f09ad65279f74c272ad5cc901a3ecc54d9a6 GIT binary patch literal 446 zcmV;v0YUzWP)N2bZe?^J zG%heMF)*zP3cvsW0Xs=VK~y+Tjgs3+LO~RU2i$np3lA4QfGCRSji{)2fFS8y7acBo zfG85Fn@FkX@Y;RDAIoq@1s}t|W@gR$*V@}cN&dFy*}rxP&mic zkD^?@0+M}&(dZQ?>~fY$9h%_Sc2t3e*Ou57{+ST#1bWAhQLEiHn|DUFdLt^8YgV63 zh4J`J!|8UHhMwHOH%(g#$o^ArPKg%f#56Xf84-89C9)@z_v!S5W*7(>r2G9RkX8jh zx?=Id0?vNd$>f2zr1?;n>WEhBUK&dbM;c3CQ=$SM_;z?BmL+Mu`d#~<&nEC6@aCvU o9uNrrXMAFvA+iGhzX*caC(A6IrT^t~Q2+n{07*qoM6N<$g49R5)c^nh literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/machine_cmb_top.png b/assets/hbm/textures/blocks/machine_cmb_top.png new file mode 100644 index 0000000000000000000000000000000000000000..4fc11aecca702b178253b0a5efe07e8e272a2e07 GIT binary patch literal 474 zcmV<00VV#4P)N2bZe?^J zG%heMF)*zP3cvsW0ar;xK~y+TjgresLQxck7bxB}@B%p~sE|xCN220g2(s)x=rZU5 zq9~$KRCMokYEV#(n)D#igY<1yZ1V^bd@TNR*k`TJwUuyq-Q}8hyE}gWawM`5jc&$b zTU3SY^>%%}C51DROzswoXHYI*RI69D+BFplh0{Sop*5k0Rh;6LF{OEXmTOSgM9St8d!f9ZLz6k_YH1utW zkk6mM`;?Kv>M7Y%Vnv)WN=#_A?%VALCJ>ZL<ZWE>7Evbp#msQfe*$Ecf^|tgMm@Ezx;9rC%N-UAu=jQJG0Ly!|O#=Hs QfdBvi07*qoM6N<$g3fcr^Z)<= literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ingot_astatine.png b/assets/hbm/textures/items/ingot_astatine.png new file mode 100644 index 0000000000000000000000000000000000000000..7ec56a9b8f1b40eff894fe0d01f1cd2e29fc21ed GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ispE_IEGmGU!Aa26<_m7 zDCvsVo&tx9#eY`(KQrS}>wBVd;k&3J)4$9g+X~lgp7eyrC)jxjQ_ulv$D|kPNk&Z# qQyhZ2jtlbHOnRjFDe6~+SFV(3$;2|0#LT=By}Z;C1rt33 zJwt=FTwDi$ispK{IEGmGU!8E4v&BG!Ene5M`ioMaqj(3?i`PoE_9{2w_FQ+7DxBdGvp*4>scJw^Cv@y3Xewv42(4?Y^lU#OG@H};X3SO-VE$#Y@9oXf(33*U>-X_bVG4WDJ7LNP;hDVx r8-zrb)<|7EpsOiAas5(x|0gWnxqPz&D?%0m9m?S8>gTe~DWM4f0ex#E literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ingot_neodymium.png b/assets/hbm/textures/items/ingot_neodymium.png new file mode 100644 index 0000000000000000000000000000000000000000..1552d8968a544a46916e6984ccb670fb3d6c941a GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ie`DbIEGmGU!CC1)u15a8ryNfVivoul8kwl+Ln%M5AtShlir>f`|@P4 zORh+)MZg2g+9UO5Jck;eZ_8C-Ob+umo#b^*?wyUVg7itxl_xrtcHH=G>7g39QqSp> zbrXY%OP0{Nf<+8`!An#cQ(xLDI`|*no@pzl>c^3D`^ibx9S!D9E)-NAhb})GT5?5EeXLJkbN(N6?KbLh*2~7Zv&}BgY literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ingot_thorium.png b/assets/hbm/textures/items/ingot_thorium.png new file mode 100644 index 0000000000000000000000000000000000000000..7fd2aec9d47ca955456d71b55858678e481ea3aa GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ispN|IEGmGCrem4%x-*W&*8lD2;&Sjfp`3u*pr*u7Gzg#+w}JTzhxB` z$Fexgd|yaSH0)ATa9i7~6C-Tb`_G9-BZ4i3;{?M5wF!zXCXH7Vl0}#ux)R$STxK~m z(TFF3$DAQe`b2)_tegr{#pE4~Gp*(%^qgf#;Z+cCG&yKsA>hbxQ(yw)iCGR3tJO*v rj9Jnc0%u)dJRva2l-D33fq~)Wq*ujUs_P?xPG#_P^>bP0l+XkKA@^Ul literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_astatine.png b/assets/hbm/textures/items/powder_astatine.png new file mode 100644 index 0000000000000000000000000000000000000000..5c5d0e95451d2160c0e213ae6ba56c390ecd3df9 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(L5k7Z*@9LzkzE zV~B z!c9umUkqFhE4J;ue`M!Y`5?b#j4zt59Ab&sJ?HfYo{Jl>bihPE} zuEGu8yie6s8`d!?I3=`MhMt$IcX;T?xu|m9yuICx4<8&idd6Uv%`(a7vZE=`RScf4 KelF{r5}E)iMqoey literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_iodine.png b/assets/hbm/textures/items/powder_iodine.png new file mode 100644 index 0000000000000000000000000000000000000000..12f7eff502f81be751be7968da39372b495f883e GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DkxL735kHCP2GC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVTQKzSi zV~B!lvI6;>1s;*b z3=DkxL735kHCP2GC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVTQHQ6C zV~B^gYOXqw9sTzscg#Os9bRyI zU1x&V#wtlCh3Bi=l5I{^zWXd-9m!_E`m&XkBXRXwImMV2X3MO!)3Xe67QN((()Q?9 zZ185<*2#JzmO+R`d(FyIv&?5tH0^7PHUDwy;ItY`FMJ)M*I|@n;1M@{an^L HB{Ts5`$bgn literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/powder_thorium.png b/assets/hbm/textures/items/powder_thorium.png new file mode 100644 index 0000000000000000000000000000000000000000..78c56cfeb7ede15cacae8cea357efa2028a56031 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DkxL735kHCP2GC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVTQIDsK zV~B=T^CuWEYa1}jicY=|aKVT@cmr=Xi|v6+qKXsRn7qTL^xu!%IA42) zYfbKHmjc<}hmQ&{-8PbaxO45}3nA|n>o)N`5LFQsTfm*ZI+{a#Rqx7kr)El}%+A== zbdT$j68D2i4f&54i-a0j4svB{o%`2#gqeR*X`OBLG^V2m`%||um-Mc(V+}LE2y_>N Mr>mdKI;Vst0Lz_PdjJ3c literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/ModelMP.png b/assets/hbm/textures/models/ModelMP.png new file mode 100644 index 0000000000000000000000000000000000000000..48943c912c17a7c48af852470bfd3cef2487d3bc GIT binary patch literal 973 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@5Lt8c`CQpH@{ zr;B4qMcmu#-F;8Acvvp{{6GJmEc;`{6_YO9cy{sQL@%xukw~NMOMf5!7pvm@T|;u0 z`^gKoUJ(qx43ve{tnFA%UT;30xan7Ok6io7SNuj*GHR>sPrN9c@#agSno7%tt{>|^ zKYhgi;AzxZ_w*q27y2KrwAE@@7f)n6)Uc`%Kp-dmevLQTY{RD zOCD&eSy=Mj@OoGLLS^|sB}Yct7k!*uFC4_b~ z^yfz{N~~mG9OGoWaPZxf*ahX=J8pfP{Hk#m`vc`LNm0|-f znx~k)khNXh#8rNd>(u;LkAHdY-1gW~bloTCYMwjKJNNV#dcD|}9`fVIp9^x#-zyKT zet&Tn|MhE278^_M`tB+B(f%<1Tf>6+>Ywb6X)gS2T+D5|p;%zcIooixHG<3Ac5MChe8J{J7$q*FO7#UJF~1 zpB8H`YzCPdpqB7rO_-PQzl}eBd!DS2F|bp$eO2@#`&j=``2+1grhHj(df|FW`(^)_ zCp_P;;tv&=x#xgu)W>gi8U2mFZ67h`9_;E#Z}wK6YoDH<@^wbc8po8k z)0Z6i|EuNL*Ewvjif<`Tm1v3Z}1bNmrkoSp3JPfv$(Ws z`H9pAPq==vy|`~`eD=a&jdThh{Ief;=+G2dZ1 zmv0>ax0GSs=m7JSJdH+!5>PT9#^enf3@*l+*XKko4FTu%zNEfwPttt+g0mLWvp4j taapxM?)AG+uoZraM<<3qy?*|DeRrXi@*4liJAqk`!PC{xWt~$(698dY<9`4E literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/ModelOSIPR.png b/assets/hbm/textures/models/ModelOSIPR.png index ddc1ef3a37f3b70e9a2c68bdf5b8b7c23fa93281..f8f8b637b6fd6d8516b3b09348d41e361ee2caf1 100644 GIT binary patch delta 1212 zcmV;t1Vj7$1?LHnBnkm@Qb$4nuFf3kks%v@!vFvd!vV){sAK>D1XD>wK~#8N?N~8x z+%OQluNW|5z>WboZd~~f=~B8&8z4nqkSZ@olSkwic}ZSz!4NaT+#V&7ccdhrJ-}j@ zyUQhKN$H^5IqvVj?r(3u?4{j?zPWkXUtfP7wA;`uQw7y_+t>8C1MB64;e@IAS;R$u zqn%sOg=MPXYq*X+rVq%i4`DcQfxrhXpO23)w+T#cbpx~!h-}x<$7u&7q-Br!q2t_C z3~;C0&~7X4GL_5nqwtz>E_C#9T5$uIJ`YUr6Zax+EABFt%ko7)e!P8AL*k9gX$Z@f z0fn_`x1rru++`}4<%^(tAWK&kk!a3;hGu#lo}Zuhkf*1oq0+Z}Ay zZRkiQ+CCoBTy7pB&`Y>X7Ea0uL^9F#@tEck<+!`M+e0|aqV*%-&pI}(=b7PuBh=|FU{!VDs1d(?#P7=b@qesE#Fy(wWNeM%fu^w=ukQNP} z1%6v;u8vh2(DXW0Kx9SO$-;)ua~NuexB$jWHY2W^YXC%f47G*6`{VaN!`*>*$|Bc1 z2NA{wq-8TDA;xk!HSk&zj2T`IzPNO>$70YdQw{x^s3xTMugfI#h2>v=TJFR1hc7N^ zw@-OCMH)?%V9fCHh=kpSj)dKYW|?Aa?goGeh)TN+J?EEZxmk$xW^O=)ZUIC@Aq+Q# z*1=6WgrPxy4OW&z_-7PG+^^LfUc%cW4*rnBn&N&v^Z}7 zT}=U^IBmaG?vpTdc|c=-LC_oQJ_$qpphaC6IzY_vO`ft*)Y!xghz+1S3(s@nr!-(Q z@CMK|iHmIjhef!^29!2Ix#u>(Yq-?xr3q>mRc_ok!^Md6qcCkdz}s0u*I5{Ar2I_V z4z#gWn~Q`c@-uBa=y3x?){SRlqzatiQzEzi0zQ$~ENI_YZ@e%Y(2~6)@k4x`rRN z|2%esNcbkSu_)Sq7;Nb%EISL#m(Z2q{>2)A#iAaQT)qp-&cbWZmEitG8X#yvoj%=f z2XDRs@jB`%a(MZ8^9|4=0PVIv7SL{ARD+ywY=RSxP2lv`3lI@u+0bq?b$BeMa$X%o zqJ&&Y&O6@mny}mb2N+Aq;fyS6qyPW_07*qoM6N<$f&c&~03CEiSaeNqWMymsRApmm aZe=e{b!%mEFHLV`Wo%DVNl;Quxjr1@mqQ=` delta 719 zcmV;=0xOwhrCC~nd3Y{@13N=&QJ;~oN)$r|4uvXFvBa@f1OO-;7_>43_N$% z&d_@%IR$Hw;S9&88zVInbs_qYWIeEZD~4c=G91BbE4+kVs?dTz*%p5S>n879(i;|Q zVKo)Hxw>f2)eKl)aRjRsm$+(X&(#d@CyVh2tid=$Z?xzNte-f7)ruilBeV)OD^oY@ zGFlCr=`kHPgqaPSf8jA5HiVf4>m6|!*3{!Fy%z(|FKU*dLoh!$TjkV$!DU!ek6EzZ z%yMoUWWXgqSP4sf{{(_urzYS>JVC9pvrSIO=d!aicwD6E%wJM0lNMq$0g$6$|{ zaTeA?d<^!O8E0WV#M@zySkVi+D{cdOoLIpfGp51+`!TMdf6qDG0$dv73i_PGEx@HQ z&Z76e@G)>{jI+R=U6OkY`w%q?wk*q)V+Tf^h4o;T)4n<)In85?keU@TdW309Ad=HO z#t5ldA)`l_wge(M&0~y^niVp7glS74lG8lK2&tK+_ZWB^YoMYq}$?F-$7E-4P^K708u?MZ+@m!tOF} 0) { + int i = diFurnace.getPowerScaled(88); + drawTexturedModalRect(guiLeft + 8, guiTop + 106 - i, 176, 160 - i, 16, i); + } + } +} diff --git a/com/hbm/handler/ShredderRecipeHandler.java b/com/hbm/handler/ShredderRecipeHandler.java index b87c77c54..4ce5a4afd 100644 --- a/com/hbm/handler/ShredderRecipeHandler.java +++ b/com/hbm/handler/ShredderRecipeHandler.java @@ -142,7 +142,7 @@ public class ShredderRecipeHandler extends TemplateRecipeHandler { drawProgressBar(83 - (18 * 4) - 9 + 1, 6, 36, 86, 16, 18 * 3 - 2, 480, 7); - drawProgressBar(83 - 3, 5 + 19, 100, 118, 24, 16, 48, 0); + drawProgressBar(83 - 3, 5 + 18, 100, 118, 24, 16, 48, 0); } @Override diff --git a/com/hbm/items/GunPM.java b/com/hbm/items/GunMP.java similarity index 82% rename from com/hbm/items/GunPM.java rename to com/hbm/items/GunMP.java index 1c0069b64..e3361551d 100644 --- a/com/hbm/items/GunPM.java +++ b/com/hbm/items/GunMP.java @@ -15,11 +15,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ArrowNockEvent; -public class GunPM extends Item { +public class GunMP extends Item { Random rand = new Random(); - public GunPM() + public GunMP() { this.maxStackSize = 1; this.setMaxDamage(10000); @@ -50,7 +50,7 @@ public class GunPM extends Item { boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; - if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_osipr_ammo)) + if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_mp_ammo)) && count % 3 == 0) { EntityBullet entityarrow = new EntityBullet(world, player, 3.0F, 35, 45, false, false); entityarrow.setDamage(100 + rand.nextInt(50)); @@ -60,7 +60,7 @@ public class GunPM extends Item { if (flag) { entityarrow.canBePickedUp = 2; } else { - player.inventory.consumeInventoryItem(ModItems.gun_osipr_ammo); + player.inventory.consumeInventoryItem(ModItems.gun_mp_ammo); } if (!world.isRemote) { @@ -77,9 +77,13 @@ public class GunPM extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add("EVERYBODY HAS TO DIE!"); + list.add("Isn't that name a little contrary,"); + list.add("you can't be a pacifist AND"); + list.add("shoot people. Logic errors aside,"); + list.add("whose blood is that? The former"); + list.add("user's? The victim's? Both?"); list.add(""); - list.add("Ammo: x"); + list.add("Ammo: Smal Propellantless Machine Gun Round"); list.add("Damage: x - x"); } } diff --git a/com/hbm/items/GunRpg.java b/com/hbm/items/GunRpg.java index e0ba9f777..57553c4ac 100644 --- a/com/hbm/items/GunRpg.java +++ b/com/hbm/items/GunRpg.java @@ -151,6 +151,6 @@ public class GunRpg extends Item list.add("Kaboom!"); list.add(""); list.add("Ammo: Rockets"); - list.add("Projectiles explodes on impact."); + list.add("Projectiles explode on impact."); } } \ No newline at end of file diff --git a/com/hbm/items/ItemCustomLore.java b/com/hbm/items/ItemCustomLore.java index 7a80fe56f..719691016 100644 --- a/com/hbm/items/ItemCustomLore.java +++ b/com/hbm/items/ItemCustomLore.java @@ -351,7 +351,7 @@ public class ItemCustomLore extends Item { @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) + 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) { return EnumRarity.epic; } @@ -361,7 +361,7 @@ public class ItemCustomLore extends Item { return EnumRarity.rare; } - if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa || this == ModItems.gun_pm_ammo) + if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa || this == ModItems.gun_mp_ammo || this == ModItems.powder_power) { return EnumRarity.uncommon; } diff --git a/com/hbm/items/ItemRamManipulator.java b/com/hbm/items/ItemRamManipulator.java index 567c04274..a089dcb93 100644 --- a/com/hbm/items/ItemRamManipulator.java +++ b/com/hbm/items/ItemRamManipulator.java @@ -34,10 +34,6 @@ public class ItemRamManipulator extends Item { } if (!player.isSneaking()) { - - if (world.isRemote) { - player.addChatMessage(new ChatComponentText("Position set!")); - } Block block = world.getBlock(x, y, z); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 5c7e08282..6c63f0484 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -115,6 +115,11 @@ public class ModItems { public static Item dust; public static Item powder_power; + public static Item powder_thorium; + public static Item powder_iodine; + public static Item powder_neodymium; + public static Item powder_astatine; + public static Item powder_advanced_alloy; public static Item powder_coal; public static Item powder_combine_steel; @@ -404,8 +409,8 @@ public class ModItems { public static Item gun_osipr; public static Item gun_osipr_ammo; public static Item gun_osipr_ammo2; - public static Item gun_pm; - public static Item gun_pm_ammo; + public static Item gun_mp; + public static Item gun_mp_ammo; public static Item gun_zomg; public static Item gun_super_shotgun; public static Item gun_moist_nugget; @@ -707,7 +712,7 @@ public class ModItems { plate_combine_steel = new Item().setUnlocalizedName("plate_combine_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_combine_steel"); powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lead"); - powder_neptunium = new Item().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neptunium"); + powder_neptunium = new ItemCustomLore().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neptunium"); powder_schrabidium = new ItemCustomLore().setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_schrabidium"); powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_aluminium"); powder_beryllium = new Item().setUnlocalizedName("powder_beryllium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_beryllium"); @@ -729,7 +734,11 @@ public class ModItems { powder_red_copper = new Item().setUnlocalizedName("powder_red_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_red_copper"); powder_steel = new Item().setUnlocalizedName("powder_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_steel"); powder_lithium = new Item().setUnlocalizedName("powder_lithium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium"); - powder_power = new Item().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy"); + powder_power = new ItemCustomLore().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy"); + powder_iodine = new ItemCustomLore().setUnlocalizedName("powder_iodine").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_iodine"); + powder_thorium = new ItemCustomLore().setUnlocalizedName("powder_thorium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_thorium"); + powder_neodymium = new ItemCustomLore().setUnlocalizedName("powder_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neodymium"); + powder_astatine = new ItemCustomLore().setUnlocalizedName("powder_astatine").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_astatine"); coil_copper = new Item().setUnlocalizedName("coil_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper"); coil_copper_torus = new Item().setUnlocalizedName("coil_copper_torus").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper_torus"); @@ -998,10 +1007,10 @@ public class ModItems { gun_osipr_ammo = new Item().setUnlocalizedName("gun_osipr_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_osipr_ammo"); gun_osipr_ammo2 = new Item().setUnlocalizedName("gun_osipr_ammo2").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_osipr_ammo2"); gun_osipr = new GunOSIPR().setUnlocalizedName("gun_osipr").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_osipr"); - gun_pm_ammo = new ItemCustomLore().setUnlocalizedName("gun_pm_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_pm_ammo"); - gun_pm = new GunPM().setUnlocalizedName("gun_pm").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_pm"); + gun_mp_ammo = new ItemCustomLore().setUnlocalizedName("gun_mp_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_pm_ammo"); + gun_mp = new GunMP().setUnlocalizedName("gun_mp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_pm"); gun_zomg = new GunZOMG().setUnlocalizedName("gun_zomg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_zomg"); - gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun"); + gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun"); gun_moist_nugget = new ItemNugget(3, false).setUnlocalizedName("gun_moist_nugget").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_moist_nugget"); grenade_generic = new ItemGrenade().setUnlocalizedName("grenade_generic").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_generic"); @@ -1112,7 +1121,7 @@ public class ModItems { igniter = new ItemCustomLore().setUnlocalizedName("igniter").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":trigger"); detonator = new ItemDetonator().setUnlocalizedName("detonator").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":detonator"); crate_caller = new ItemCrateCaller().setUnlocalizedName("crate_caller").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":crate_caller"); - remote = new ItemRamManipulator().setUnlocalizedName("remote").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":remote"); + remote = new ItemRamManipulator().setUnlocalizedName("remote").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":remote"); euphemium_helmet = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet"); euphemium_plate = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate"); @@ -1289,6 +1298,10 @@ public class ModItems { GameRegistry.registerItem(powder_magnetized_tungsten, powder_magnetized_tungsten.getUnlocalizedName()); GameRegistry.registerItem(powder_combine_steel, powder_combine_steel.getUnlocalizedName()); GameRegistry.registerItem(powder_lithium, powder_lithium.getUnlocalizedName()); + GameRegistry.registerItem(powder_iodine, powder_iodine.getUnlocalizedName()); + GameRegistry.registerItem(powder_thorium, powder_thorium.getUnlocalizedName()); + GameRegistry.registerItem(powder_neodymium, powder_neodymium.getUnlocalizedName()); + GameRegistry.registerItem(powder_astatine, powder_astatine.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); //Powders @@ -1340,7 +1353,6 @@ public class ModItems { GameRegistry.registerItem(wire_gold, wire_gold.getUnlocalizedName()); GameRegistry.registerItem(wire_schrabidium, wire_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(wire_magnetized_tungsten, wire_magnetized_tungsten.getUnlocalizedName()); - GameRegistry.registerItem(coil_magnetized_tungsten, coil_magnetized_tungsten.getUnlocalizedName()); //Parts GameRegistry.registerItem(coil_copper, coil_copper.getUnlocalizedName()); @@ -1348,6 +1360,7 @@ public class ModItems { GameRegistry.registerItem(coil_advanced_alloy, coil_advanced_alloy.getUnlocalizedName()); GameRegistry.registerItem(coil_advanced_torus, coil_advanced_torus.getUnlocalizedName()); GameRegistry.registerItem(coil_tungsten, coil_tungsten.getUnlocalizedName()); + GameRegistry.registerItem(coil_magnetized_tungsten, coil_magnetized_tungsten.getUnlocalizedName()); GameRegistry.registerItem(tank_steel, tank_steel.getUnlocalizedName()); GameRegistry.registerItem(motor, motor.getUnlocalizedName()); GameRegistry.registerItem(centrifuge_element, centrifuge_element.getUnlocalizedName()); @@ -1625,7 +1638,7 @@ public class ModItems { GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName()); GameRegistry.registerItem(gun_xvl1456, gun_xvl1456.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr, gun_osipr.getUnlocalizedName()); - GameRegistry.registerItem(gun_pm, gun_pm.getUnlocalizedName()); + GameRegistry.registerItem(gun_mp, gun_mp.getUnlocalizedName()); GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName()); GameRegistry.registerItem(gun_super_shotgun, gun_super_shotgun.getUnlocalizedName()); GameRegistry.registerItem(gun_moist_nugget, gun_moist_nugget.getUnlocalizedName()); @@ -1642,7 +1655,7 @@ public class ModItems { GameRegistry.registerItem(gun_xvl1456_ammo, gun_xvl1456_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo, gun_osipr_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo2, gun_osipr_ammo2.getUnlocalizedName()); - GameRegistry.registerItem(gun_pm_ammo, gun_pm_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_mp_ammo, gun_mp_ammo.getUnlocalizedName()); //Clips GameRegistry.registerItem(clip_revolver_iron, clip_revolver_iron.getUnlocalizedName()); diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index b1e0c70a6..22eeb0ac9 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -62,6 +62,7 @@ import com.hbm.render.BSmokeRenderer; import com.hbm.render.ItemRenderBigSword; import com.hbm.render.ItemRenderDecoBlock; import com.hbm.render.ItemRenderFatMan; +import com.hbm.render.ItemRenderMP; import com.hbm.render.ItemRenderMiniNuke; import com.hbm.render.ItemRenderOSIPR; import com.hbm.render.ItemRenderPoleTop; @@ -245,6 +246,7 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_xvl1456, new ItemRenderXVL1456()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_zomg, new ItemRenderZOMG()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_osipr, new ItemRenderOSIPR()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_mp, new ItemRenderMP()); RenderingRegistry.registerEntityRenderingHandler(EntityBullet.class, new RenderRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityMiniNuke.class, new RenderMiniNuke()); diff --git a/com/hbm/main/GUIHandler.java b/com/hbm/main/GUIHandler.java index 4dbc137f6..efb1c4c18 100644 --- a/com/hbm/main/GUIHandler.java +++ b/com/hbm/main/GUIHandler.java @@ -13,6 +13,7 @@ import com.hbm.gui.ContainerFusionMultiblock; import com.hbm.gui.ContainerGenerator; import com.hbm.gui.ContainerLaunchPadTier1; import com.hbm.gui.ContainerMachineBattery; +import com.hbm.gui.ContainerMachineCMBFactory; import com.hbm.gui.ContainerMachineCoal; import com.hbm.gui.ContainerMachineDeuterium; import com.hbm.gui.ContainerMachineDiesel; @@ -41,6 +42,7 @@ import com.hbm.gui.GUICoreTitanium; import com.hbm.gui.GUIFusionMultiblock; import com.hbm.gui.GUILaunchPadTier1; import com.hbm.gui.GUIMachineBattery; +import com.hbm.gui.GUIMachineCMBFactory; import com.hbm.gui.GUIMachineCentrifuge; import com.hbm.gui.GUIMachineCoal; import com.hbm.gui.GUIMachineDeuterium; @@ -74,6 +76,7 @@ import com.hbm.tileentity.TileEntityDiFurnace; import com.hbm.tileentity.TileEntityFusionMultiblock; import com.hbm.tileentity.TileEntityLaunchPad; import com.hbm.tileentity.TileEntityMachineBattery; +import com.hbm.tileentity.TileEntityMachineCMBFactory; import com.hbm.tileentity.TileEntityMachineCentrifuge; import com.hbm.tileentity.TileEntityMachineCoal; import com.hbm.tileentity.TileEntityMachineDeuterium; @@ -367,6 +370,14 @@ public class GUIHandler implements IGuiHandler { return new ContainerMachineShredder(player.inventory, (TileEntityMachineShredder) entity); } } + + case ModBlocks.guiID_combine_factory: + { + if(entity instanceof TileEntityMachineCMBFactory) + { + return new ContainerMachineCMBFactory(player.inventory, (TileEntityMachineCMBFactory) entity); + } + } } return null; } @@ -635,6 +646,14 @@ public class GUIHandler implements IGuiHandler { return new GUIMachineShredder(player.inventory, (TileEntityMachineShredder) entity); } } + + case ModBlocks.guiID_combine_factory: + { + if(entity instanceof TileEntityMachineCMBFactory) + { + return new GUIMachineCMBFactory(player.inventory, (TileEntityMachineCMBFactory) entity); + } + } } } return null; diff --git a/com/hbm/render/ItemRenderMP.java b/com/hbm/render/ItemRenderMP.java new file mode 100644 index 000000000..ed717bce6 --- /dev/null +++ b/com/hbm/render/ItemRenderMP.java @@ -0,0 +1,72 @@ +package com.hbm.render; + +import org.lwjgl.opengl.GL11; + +import com.hbm.lib.RefStrings; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +public class ItemRenderMP implements IItemRenderer { + + protected ModelMP swordModel; + + public ItemRenderMP() { + swordModel = new ModelMP(); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + switch(type) { + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + case ENTITY: + return true; + default: return false; + } + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return false; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + switch(type) { + case EQUIPPED_FIRST_PERSON: + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_CULL_FACE); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelMP.png")); + GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(-0.5F, 0.0F, -0.2F); + //GL11.glScalef(2.0F, 2.0F, 2.0F); + GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(-0.4F, -0.1F, 0.1F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + break; + case EQUIPPED: + case ENTITY: + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_CULL_FACE); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelMP.png")); + GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.2F, -0.5F); + GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.5F, -0.2F, 0.0F); + GL11.glScalef(0.75F, 0.75F, 0.75F); + GL11.glTranslatef(-0.8F, -0.1F, 0.0F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + default: break; + } + } +} diff --git a/com/hbm/render/ItemRenderOSIPR.java b/com/hbm/render/ItemRenderOSIPR.java index 90c4dcda7..91a7a4e9e 100644 --- a/com/hbm/render/ItemRenderOSIPR.java +++ b/com/hbm/render/ItemRenderOSIPR.java @@ -63,7 +63,7 @@ public class ItemRenderOSIPR implements IItemRenderer { GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.5F, -0.2F, 0.0F); //GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glTranslatef(-0.4F, -0.1F, -0.1F); + GL11.glTranslatef(-0.4F, -0.1F, 0.0F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); default: break; diff --git a/com/hbm/render/ModelMP.java b/com/hbm/render/ModelMP.java new file mode 100644 index 000000000..88eba8e59 --- /dev/null +++ b/com/hbm/render/ModelMP.java @@ -0,0 +1,247 @@ +// Date: 29.08.2016 12:31:19 +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + + + + + + +package com.hbm.render; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelMP extends ModelBase +{ + //fields + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + ModelRenderer Shape10; + ModelRenderer Shape11; + ModelRenderer Shape12; + ModelRenderer Shape13; + ModelRenderer Shape14; + ModelRenderer Shape15; + ModelRenderer Shape16; + ModelRenderer Shape17; + ModelRenderer Shape18; + ModelRenderer Shape19; + ModelRenderer Shape20; + ModelRenderer Shape21; + ModelRenderer Shape22; + ModelRenderer Shape23; + ModelRenderer Shape24; + ModelRenderer Shape25; + + public ModelMP() + { + textureWidth = 128; + textureHeight = 64; + + Shape1 = new ModelRenderer(this, 0, 0); + Shape1.addBox(0F, 0F, 0F, 3, 6, 1); + Shape1.setRotationPoint(-25F, -3F, -2F); + Shape1.setTextureSize(128, 64); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); + Shape2 = new ModelRenderer(this, 8, 0); + Shape2.addBox(0F, 0F, 0F, 3, 6, 1); + Shape2.setRotationPoint(-25F, -3F, 2F); + Shape2.setTextureSize(128, 64); + Shape2.mirror = true; + setRotation(Shape2, 0F, 0F, 0F); + Shape3 = new ModelRenderer(this, 0, 8); + Shape3.addBox(0F, 0F, 0F, 2, 3, 3); + Shape3.setRotationPoint(-24F, 0F, -1F); + Shape3.setTextureSize(128, 64); + Shape3.mirror = true; + setRotation(Shape3, 0F, 0F, 0F); + Shape4 = new ModelRenderer(this, 0, 14); + Shape4.addBox(0F, 0F, 0F, 20, 3, 1); + Shape4.setRotationPoint(-22F, -3F, -2F); + Shape4.setTextureSize(128, 64); + Shape4.mirror = true; + setRotation(Shape4, 0F, 0F, 0F); + Shape5 = new ModelRenderer(this, 0, 18); + Shape5.addBox(0F, 0F, 0F, 20, 3, 1); + Shape5.setRotationPoint(-22F, -3F, 2F); + Shape5.setTextureSize(128, 64); + Shape5.mirror = true; + setRotation(Shape5, 0F, 0F, 0F); + Shape6 = new ModelRenderer(this, 0, 22); + Shape6.addBox(0F, 0F, 0F, 24, 1, 3); + Shape6.setRotationPoint(-24F, -1F, -1F); + Shape6.setTextureSize(128, 64); + Shape6.mirror = true; + setRotation(Shape6, 0F, 0F, 0F); + Shape7 = new ModelRenderer(this, 0, 26); + Shape7.addBox(0F, 0F, 0F, 26, 4, 5); + Shape7.setRotationPoint(-25F, 3F, -2F); + Shape7.setTextureSize(128, 64); + Shape7.mirror = true; + setRotation(Shape7, 0F, 0F, 0F); + Shape8 = new ModelRenderer(this, 16, 0); + Shape8.addBox(0F, 0F, 0F, 3, 6, 1); + Shape8.setRotationPoint(-2F, -3F, -2F); + Shape8.setTextureSize(128, 64); + Shape8.mirror = true; + setRotation(Shape8, 0F, 0F, 0F); + Shape9 = new ModelRenderer(this, 24, 0); + Shape9.addBox(0F, 0F, 0F, 3, 6, 1); + Shape9.setRotationPoint(-2F, -3F, 2F); + Shape9.setTextureSize(128, 64); + Shape9.mirror = true; + setRotation(Shape9, 0F, 0F, 0F); + Shape10 = new ModelRenderer(this, 90, 22); + Shape10.addBox(0F, 0F, 0F, 11, 3, 3); + Shape10.setRotationPoint(-2F, 0F, -1F); + Shape10.setTextureSize(128, 64); + Shape10.mirror = true; + setRotation(Shape10, 0F, 0F, 0F); + Shape11 = new ModelRenderer(this, 19, 38); + Shape11.addBox(0F, 0F, 0F, 26, 1, 4); + Shape11.setRotationPoint(-25F, 7F, -1.5F); + Shape11.setTextureSize(128, 64); + Shape11.mirror = true; + setRotation(Shape11, 0F, 0F, 0F); + Shape12 = new ModelRenderer(this, 78, 35); + Shape12.addBox(0F, 0F, 0F, 20, 5, 5); + Shape12.setRotationPoint(-25F, 8F, -2F); + Shape12.setTextureSize(128, 64); + Shape12.mirror = true; + setRotation(Shape12, 0F, 0F, 0F); + Shape13 = new ModelRenderer(this, 54, 45); + Shape13.addBox(0F, 0F, 0F, 32, 2, 5); + Shape13.setRotationPoint(-5F, 8F, -2F); + Shape13.setTextureSize(128, 64); + Shape13.mirror = true; + setRotation(Shape13, 0F, 0F, 0F); + Shape14 = new ModelRenderer(this, 108, 28); + Shape14.addBox(0F, -6F, 0F, 8, 6, 1); + Shape14.setRotationPoint(1F, 8F, -2F); + Shape14.setTextureSize(128, 64); + Shape14.mirror = true; + setRotation(Shape14, -0.0872665F, 0F, 0F); + Shape15 = new ModelRenderer(this, 84, 52); + Shape15.addBox(0F, 0F, 0F, 18, 9, 3); + Shape15.setRotationPoint(9F, -1F, -1F); + Shape15.setTextureSize(128, 64); + Shape15.mirror = true; + setRotation(Shape15, 0F, 0F, 0F); + Shape16 = new ModelRenderer(this, 0, 43); + Shape16.addBox(0F, -9F, 0F, 18, 9, 1); + Shape16.setRotationPoint(9F, 8F, -2F); + Shape16.setTextureSize(128, 64); + Shape16.mirror = true; + setRotation(Shape16, -0.0872665F, 0F, 0F); + Shape17 = new ModelRenderer(this, 90, 28); + Shape17.addBox(0F, -6F, -1F, 8, 6, 1); + Shape17.setRotationPoint(1F, 8F, 3F); + Shape17.setTextureSize(128, 64); + Shape17.mirror = true; + setRotation(Shape17, 0.0872665F, 0F, 0F); + Shape18 = new ModelRenderer(this, 46, 54); + Shape18.addBox(0F, -9F, -1F, 18, 9, 1); + Shape18.setRotationPoint(9F, 8F, 3F); + Shape18.setTextureSize(128, 64); + Shape18.mirror = true; + setRotation(Shape18, 0.0872665F, 0F, 0F); + Shape19 = new ModelRenderer(this, 0, 35); + Shape19.addBox(0F, -3F, 0F, 4, 3, 5); + Shape19.setRotationPoint(-5F, 13F, -2F); + Shape19.setTextureSize(128, 64); + Shape19.mirror = true; + setRotation(Shape19, 0F, 0F, -0.8726646F); + Shape20 = new ModelRenderer(this, 0, 53); + Shape20.addBox(0F, 0F, 0F, 18, 6, 5); + Shape20.setRotationPoint(9F, 10F, -2F); + Shape20.setTextureSize(128, 64); + Shape20.mirror = true; + setRotation(Shape20, 0F, 0F, 0F); + Shape21 = new ModelRenderer(this, 42, 16); + Shape21.addBox(0F, 0F, 0F, 3, 5, 1); + Shape21.setRotationPoint(1F, 10F, 0F); + Shape21.setTextureSize(128, 64); + Shape21.mirror = true; + setRotation(Shape21, 0F, 0F, 0F); + Shape22 = new ModelRenderer(this, 62, 27); + Shape22.addBox(0F, 0F, 0F, 11, 1, 3); + Shape22.setRotationPoint(-2F, 15F, -1F); + Shape22.setTextureSize(128, 64); + Shape22.mirror = true; + setRotation(Shape22, 0F, 0F, 0F); + Shape23 = new ModelRenderer(this, 62, 31); + Shape23.addBox(-6F, -1F, 0F, 6, 1, 3); + Shape23.setRotationPoint(-2F, 16F, -1F); + Shape23.setTextureSize(128, 64); + Shape23.mirror = true; + setRotation(Shape23, 0F, 0F, 0.5235988F); + Shape24 = new ModelRenderer(this, 20, 10); + Shape24.addBox(0F, 0F, 0F, 2, 1, 3); + Shape24.setRotationPoint(-21F, -2F, -1F); + Shape24.setTextureSize(128, 64); + Shape24.mirror = true; + setRotation(Shape24, 0F, 0F, 0F); + Shape25 = new ModelRenderer(this, 10, 10); + Shape25.addBox(0F, 0F, 0F, 2, 1, 3); + Shape25.setRotationPoint(-5F, -2F, -1F); + Shape25.setTextureSize(128, 64); + Shape25.mirror = true; + setRotation(Shape25, 0F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + Shape5.render(f5); + Shape6.render(f5); + Shape7.render(f5); + Shape8.render(f5); + Shape9.render(f5); + Shape10.render(f5); + Shape11.render(f5); + Shape12.render(f5); + Shape13.render(f5); + Shape14.render(f5); + Shape15.render(f5); + Shape16.render(f5); + Shape17.render(f5); + Shape18.render(f5); + Shape19.render(f5); + Shape20.render(f5); + Shape21.render(f5); + Shape22.render(f5); + Shape23.render(f5); + Shape24.render(f5); + Shape25.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } + +} diff --git a/com/hbm/tileentity/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/TileEntityMachineCMBFactory.java index 61e40b2d4..d71aebc51 100644 --- a/com/hbm/tileentity/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/TileEntityMachineCMBFactory.java @@ -66,7 +66,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv @Override public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.machine_deuterium"; + return this.hasCustomInventoryName() ? this.customName : "container.machineCMB"; } @Override