From 982bf1d404062f5a2632661c95d282e052e47d0b Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 8 Oct 2020 23:46:58 +0200 Subject: [PATCH] fixed horse nut hammer existing, mese gavel, more baby mode recipes --- src/main/java/assets/hbm/lang/de_DE.lang | 2 +- src/main/java/assets/hbm/lang/en_US.lang | 2 +- .../items/assembly_template_secret.png | Bin 0 -> 284 bytes .../items/chemistry_template_secret.png | Bin 0 -> 241 bytes .../textures/items/chlorophyte_pickaxe.png | Bin 0 -> 354 bytes .../assets/hbm/textures/items/mese_gavel.png | Bin 0 -> 278 bytes .../hbm/textures/items/mese_pickaxe.png | Bin 0 -> 296 bytes .../java/assets/hbm/textures/items/pch.png | Bin 3374 -> 0 bytes .../textures/items/stamp_steel_circuit.png | Bin 270 -> 236 bytes .../hbm/textures/items/stamp_steel_flat.png | Bin 199 -> 183 bytes .../hbm/textures/items/stamp_steel_plate.png | Bin 243 -> 217 bytes .../hbm/textures/items/stamp_steel_wire.png | Bin 215 -> 193 bytes .../textures/models/capes/CapeDoctor17.png | Bin 0 -> 508 bytes .../textures/models/weapons/gavel_mese.png | Bin 0 -> 870 bytes .../com/hbm/blocks/machine/MachineITER.java | 7 +++ .../blocks/machine/MachinePlasmaHeater.java | 8 +++ .../com/hbm/inventory/gui/GUIIGenerator.java | 2 +- src/main/java/com/hbm/items/ModItems.java | 6 +-- .../com/hbm/items/special/ItemSyringe.java | 2 + .../com/hbm/items/tool/WeaponSpecial.java | 34 ------------ src/main/java/com/hbm/lib/Library.java | 1 + src/main/java/com/hbm/main/ClientProxy.java | 2 +- .../java/com/hbm/main/CraftingManager.java | 50 ++++++++++++------ .../java/com/hbm/main/ModEventHandler.java | 17 ++++-- .../com/hbm/main/ModEventHandlerClient.java | 14 +++++ .../java/com/hbm/main/ResourceManager.java | 1 + .../render/item/weapon/ItemRenderGavel.java | 10 ++++ .../render/item/weapon/ItemRenderShim.java | 13 ----- .../render/util/RenderAccessoryUtility.java | 4 ++ .../java/com/hbm/util/ContaminationUtil.java | 6 +++ 30 files changed, 107 insertions(+), 74 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/items/assembly_template_secret.png create mode 100644 src/main/java/assets/hbm/textures/items/chemistry_template_secret.png create mode 100644 src/main/java/assets/hbm/textures/items/chlorophyte_pickaxe.png create mode 100644 src/main/java/assets/hbm/textures/items/mese_gavel.png create mode 100644 src/main/java/assets/hbm/textures/items/mese_pickaxe.png delete mode 100644 src/main/java/assets/hbm/textures/items/pch.png create mode 100644 src/main/java/assets/hbm/textures/models/capes/CapeDoctor17.png create mode 100644 src/main/java/assets/hbm/textures/models/weapons/gavel_mese.png diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index fd9357177..22ca5dd53 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -1195,6 +1195,7 @@ item.med_ptsd.name=PTBS-Medikament item.med_schiziphrenia.name=Schizophrenie-Medikament item.memespoon.name=§eLuftschlag item.memory.name=item.null.name +item.mese_gavel.name=Mese-Richterhammer item.meteor_remote.name=Meteoritenkontroller item.mike_cooling_unit.name=Deuteriumkühleinheit item.mike_core.name=Mit Uran ummantelter Deuteriumtank @@ -1428,7 +1429,6 @@ item.part_carbon.name=Kohlenstoffstaubkiste item.part_copper.name=Kupferstaubkiste item.part_lithium.name=Lithiumstaubkiste item.part_plutonium.name=Plutoniumstaubkiste -item.pch.name=Horse Nut Hammer item.pedestal_steel.name=Stahlsockel item.pellet_advanced.name=Fortgeschrittenes Watzaufwertugspellet item.pellet_antimatter.name=Antimateriencluster diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 5447c263d..a78c3d14e 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -1195,6 +1195,7 @@ item.med_ptsd.name=PTSD Medication item.med_schiziphrenia.name=Schizophrenia Medication item.memespoon.name=§eMarket Gardener item.memory.name=item.null.name +item.mese_gavel.name=Mese Gavel item.meteor_remote.name=Meteorite Remote item.mike_cooling_unit.name=Deuterium Cooling Unit item.mike_core.name=Uranium Coated Deuterium Tank @@ -1428,7 +1429,6 @@ item.part_carbon.name=Box of Carbon Dust item.part_copper.name=Box of Copper Dust item.part_lithium.name=Box of Lithium Dust item.part_plutonium.name=Box of Plutonium Dust -item.pch.name=Horse Nut Hammer item.pedestal_steel.name=Steel Pedestal item.pellet_advanced.name=Advanced Watz Performance Improver item.pellet_antimatter.name=Antimatter Cluster diff --git a/src/main/java/assets/hbm/textures/items/assembly_template_secret.png b/src/main/java/assets/hbm/textures/items/assembly_template_secret.png new file mode 100644 index 0000000000000000000000000000000000000000..05f3775b203c6f58ba8d51596aa897c4566fb2d9 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfvyyiW=PpECoOy<6O?+zdixrEgRPUr($74SSS^zrI^*v@xd|Z;_ApOuxTeg|;L)PCU4+5ml;#T$OV{+} z4F5m5Fa`NdC}Nt}aZXQk+efLLDWXBIZ*xWUAKb08I%6NpkBawy``>)F3H~r4=C8_v f_xE=O{XZ%G+OsI@v|nR7(0dG?u6{1-oD!M<`v`BE literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/chemistry_template_secret.png b/src/main/java/assets/hbm/textures/items/chemistry_template_secret.png new file mode 100644 index 0000000000000000000000000000000000000000..b27c9d08674dc19d50c7e24dce97df5cc2a7d659 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vflg>D?!-M6( zZ#90)>yK(Dv%dP}TEtu6&w6^>x=xppGa|=(3fPRBwyk~qVqS|RupGz nb?iFF8q_p}F@u%FIdBfhzq(nyo-OS+W>gTe~DWM4fpG#o< literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/chlorophyte_pickaxe.png b/src/main/java/assets/hbm/textures/items/chlorophyte_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..a49eaf41be6813917ce9f09b2818fda12bbbeeee GIT binary patch literal 354 zcmV-o0iFJdP)u}*_f7=^!EYhubkQo{fSr;=P3I@L!oT}b*84&9x7jlN1} zMjMARG2D$P1F;E9gP&&Iv{-#I7$RkY-U6Y)H+{@!nmYX8&JxP4G0M+NWl zym=x?5&#(j_0pYiA^@xP19_g4y?n6W8l|-sfHY0jAfOHM7gN69t{4|K#u&=7RGk&N zD*+(>V#*g#zLvG|=q~_()>>{a@5pusE^a=VFK2QxKx-{Q5MYdTn>!~aiC^87z}?avQGmdQCBo1Pu-m;85sU+-N3wIrV3ADbH=e#vBGik!3 zAd>W<^jVrkt<)pll<5yl9~}5u&htrV4$tT9_K7<_zR-SrdppNjmc0)$)qd?aj{Up8 zP3HT59(&7*1&Q9m63Z%pW=x;{AjP8Kq3+>c_xMh3jT|%K)$Do9cXQnsCF_cwWG@q8 ZVBlL);`T8-wjAg&22WQ%mvv4FO#u2rb>08~ literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/mese_pickaxe.png b/src/main/java/assets/hbm/textures/items/mese_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..6d4cfbe5d49388bc5815109ea60d934cc3b3ea16 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf{%nQV6uOJJO~;0!}YlOC(C&jXPcCpZtPKJ?V{ z`}BKbEu*wV^Rk!EYxfK1RPQ?^5n_7%I``VwOZ%$$ul7cIgt9*7h~2(KP>}V-Z@Uj% zIjwo-Gt??tI@GP!o~J(8%gzNtDrb!DK)O5aa4bz-l5 z6_ljf6mxH{GiFvf$(b&GY{R??^MeyNcfU4eFI%UeG%I!H^qk-&FWnAU?Joaz@ZZF# sH71++4@#zsi(7w|G`jZp{tdl*%|Ufxst3QG0eY3e)78&qol`;+01Qub@Bjb+ literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/pch.png b/src/main/java/assets/hbm/textures/items/pch.png deleted file mode 100644 index ab9769b108914663ee032e82c9c332f7c6195067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3374 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 diff --git a/src/main/java/assets/hbm/textures/items/stamp_steel_circuit.png b/src/main/java/assets/hbm/textures/items/stamp_steel_circuit.png index f4c5b7f32a4beb27c865bf8b2d6306f912410e17..d95fe00dfa6cd988cdca1f883e289d4674127aad 100644 GIT binary patch delta 192 zcmV;x06+hZ0_*{hG=HN>L_t(IjkS}p4Z|Q51)rmI6!gDjlHV}_3or|FAofC{WCQA? zh)iT~Y;2Tk(L1hyg@|65;0XZ6m|Noz!bboADW!T4V>}!RAwWdmf<3g>8|jKt3d{`e zJpkZwvAUxZ#2ANf|4+e`;A;M1fwdOaTI8I^3tGJQD5V?<>Nz`T^PO{b{40MWXjxy{ u8C4*J05gM`hlZVih;|dtSfrFw-}wz)|31fi>3^vJ0000&Q{Y!TP6 z#K;Yp+o5U-p+G9sH#xHM^BsLxMD)M~?f}p<4FJGei*X!_>tPsP0y(M*Rb8EzwJ`=n z^l|VF@BOX=W=04B0C4+pMFUwWdHyG07*qoM6N<$g1eew?*IS* diff --git a/src/main/java/assets/hbm/textures/items/stamp_steel_flat.png b/src/main/java/assets/hbm/textures/items/stamp_steel_flat.png index c55a85339d87c7adac117b204f9a4629d10b63e8..5c39c684f25b8badd0ff749c12cd31704ed2cd68 100644 GIT binary patch delta 139 zcmV;60CfMy0k;8=G=FYML_t(IjqQ`M4Z|=H1J8lGFVwTtBBL|_}+#{`nLdH%zaQaW|#2kUtfQ>l;U8UO$Q07*qoL@Q7m~+P6arfu&oBs%q#2DkJG6AGg%Aq>n02I}^Hewm)L^S{a002ov JPDHLkV1ne{Moa(z diff --git a/src/main/java/assets/hbm/textures/items/stamp_steel_plate.png b/src/main/java/assets/hbm/textures/items/stamp_steel_plate.png index b93c0ff10a2d6abf2b10ca638c34ae3e59634a85..71ae06f638e753e65e604df8a4e5b813eb8cba47 100644 GIT binary patch delta 173 zcmV;e08;<+0oehNG=GpuL_t(IjqQ`M2?H?~$PD10KE400000NkvXXu0mjfWOhvE delta 199 zcmV;&0672I0rLTnG=Hi|L_t(IjqQ`M4Z<)GMPCrz73qIzDHC{s>#~Oj^DLIvh?G^J zK!E@u7^US`UzYXn-PzYkx^O^efEXhHAq3`mZuYfSI!TupBhxfBS2Z&vQER;sEE>nL ziNM{-IX_xhYav+^E#AxsA-vDvRl_iB5~P$Ur99m|H8s7Xe?Y*-E0`H6B>>$0e!lj* z0g}i$?|!7s05ikgKUV!pAc<1SPs;?*^?iS6ov+SAf$zdhZbtT5I=OpL6oFDV~XXi=l$158gEPePQ;Atrl3_7K8S_q5y{{FM3CDyIR{}Ex^l@S0ko19tu#es@_rD z6@zwJlq04!9u}agAOmWF>aJwc*{c%UF0;BC{#0&$fLvIts zR{wJ>fT-dXs6nkEGe8B_Dbu!a(QO5~w;wYWz!=2?wSx5)FMxvamQ0$Hpt`v*?icTz zi?R(A;K#QmUcdux>hLs2-%TftUz(U9j4>moyL)VBWNiy%Q-_yk2u}QDJp%@ay?AH^ z2qE-E-(20`1uEdz)lV`7shXIFFvd`pajwb!1W0>@5cvB1sBwmXg9rXHZ4=`h=mq%l y>}W7x$p6^%k5Pm~B9TZW5{X12kw_%|GkycIhjV}ZW6=`;0000ezw6vzKb4w6t*g{4vkCR)T8Apv5j6fw0!*N!NnUj&IS z!Gg#HAK^N%bpi$=u^_b@L&roBRW7Af7#ugb>nSgG{BkyWzs32#T;=os9G`uDy%Lz| z_c7tFgOhU6C*V6`5P=v(5OG&98gbXa3%fxV7u+@QQsSU-bg z>^*2O7%bGj$Jq_)^?D1n?{T?{5r{zqVi18CL?8wcu+M`|Ps3i#v)|@7Hn?lxh25az zV^!)Uhc+w}&2CVwrpoK^rQ*%Q?ueVeXUooe6* zLMD2!SqA_liCVYLCVFo4koWxAi5`FWiHF`xSJ84S{<=p>B1WQ=8FHn2ZYe05}ha@wS9W8--Cx!pF4nZo`=aTVei*x#R(n)%Oq ztXVc@inn7Bpssox-@f|Uo-wcIO>xqL?EY+h7gSSr8;&RH2bc`$IY}+ zMemdv@2qm~YSa$WSET5jQd7;ot1;YCyBfaq2vaSCG=UgIzbkPI_|f27}lMBr0)8vp contributors = Sets.newHashSet(new String[] { "06ab7c03-55ce-43f8-9d3c-2850e3c652de", //mustang_rudolf diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index d018be287..97283ab33 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -202,10 +202,10 @@ public class ClientProxy extends ServerProxy { MinecraftForgeClient.registerItemRenderer(ModItems.stopsign, new ItemRenderShim()); MinecraftForgeClient.registerItemRenderer(ModItems.sopsign, new ItemRenderShim()); MinecraftForgeClient.registerItemRenderer(ModItems.chernobylsign, new ItemRenderShim()); - MinecraftForgeClient.registerItemRenderer(ModItems.pch, new ItemRenderShim()); MinecraftForgeClient.registerItemRenderer(ModItems.wood_gavel, new ItemRenderGavel()); MinecraftForgeClient.registerItemRenderer(ModItems.lead_gavel, new ItemRenderGavel()); MinecraftForgeClient.registerItemRenderer(ModItems.diamond_gavel, new ItemRenderGavel()); + MinecraftForgeClient.registerItemRenderer(ModItems.mese_gavel, new ItemRenderGavel()); //guns MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_karl, new ItemRenderRpg()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 76ea014c8..79fddf783 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -549,7 +549,6 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.shimmer_handle, 1), new Object[] { "GP", "GP", "GP", 'G', "plateGold", 'P', "ingotPolymer" })); GameRegistry.addRecipe(new ItemStack(ModItems.shimmer_sledge, 1), new Object[] { "H", "G", "G", 'G', ModItems.shimmer_handle, 'H', ModItems.shimmer_head }); GameRegistry.addRecipe(new ItemStack(ModItems.shimmer_axe, 1), new Object[] { "H", "G", "G", 'G', ModItems.shimmer_handle, 'H', ModItems.shimmer_axe_head }); - GameRegistry.addRecipe(new ItemStack(ModItems.pch, 1), new Object[] { "CDC", "CBC", "CHC", 'C', ModItems.canned_jizz, 'D', ModItems.ducttape, 'B', ModItems.fluid_barrel_empty, 'H', ModItems.schrabidium_hammer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.definitelyfood, 1), new Object[] { "DDD", "SDS", "DDD", 'D', Blocks.dirt, 'S', "plateSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blade_tungsten, 2), new Object[] { "IP", "TP", "TI", 'P', "plateTitanium", 'T', "ingotTitanium", 'I', "ingotTungsten" })); GameRegistry.addRecipe(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', ModItems.ingot_dura_steel }); @@ -1020,9 +1019,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 0), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.nugget_schrabidium, 'A', Items.apple }); GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 1), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.ingot_schrabidium, 'A', Items.apple }); GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 2), new Object[] { "SSS", "SAS", "SSS", 'S', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'A', Items.apple }); - GameRegistry.addRecipe(new ItemStack(ModItems.apple_lead, 1, 0), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.nugget_lead, 'A', Items.apple }); - GameRegistry.addRecipe(new ItemStack(ModItems.apple_lead, 1, 1), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.ingot_lead, 'A', Items.apple }); - GameRegistry.addRecipe(new ItemStack(ModItems.apple_lead, 1, 2), new Object[] { "SSS", "SAS", "SSS", 'S', ModBlocks.block_lead, 'A', Items.apple }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.apple_lead, 1, 0), new Object[] { "SSS", "SAS", "SSS", 'S', "nuggetLead", 'A', Items.apple })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.apple_lead, 1, 1), new Object[] { "SSS", "SAS", "SSS", 'S', "ingotLead", 'A', Items.apple })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.apple_lead, 1, 2), new Object[] { "SSS", "SAS", "SSS", 'S', "blockLead", 'A', Items.apple })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 0), new Object[] { Items.gold_nugget, Items.paper }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 1), new Object[] { Items.gold_nugget, Items.gold_nugget, Items.gold_nugget, Items.paper }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 2), new Object[] { Items.gold_ingot, Items.gold_ingot, Items.gold_nugget, Items.gold_nugget, Items.paper }); @@ -1169,15 +1168,36 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_steam), new Object[] { "PMP", "ISI", "PCP", 'P', "plateCopper", 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATER.getID()), 'I', ModItems.plate_polymer })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_steam_large), new Object[] { "MPM", "ISI", "CPC", 'P', ModItems.board_copper, 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.WATER.getID()), 'I', "ingotPolymer" })); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_helmet, 1), new Object[] { "EEE", "ESE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_helmet }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_plate, 1), new Object[] { "ESE", "EEE", "EEE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_plate }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_legs, 1), new Object[] { "EEE", "ESE", "E E", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_legs }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_boots, 1), new Object[] { "E E", "ESE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_boots }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "W", "S", 'I', ModBlocks.block_schrabidium, 'W', ModItems.desh_sword, 'S', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "SWS", " P ", " P ", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_pickaxe, 'P', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "SW", "SP", " P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_axe, 'P', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "S", "W", "P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_shovel, 'P', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "IW", " S", " S", 'I', ModItems.ingot_schrabidium, 'W', ModItems.desh_hoe, 'S', ModItems.ingot_polymer }); + if(GeneralConfig.enableBabyMode) { + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + } else { + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_helmet, 1), new Object[] { "EEE", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_helmet }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_plate, 1), new Object[] { "ECE", "EEE", "EEE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_plate }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_legs, 1), new Object[] { "EEE", "ECE", "E E", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_legs }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_boots, 1), new Object[] { "E E", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_boots }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_helmet, 1), new Object[] { "EEE", "ESE", " P ", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_helmet, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_plate, 1), new Object[] { "ESE", "EPE", "EEE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_plate, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_legs, 1), new Object[] { "EEE", "ESE", "EPE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_legs, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_boots, 1), new Object[] { "EPE", "ESE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_boots, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "W", "S", 'I', ModBlocks.block_schrabidium, 'W', ModItems.desh_sword, 'S', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "SWS", " P ", " P ", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_pickaxe, 'P', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "SW", "SP", " P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_axe, 'P', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "S", "W", "P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_shovel, 'P', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "IW", " S", " S", 'I', ModItems.ingot_schrabidium, 'W', ModItems.desh_hoe, 'S', ModItems.ingot_polymer }); + } + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_helmet, 1), new Object[] { "EEE", "E E", 'E', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', "ingotSteel" })); @@ -1238,10 +1258,6 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_cobalt }); GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_cobalt }); GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_cobalt }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_helmet, 1), new Object[] { "EEE", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_helmet }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_plate, 1), new Object[] { "ECE", "EEE", "EEE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_plate }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_legs, 1), new Object[] { "EEE", "ECE", "E E", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_legs }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_boots, 1), new Object[] { "E E", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_boots }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.drax, 1), new Object[] { "BCF", "DDM", "BCC", 'B', ModItems.blades_advanced_alloy, 'C', "ingotCobalt", 'F', ItemBattery.getFullBattery(ModItems.fusion_core), 'D', "ingotDesh", 'M', ModItems.motor })); GameRegistry.addRecipe(new ItemStack(ModItems.drax_mk2, 1), new Object[] { "SCS", "IDI", "FEF", 'S', ModItems.ingot_starmetal, 'C', ModItems.crystal_trixite, 'I', ModItems.ingot_saturnite, 'D', ModItems.drax, 'F', ItemBattery.getFullBattery(ModItems.fusion_core), 'E', ModItems.circuit_targeting_tier5 }); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 080cfe9e4..3b0ad7a9d 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -243,6 +243,9 @@ public class ModEventHandler //effect for radiation EntityLivingBase entity = (EntityLivingBase) e; + + if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode) + continue; if(event.world.getTotalWorldTime() % 20 == 0) { @@ -307,9 +310,6 @@ public class ModEventHandler if(eRad > 2500) entity.getEntityData().setFloat("hfr_radiation", 2500); - if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode) - continue; - if(eRad >= 1000) { if(entity.attackEntityFrom(ModDamageSource.radiation, entity.getMaxHealth() * 100)) { entity.getEntityData().setFloat("hfr_radiation", 0); @@ -475,6 +475,17 @@ public class ModEventHandler EntityPlayer player = event.player; if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) { + + /// GHOST FIX START /// + + if(!Float.isFinite(player.getHealth()) || !Float.isFinite(player.getAbsorptionAmount())) { + player.addChatComponentMessage(new ChatComponentText("Your health has been restored!")); + player.worldObj.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F); + player.setHealth(player.getMaxHealth()); + player.setAbsorptionAmount(0); + } + + /// GHOST FIX END /// /// FSB ARMOR START /// ItemStack helmet = player.inventory.armorInventory[3]; diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index a31a0c5ad..6bab0fef1 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -46,10 +46,13 @@ import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -57,6 +60,7 @@ import net.minecraft.util.Vec3; import net.minecraftforge.client.event.MouseEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import net.minecraftforge.client.event.RenderLivingEvent; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.TextureStitchEvent; @@ -165,6 +169,16 @@ public class ModEventHandlerClient { renderer.modelArmorChestplate.aimedBow = true; } } + + /*@SubscribeEvent + public void renderThermalSight(RenderLivingEvent.Pre event) { + + AxisAlignedBB aabb = event.entity.boundingBox; + + GL11.glPushMatrix(); + Render.renderAABB(aabb); + GL11.glPopMatrix(); + }*/ @SubscribeEvent public void clickHandler(MouseEvent event) { diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 9a06e07b4..8f6fa648b 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -420,6 +420,7 @@ public class ResourceManager { public static final ResourceLocation gavel_wood = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_wood.png"); public static final ResourceLocation gavel_lead = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_lead.png"); public static final ResourceLocation gavel_diamond = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_diamond.png"); + public static final ResourceLocation gavel_mese = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_mese.png"); public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png"); public static final ResourceLocation hk69_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/hk69.png"); diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java index cc10e859d..eeefd0d95 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java @@ -42,6 +42,8 @@ public class ItemRenderGavel implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_lead); if(item.getItem() == ModItems.diamond_gavel) Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_diamond); + if(item.getItem() == ModItems.mese_gavel) + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_mese); switch(type) { case EQUIPPED_FIRST_PERSON: @@ -55,6 +57,9 @@ public class ItemRenderGavel implements IItemRenderer { GL11.glRotated(45, 0, 0, 1); GL11.glRotated(90, 0, 1, 0); + if(item.getItem() == ModItems.mese_gavel) + GL11.glScaled(2, 2, 2); + break; case ENTITY: @@ -66,6 +71,11 @@ public class ItemRenderGavel implements IItemRenderer { GL11.glTranslated(1.375, 0, 0); GL11.glRotated(90, 0, 1, 0); + if(item.getItem() == ModItems.mese_gavel) { + GL11.glScaled(2, 2, 2); + GL11.glTranslated(0, 0.25, 0); + } + break; default: break; diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java index 039f14f5e..ee047b381 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java @@ -50,8 +50,6 @@ public class ItemRenderShim implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.sopsign_tex); if(item.getItem() == ModItems.chernobylsign) Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.chernobylsign_tex); - if(item.getItem() == ModItems.pch) - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.pch_tex); if(item.getItem() == ModItems.shimmer_sledge || item.getItem() == ModItems.shimmer_axe) { GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); @@ -67,11 +65,6 @@ public class ItemRenderShim implements IItemRenderer { GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); } - if(item.getItem() == ModItems.pch) { - GL11.glRotatef(45.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.7F, 0.0F, 0.0F); - } - if(item.getItem() == ModItems.shimmer_sledge) ResourceManager.shimmer_sledge.renderAll(); if(item.getItem() == ModItems.shimmer_axe) @@ -79,12 +72,6 @@ public class ItemRenderShim implements IItemRenderer { if(item.getItem() == ModItems.stopsign || item.getItem() == ModItems.sopsign || item.getItem() == ModItems.chernobylsign) ResourceManager.stopsign.renderAll(); - if(item.getItem() == ModItems.pch) { - GL11.glShadeModel(GL11.GL_SMOOTH); - ResourceManager.pch.renderAll(); - GL11.glShadeModel(GL11.GL_FLAT); - } - default: break; } GL11.glPopMatrix(); diff --git a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java index 1c2e69626..6d44fe229 100644 --- a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java +++ b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java @@ -28,6 +28,7 @@ public class RenderAccessoryUtility { private static ResourceLocation test = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeTest.png"); private static ResourceLocation schrabby = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeSchrabbyAlt.png"); private static ResourceLocation swiggs = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeSweatySwiggs.png"); + private static ResourceLocation doctor17 = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeDoctor17.png"); private static ResourceLocation wiki = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeWiki.png"); public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { @@ -92,6 +93,9 @@ public class RenderAccessoryUtility { if(uuid.equals(Library.SweatySwiggs)) { return swiggs; } + if(uuid.equals(Library.Doctor17)) { + return doctor17; + } if(Library.contributors.contains(uuid)) { return wiki; } diff --git a/src/main/java/com/hbm/util/ContaminationUtil.java b/src/main/java/com/hbm/util/ContaminationUtil.java index 51c9087f5..4883d1872 100644 --- a/src/main/java/com/hbm/util/ContaminationUtil.java +++ b/src/main/java/com/hbm/util/ContaminationUtil.java @@ -39,6 +39,9 @@ public class ContaminationUtil { if(!(e instanceof EntityLivingBase)) return; + if(e instanceof EntityPlayer && ((EntityPlayer)e).capabilities.isCreativeMode) + return; + EntityLivingBase entity = (EntityLivingBase)e; f *= calculateRadiationMod(entity); @@ -52,6 +55,9 @@ public class ContaminationUtil { if(!(e instanceof EntityLivingBase)) return; + if(e instanceof EntityPlayer && ((EntityPlayer)e).capabilities.isCreativeMode) + return; + if(((EntityLivingBase)e).isPotionActive(HbmPotion.mutation)) return;