diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 25c576139..e072d9fec 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -201,6 +201,7 @@ death.attack.cloud=%1$s schmolz wie ein Eis in der Sonne. death.attack.lead=%1$s starb an Bleivergiftung. death.attack.taint=%1$s starb an Flux-Tumoren. death.attack.electricity=%1$s bekam einen tödlichen Stromschlag. +death.attack.exhaust=%1$s wurde von einer startenden Rakete verbrutzelt. item.redstone_sword.name=Redstoneschwert item.big_sword.name=Großes Schwert diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index c3bbb2822..0d3b4e4b3 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -201,6 +201,7 @@ death.attack.cloud=%1$s melted like a popsicle in the sun. death.attack.lead=%1$s died from lead poisoning. death.attack.taint=%1$s died from flux tumors. death.attack.electricity=%1$s was electrocuted. +death.attack.exhaust=%1$s was turned into shish kebab by a starting rocket. item.redstone_sword.name=Redstone Sword item.big_sword.name=Great Sword diff --git a/assets/hbm/sounds/entity/soyuzTakeoff.ogg b/assets/hbm/sounds/entity/soyuzTakeoff.ogg new file mode 100644 index 000000000..3d9fdc94a Binary files /dev/null and b/assets/hbm/sounds/entity/soyuzTakeoff.ogg differ diff --git a/assets/hbm/textures/items/alloy_axe.png b/assets/hbm/textures/items/alloy_axe.png index 8f93acb17..d278c7978 100644 Binary files a/assets/hbm/textures/items/alloy_axe.png and b/assets/hbm/textures/items/alloy_axe.png differ diff --git a/assets/hbm/textures/items/alloy_hoe.png b/assets/hbm/textures/items/alloy_hoe.png index e0a2521bf..bc099be98 100644 Binary files a/assets/hbm/textures/items/alloy_hoe.png and b/assets/hbm/textures/items/alloy_hoe.png differ diff --git a/assets/hbm/textures/items/alloy_pickaxe.png b/assets/hbm/textures/items/alloy_pickaxe.png index c8695f0ec..ef3e926c1 100644 Binary files a/assets/hbm/textures/items/alloy_pickaxe.png and b/assets/hbm/textures/items/alloy_pickaxe.png differ diff --git a/assets/hbm/textures/items/alloy_shovel.png b/assets/hbm/textures/items/alloy_shovel.png index 6c76bcd7d..85e14f636 100644 Binary files a/assets/hbm/textures/items/alloy_shovel.png and b/assets/hbm/textures/items/alloy_shovel.png differ diff --git a/assets/hbm/textures/items/alloy_sword.png b/assets/hbm/textures/items/alloy_sword.png index 45bfe6927..875ff9562 100644 Binary files a/assets/hbm/textures/items/alloy_sword.png and b/assets/hbm/textures/items/alloy_sword.png differ diff --git a/assets/hbm/textures/items/cmb_axe.png b/assets/hbm/textures/items/cmb_axe.png index 316144683..689a02f6b 100644 Binary files a/assets/hbm/textures/items/cmb_axe.png and b/assets/hbm/textures/items/cmb_axe.png differ diff --git a/assets/hbm/textures/items/cmb_hoe.png b/assets/hbm/textures/items/cmb_hoe.png index fccd1c153..fc2a42c08 100644 Binary files a/assets/hbm/textures/items/cmb_hoe.png and b/assets/hbm/textures/items/cmb_hoe.png differ diff --git a/assets/hbm/textures/items/cmb_pickaxe.png b/assets/hbm/textures/items/cmb_pickaxe.png index e5d7729bd..a29b62bfa 100644 Binary files a/assets/hbm/textures/items/cmb_pickaxe.png and b/assets/hbm/textures/items/cmb_pickaxe.png differ diff --git a/assets/hbm/textures/items/cmb_shovel.png b/assets/hbm/textures/items/cmb_shovel.png index 7d6911b95..f4e1a031f 100644 Binary files a/assets/hbm/textures/items/cmb_shovel.png and b/assets/hbm/textures/items/cmb_shovel.png differ diff --git a/assets/hbm/textures/items/cmb_sword.png b/assets/hbm/textures/items/cmb_sword.png index e9e6ec17b..96253bfa3 100644 Binary files a/assets/hbm/textures/items/cmb_sword.png and b/assets/hbm/textures/items/cmb_sword.png differ diff --git a/assets/hbm/textures/items/desh_axe.png b/assets/hbm/textures/items/desh_axe.png index 66ae78d57..60698e907 100644 Binary files a/assets/hbm/textures/items/desh_axe.png and b/assets/hbm/textures/items/desh_axe.png differ diff --git a/assets/hbm/textures/items/desh_hoe.png b/assets/hbm/textures/items/desh_hoe.png index 1051951d2..9cd621b31 100644 Binary files a/assets/hbm/textures/items/desh_hoe.png and b/assets/hbm/textures/items/desh_hoe.png differ diff --git a/assets/hbm/textures/items/desh_pickaxe.png b/assets/hbm/textures/items/desh_pickaxe.png index 80ec33d06..681b82c1c 100644 Binary files a/assets/hbm/textures/items/desh_pickaxe.png and b/assets/hbm/textures/items/desh_pickaxe.png differ diff --git a/assets/hbm/textures/items/desh_shovel.png b/assets/hbm/textures/items/desh_shovel.png index 4f632b5a4..1170df8e0 100644 Binary files a/assets/hbm/textures/items/desh_shovel.png and b/assets/hbm/textures/items/desh_shovel.png differ diff --git a/assets/hbm/textures/items/desh_sword.png b/assets/hbm/textures/items/desh_sword.png index 5212021e7..7d585b283 100644 Binary files a/assets/hbm/textures/items/desh_sword.png and b/assets/hbm/textures/items/desh_sword.png differ diff --git a/assets/hbm/textures/items/gadget_core.png b/assets/hbm/textures/items/gadget_core.png index 2b5cc2c87..5cccf0cc2 100644 Binary files a/assets/hbm/textures/items/gadget_core.png and b/assets/hbm/textures/items/gadget_core.png differ diff --git a/assets/hbm/textures/items/ingot_th232.png b/assets/hbm/textures/items/ingot_th232.png index ec67120ec..34e5f8ec5 100644 Binary files a/assets/hbm/textures/items/ingot_th232.png and b/assets/hbm/textures/items/ingot_th232.png differ diff --git a/assets/hbm/textures/items/rod_australium.png b/assets/hbm/textures/items/rod_australium.png index 890b61920..34e5dc5a5 100644 Binary files a/assets/hbm/textures/items/rod_australium.png and b/assets/hbm/textures/items/rod_australium.png differ diff --git a/assets/hbm/textures/items/rod_coolant.png b/assets/hbm/textures/items/rod_coolant.png index 0176e3e48..aa4ae7e48 100644 Binary files a/assets/hbm/textures/items/rod_coolant.png and b/assets/hbm/textures/items/rod_coolant.png differ diff --git a/assets/hbm/textures/items/rod_daffergon.png b/assets/hbm/textures/items/rod_daffergon.png index 28250eac0..80e538b63 100644 Binary files a/assets/hbm/textures/items/rod_daffergon.png and b/assets/hbm/textures/items/rod_daffergon.png differ diff --git a/assets/hbm/textures/items/rod_dual_coolant.png b/assets/hbm/textures/items/rod_dual_coolant.png index d4044ee56..9f5b38305 100644 Binary files a/assets/hbm/textures/items/rod_dual_coolant.png and b/assets/hbm/textures/items/rod_dual_coolant.png differ diff --git a/assets/hbm/textures/items/rod_dual_empty.png b/assets/hbm/textures/items/rod_dual_empty.png index 88e4cc60f..38f89c0ca 100644 Binary files a/assets/hbm/textures/items/rod_dual_empty.png and b/assets/hbm/textures/items/rod_dual_empty.png differ diff --git a/assets/hbm/textures/items/rod_dual_lead.png b/assets/hbm/textures/items/rod_dual_lead.png index 902ca12bd..7a6dde0ed 100644 Binary files a/assets/hbm/textures/items/rod_dual_lead.png and b/assets/hbm/textures/items/rod_dual_lead.png differ diff --git a/assets/hbm/textures/items/rod_dual_lithium.png b/assets/hbm/textures/items/rod_dual_lithium.png index 41cb044cd..19a6bb7ec 100644 Binary files a/assets/hbm/textures/items/rod_dual_lithium.png and b/assets/hbm/textures/items/rod_dual_lithium.png differ diff --git a/assets/hbm/textures/items/rod_dual_mox_fuel.png b/assets/hbm/textures/items/rod_dual_mox_fuel.png index 07bcaf10f..19787ac03 100644 Binary files a/assets/hbm/textures/items/rod_dual_mox_fuel.png and b/assets/hbm/textures/items/rod_dual_mox_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_mox_fuel_depleted.png b/assets/hbm/textures/items/rod_dual_mox_fuel_depleted.png index a48165ba8..a828baffb 100644 Binary files a/assets/hbm/textures/items/rod_dual_mox_fuel_depleted.png and b/assets/hbm/textures/items/rod_dual_mox_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_dual_plutonium.png b/assets/hbm/textures/items/rod_dual_plutonium.png index 4345596e7..6bd5e8b54 100644 Binary files a/assets/hbm/textures/items/rod_dual_plutonium.png and b/assets/hbm/textures/items/rod_dual_plutonium.png differ diff --git a/assets/hbm/textures/items/rod_dual_plutonium_fuel.png b/assets/hbm/textures/items/rod_dual_plutonium_fuel.png index 858443384..0cd7608f8 100644 Binary files a/assets/hbm/textures/items/rod_dual_plutonium_fuel.png and b/assets/hbm/textures/items/rod_dual_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_plutonium_fuel_depleted.png b/assets/hbm/textures/items/rod_dual_plutonium_fuel_depleted.png index b235456ae..a828baffb 100644 Binary files a/assets/hbm/textures/items/rod_dual_plutonium_fuel_depleted.png and b/assets/hbm/textures/items/rod_dual_plutonium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_dual_pu238.png b/assets/hbm/textures/items/rod_dual_pu238.png index 585ae25be..a986bab44 100644 Binary files a/assets/hbm/textures/items/rod_dual_pu238.png and b/assets/hbm/textures/items/rod_dual_pu238.png differ diff --git a/assets/hbm/textures/items/rod_dual_pu239.png b/assets/hbm/textures/items/rod_dual_pu239.png index 059b23678..9c4aad651 100644 Binary files a/assets/hbm/textures/items/rod_dual_pu239.png and b/assets/hbm/textures/items/rod_dual_pu239.png differ diff --git a/assets/hbm/textures/items/rod_dual_pu240.png b/assets/hbm/textures/items/rod_dual_pu240.png index ff37fc6d9..e5c2e74df 100644 Binary files a/assets/hbm/textures/items/rod_dual_pu240.png and b/assets/hbm/textures/items/rod_dual_pu240.png differ diff --git a/assets/hbm/textures/items/rod_dual_schrabidium.png b/assets/hbm/textures/items/rod_dual_schrabidium.png index f12376031..e9660da59 100644 Binary files a/assets/hbm/textures/items/rod_dual_schrabidium.png and b/assets/hbm/textures/items/rod_dual_schrabidium.png differ diff --git a/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png b/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png index 9d6de319f..040a61e85 100644 Binary files a/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png and b/assets/hbm/textures/items/rod_dual_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_schrabidium_fuel_depleted.png b/assets/hbm/textures/items/rod_dual_schrabidium_fuel_depleted.png index 98cc9f85c..00afbce8e 100644 Binary files a/assets/hbm/textures/items/rod_dual_schrabidium_fuel_depleted.png and b/assets/hbm/textures/items/rod_dual_schrabidium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_dual_solinium.png b/assets/hbm/textures/items/rod_dual_solinium.png index 81c2d1967..8f463968c 100644 Binary files a/assets/hbm/textures/items/rod_dual_solinium.png and b/assets/hbm/textures/items/rod_dual_solinium.png differ diff --git a/assets/hbm/textures/items/rod_dual_th232.png b/assets/hbm/textures/items/rod_dual_th232.png index 04ba8b8a3..eeeba502a 100644 Binary files a/assets/hbm/textures/items/rod_dual_th232.png and b/assets/hbm/textures/items/rod_dual_th232.png differ diff --git a/assets/hbm/textures/items/rod_dual_thorium_fuel.png b/assets/hbm/textures/items/rod_dual_thorium_fuel.png index 0385a8672..e7b4a5a8d 100644 Binary files a/assets/hbm/textures/items/rod_dual_thorium_fuel.png and b/assets/hbm/textures/items/rod_dual_thorium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_thorium_fuel_depleted.png b/assets/hbm/textures/items/rod_dual_thorium_fuel_depleted.png index c6810bf10..eec1abeb4 100644 Binary files a/assets/hbm/textures/items/rod_dual_thorium_fuel_depleted.png and b/assets/hbm/textures/items/rod_dual_thorium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_dual_tritium.png b/assets/hbm/textures/items/rod_dual_tritium.png index 4b812cf0b..43085ed32 100644 Binary files a/assets/hbm/textures/items/rod_dual_tritium.png and b/assets/hbm/textures/items/rod_dual_tritium.png differ diff --git a/assets/hbm/textures/items/rod_dual_u233.png b/assets/hbm/textures/items/rod_dual_u233.png index d01fcb129..1afcbe290 100644 Binary files a/assets/hbm/textures/items/rod_dual_u233.png and b/assets/hbm/textures/items/rod_dual_u233.png differ diff --git a/assets/hbm/textures/items/rod_dual_u235.png b/assets/hbm/textures/items/rod_dual_u235.png index 865257160..589c250f1 100644 Binary files a/assets/hbm/textures/items/rod_dual_u235.png and b/assets/hbm/textures/items/rod_dual_u235.png differ diff --git a/assets/hbm/textures/items/rod_dual_u238.png b/assets/hbm/textures/items/rod_dual_u238.png index e5fba3a33..c40c544ef 100644 Binary files a/assets/hbm/textures/items/rod_dual_u238.png and b/assets/hbm/textures/items/rod_dual_u238.png differ diff --git a/assets/hbm/textures/items/rod_dual_uranium.png b/assets/hbm/textures/items/rod_dual_uranium.png index ba44e3cd2..cdf06f687 100644 Binary files a/assets/hbm/textures/items/rod_dual_uranium.png and b/assets/hbm/textures/items/rod_dual_uranium.png differ diff --git a/assets/hbm/textures/items/rod_dual_uranium_fuel.png b/assets/hbm/textures/items/rod_dual_uranium_fuel.png index 22450dda7..6c085ae10 100644 Binary files a/assets/hbm/textures/items/rod_dual_uranium_fuel.png and b/assets/hbm/textures/items/rod_dual_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_dual_uranium_fuel_depleted.png b/assets/hbm/textures/items/rod_dual_uranium_fuel_depleted.png index 4e5e8431f..b2277be5e 100644 Binary files a/assets/hbm/textures/items/rod_dual_uranium_fuel_depleted.png and b/assets/hbm/textures/items/rod_dual_uranium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_dual_waste.png b/assets/hbm/textures/items/rod_dual_waste.png index 6b9836e6d..7c8ffa963 100644 Binary files a/assets/hbm/textures/items/rod_dual_waste.png and b/assets/hbm/textures/items/rod_dual_waste.png differ diff --git a/assets/hbm/textures/items/rod_dual_water.png b/assets/hbm/textures/items/rod_dual_water.png index 4f35700d5..e29b72035 100644 Binary files a/assets/hbm/textures/items/rod_dual_water.png and b/assets/hbm/textures/items/rod_dual_water.png differ diff --git a/assets/hbm/textures/items/rod_empty.png b/assets/hbm/textures/items/rod_empty.png index 87b63645d..34234a3f3 100644 Binary files a/assets/hbm/textures/items/rod_empty.png and b/assets/hbm/textures/items/rod_empty.png differ diff --git a/assets/hbm/textures/items/rod_euphemium.png b/assets/hbm/textures/items/rod_euphemium.png index 2b37f5b41..6859bb821 100644 Binary files a/assets/hbm/textures/items/rod_euphemium.png and b/assets/hbm/textures/items/rod_euphemium.png differ diff --git a/assets/hbm/textures/items/rod_lead.png b/assets/hbm/textures/items/rod_lead.png index a54574f7b..c7d0ecf0b 100644 Binary files a/assets/hbm/textures/items/rod_lead.png and b/assets/hbm/textures/items/rod_lead.png differ diff --git a/assets/hbm/textures/items/rod_lithium.png b/assets/hbm/textures/items/rod_lithium.png index 20a27e791..f5caceea2 100644 Binary files a/assets/hbm/textures/items/rod_lithium.png and b/assets/hbm/textures/items/rod_lithium.png differ diff --git a/assets/hbm/textures/items/rod_mox_fuel.png b/assets/hbm/textures/items/rod_mox_fuel.png index 007e34bf0..cf683da3b 100644 Binary files a/assets/hbm/textures/items/rod_mox_fuel.png and b/assets/hbm/textures/items/rod_mox_fuel.png differ diff --git a/assets/hbm/textures/items/rod_mox_fuel_depleted.png b/assets/hbm/textures/items/rod_mox_fuel_depleted.png index 0139f6a53..e46a6c538 100644 Binary files a/assets/hbm/textures/items/rod_mox_fuel_depleted.png and b/assets/hbm/textures/items/rod_mox_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_neptunium.png b/assets/hbm/textures/items/rod_neptunium.png index 35629352a..2d47dad61 100644 Binary files a/assets/hbm/textures/items/rod_neptunium.png and b/assets/hbm/textures/items/rod_neptunium.png differ diff --git a/assets/hbm/textures/items/rod_plutonium.png b/assets/hbm/textures/items/rod_plutonium.png index 6cfd83cc8..71f212f2f 100644 Binary files a/assets/hbm/textures/items/rod_plutonium.png and b/assets/hbm/textures/items/rod_plutonium.png differ diff --git a/assets/hbm/textures/items/rod_plutonium_fuel.png b/assets/hbm/textures/items/rod_plutonium_fuel.png index 788f3ecaf..03330f997 100644 Binary files a/assets/hbm/textures/items/rod_plutonium_fuel.png and b/assets/hbm/textures/items/rod_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_plutonium_fuel_depleted.png b/assets/hbm/textures/items/rod_plutonium_fuel_depleted.png index 738ab2103..e46a6c538 100644 Binary files a/assets/hbm/textures/items/rod_plutonium_fuel_depleted.png and b/assets/hbm/textures/items/rod_plutonium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_pu238.png b/assets/hbm/textures/items/rod_pu238.png index 413d74614..f2f4f4f88 100644 Binary files a/assets/hbm/textures/items/rod_pu238.png and b/assets/hbm/textures/items/rod_pu238.png differ diff --git a/assets/hbm/textures/items/rod_pu239.png b/assets/hbm/textures/items/rod_pu239.png index b96471019..898169d0e 100644 Binary files a/assets/hbm/textures/items/rod_pu239.png and b/assets/hbm/textures/items/rod_pu239.png differ diff --git a/assets/hbm/textures/items/rod_pu240.png b/assets/hbm/textures/items/rod_pu240.png index d5bc7b1e6..f81937b28 100644 Binary files a/assets/hbm/textures/items/rod_pu240.png and b/assets/hbm/textures/items/rod_pu240.png differ diff --git a/assets/hbm/textures/items/rod_quad_coolant.png b/assets/hbm/textures/items/rod_quad_coolant.png index 315ff08d1..e5ca3d6f3 100644 Binary files a/assets/hbm/textures/items/rod_quad_coolant.png and b/assets/hbm/textures/items/rod_quad_coolant.png differ diff --git a/assets/hbm/textures/items/rod_quad_empty.png b/assets/hbm/textures/items/rod_quad_empty.png index d0c788f8b..c28f6446b 100644 Binary files a/assets/hbm/textures/items/rod_quad_empty.png and b/assets/hbm/textures/items/rod_quad_empty.png differ diff --git a/assets/hbm/textures/items/rod_quad_euphemium.png b/assets/hbm/textures/items/rod_quad_euphemium.png index 3cea4152a..d2a44cfc7 100644 Binary files a/assets/hbm/textures/items/rod_quad_euphemium.png and b/assets/hbm/textures/items/rod_quad_euphemium.png differ diff --git a/assets/hbm/textures/items/rod_quad_lead.png b/assets/hbm/textures/items/rod_quad_lead.png index 633f6fa24..f0ff0687b 100644 Binary files a/assets/hbm/textures/items/rod_quad_lead.png and b/assets/hbm/textures/items/rod_quad_lead.png differ diff --git a/assets/hbm/textures/items/rod_quad_lithium.png b/assets/hbm/textures/items/rod_quad_lithium.png index 836982e85..ae6141127 100644 Binary files a/assets/hbm/textures/items/rod_quad_lithium.png and b/assets/hbm/textures/items/rod_quad_lithium.png differ diff --git a/assets/hbm/textures/items/rod_quad_mox_fuel.png b/assets/hbm/textures/items/rod_quad_mox_fuel.png index 9612911a6..238443d49 100644 Binary files a/assets/hbm/textures/items/rod_quad_mox_fuel.png and b/assets/hbm/textures/items/rod_quad_mox_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_mox_fuel_depleted.png b/assets/hbm/textures/items/rod_quad_mox_fuel_depleted.png index fa9d49402..eea84040d 100644 Binary files a/assets/hbm/textures/items/rod_quad_mox_fuel_depleted.png and b/assets/hbm/textures/items/rod_quad_mox_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_quad_neptunium.png b/assets/hbm/textures/items/rod_quad_neptunium.png index ede83f004..bf426f0d8 100644 Binary files a/assets/hbm/textures/items/rod_quad_neptunium.png and b/assets/hbm/textures/items/rod_quad_neptunium.png differ diff --git a/assets/hbm/textures/items/rod_quad_plutonium.png b/assets/hbm/textures/items/rod_quad_plutonium.png index 8b7fb73d8..ab9a1ef5b 100644 Binary files a/assets/hbm/textures/items/rod_quad_plutonium.png and b/assets/hbm/textures/items/rod_quad_plutonium.png differ diff --git a/assets/hbm/textures/items/rod_quad_plutonium_fuel.png b/assets/hbm/textures/items/rod_quad_plutonium_fuel.png index f52cfe4a8..c887c5d8d 100644 Binary files a/assets/hbm/textures/items/rod_quad_plutonium_fuel.png and b/assets/hbm/textures/items/rod_quad_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_plutonium_fuel_depleted.png b/assets/hbm/textures/items/rod_quad_plutonium_fuel_depleted.png index 625a70e13..eea84040d 100644 Binary files a/assets/hbm/textures/items/rod_quad_plutonium_fuel_depleted.png and b/assets/hbm/textures/items/rod_quad_plutonium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_quad_pu238.png b/assets/hbm/textures/items/rod_quad_pu238.png index 04b38a688..bd82783eb 100644 Binary files a/assets/hbm/textures/items/rod_quad_pu238.png and b/assets/hbm/textures/items/rod_quad_pu238.png differ diff --git a/assets/hbm/textures/items/rod_quad_pu239.png b/assets/hbm/textures/items/rod_quad_pu239.png index afffff461..a362de2d8 100644 Binary files a/assets/hbm/textures/items/rod_quad_pu239.png and b/assets/hbm/textures/items/rod_quad_pu239.png differ diff --git a/assets/hbm/textures/items/rod_quad_pu240.png b/assets/hbm/textures/items/rod_quad_pu240.png index dfa6e0904..f2c6b8457 100644 Binary files a/assets/hbm/textures/items/rod_quad_pu240.png and b/assets/hbm/textures/items/rod_quad_pu240.png differ diff --git a/assets/hbm/textures/items/rod_quad_schrabidium.png b/assets/hbm/textures/items/rod_quad_schrabidium.png index 97b92dd49..8d10b9aa7 100644 Binary files a/assets/hbm/textures/items/rod_quad_schrabidium.png and b/assets/hbm/textures/items/rod_quad_schrabidium.png differ diff --git a/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png b/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png index f1eb4b577..e93d10ade 100644 Binary files a/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png and b/assets/hbm/textures/items/rod_quad_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_schrabidium_fuel_depleted.png b/assets/hbm/textures/items/rod_quad_schrabidium_fuel_depleted.png index a3209c755..a3aeaa477 100644 Binary files a/assets/hbm/textures/items/rod_quad_schrabidium_fuel_depleted.png and b/assets/hbm/textures/items/rod_quad_schrabidium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_quad_solinium.png b/assets/hbm/textures/items/rod_quad_solinium.png index 54ee64f04..308ea6820 100644 Binary files a/assets/hbm/textures/items/rod_quad_solinium.png and b/assets/hbm/textures/items/rod_quad_solinium.png differ diff --git a/assets/hbm/textures/items/rod_quad_th232.png b/assets/hbm/textures/items/rod_quad_th232.png index f6ccd1ac2..0d93db8fe 100644 Binary files a/assets/hbm/textures/items/rod_quad_th232.png and b/assets/hbm/textures/items/rod_quad_th232.png differ diff --git a/assets/hbm/textures/items/rod_quad_thorium_fuel.png b/assets/hbm/textures/items/rod_quad_thorium_fuel.png index a6f634998..aebde9971 100644 Binary files a/assets/hbm/textures/items/rod_quad_thorium_fuel.png and b/assets/hbm/textures/items/rod_quad_thorium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_thorium_fuel_depleted.png b/assets/hbm/textures/items/rod_quad_thorium_fuel_depleted.png index 2d8c8b2e2..9ba167efb 100644 Binary files a/assets/hbm/textures/items/rod_quad_thorium_fuel_depleted.png and b/assets/hbm/textures/items/rod_quad_thorium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_quad_tritium.png b/assets/hbm/textures/items/rod_quad_tritium.png index 17a032559..42e9e2f5e 100644 Binary files a/assets/hbm/textures/items/rod_quad_tritium.png and b/assets/hbm/textures/items/rod_quad_tritium.png differ diff --git a/assets/hbm/textures/items/rod_quad_u233.png b/assets/hbm/textures/items/rod_quad_u233.png index 96a414bfe..f9ab4acff 100644 Binary files a/assets/hbm/textures/items/rod_quad_u233.png and b/assets/hbm/textures/items/rod_quad_u233.png differ diff --git a/assets/hbm/textures/items/rod_quad_u235.png b/assets/hbm/textures/items/rod_quad_u235.png index 8d2326a66..127494e1f 100644 Binary files a/assets/hbm/textures/items/rod_quad_u235.png and b/assets/hbm/textures/items/rod_quad_u235.png differ diff --git a/assets/hbm/textures/items/rod_quad_u238.png b/assets/hbm/textures/items/rod_quad_u238.png index 2115b8e5b..40aa21ed6 100644 Binary files a/assets/hbm/textures/items/rod_quad_u238.png and b/assets/hbm/textures/items/rod_quad_u238.png differ diff --git a/assets/hbm/textures/items/rod_quad_uranium.png b/assets/hbm/textures/items/rod_quad_uranium.png index 4336762df..ecba979c6 100644 Binary files a/assets/hbm/textures/items/rod_quad_uranium.png and b/assets/hbm/textures/items/rod_quad_uranium.png differ diff --git a/assets/hbm/textures/items/rod_quad_uranium_fuel.png b/assets/hbm/textures/items/rod_quad_uranium_fuel.png index 126c4ef78..a11290034 100644 Binary files a/assets/hbm/textures/items/rod_quad_uranium_fuel.png and b/assets/hbm/textures/items/rod_quad_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_quad_uranium_fuel_depleted.png b/assets/hbm/textures/items/rod_quad_uranium_fuel_depleted.png index 1690ef131..8db437b84 100644 Binary files a/assets/hbm/textures/items/rod_quad_uranium_fuel_depleted.png and b/assets/hbm/textures/items/rod_quad_uranium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_quad_waste.png b/assets/hbm/textures/items/rod_quad_waste.png index 0ecf0a55d..974316d89 100644 Binary files a/assets/hbm/textures/items/rod_quad_waste.png and b/assets/hbm/textures/items/rod_quad_waste.png differ diff --git a/assets/hbm/textures/items/rod_quad_water.png b/assets/hbm/textures/items/rod_quad_water.png index a51ec0e52..10b021ebb 100644 Binary files a/assets/hbm/textures/items/rod_quad_water.png and b/assets/hbm/textures/items/rod_quad_water.png differ diff --git a/assets/hbm/textures/items/rod_reiium.png b/assets/hbm/textures/items/rod_reiium.png index 46f0c9f8e..a7a347814 100644 Binary files a/assets/hbm/textures/items/rod_reiium.png and b/assets/hbm/textures/items/rod_reiium.png differ diff --git a/assets/hbm/textures/items/rod_schrabidium.png b/assets/hbm/textures/items/rod_schrabidium.png index a5115d2ca..2ebde423c 100644 Binary files a/assets/hbm/textures/items/rod_schrabidium.png and b/assets/hbm/textures/items/rod_schrabidium.png differ diff --git a/assets/hbm/textures/items/rod_schrabidium_fuel.png b/assets/hbm/textures/items/rod_schrabidium_fuel.png index 060506e90..e3770b942 100644 Binary files a/assets/hbm/textures/items/rod_schrabidium_fuel.png and b/assets/hbm/textures/items/rod_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_schrabidium_fuel_depleted.png b/assets/hbm/textures/items/rod_schrabidium_fuel_depleted.png index 7ec4fc592..bd6a7b4a0 100644 Binary files a/assets/hbm/textures/items/rod_schrabidium_fuel_depleted.png and b/assets/hbm/textures/items/rod_schrabidium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_solinium.png b/assets/hbm/textures/items/rod_solinium.png index 2ec672ec9..5e41ea50c 100644 Binary files a/assets/hbm/textures/items/rod_solinium.png and b/assets/hbm/textures/items/rod_solinium.png differ diff --git a/assets/hbm/textures/items/rod_th232.png b/assets/hbm/textures/items/rod_th232.png index abd45afbf..66cb5ab05 100644 Binary files a/assets/hbm/textures/items/rod_th232.png and b/assets/hbm/textures/items/rod_th232.png differ diff --git a/assets/hbm/textures/items/rod_thorium_fuel.png b/assets/hbm/textures/items/rod_thorium_fuel.png index 829477e5c..09d217d87 100644 Binary files a/assets/hbm/textures/items/rod_thorium_fuel.png and b/assets/hbm/textures/items/rod_thorium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_thorium_fuel_depleted.png b/assets/hbm/textures/items/rod_thorium_fuel_depleted.png index 3784ad68d..18a73ac23 100644 Binary files a/assets/hbm/textures/items/rod_thorium_fuel_depleted.png and b/assets/hbm/textures/items/rod_thorium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_tritium.png b/assets/hbm/textures/items/rod_tritium.png index 1462d108a..a6444aa29 100644 Binary files a/assets/hbm/textures/items/rod_tritium.png and b/assets/hbm/textures/items/rod_tritium.png differ diff --git a/assets/hbm/textures/items/rod_u233.png b/assets/hbm/textures/items/rod_u233.png index e57cf4f4b..e286fd79d 100644 Binary files a/assets/hbm/textures/items/rod_u233.png and b/assets/hbm/textures/items/rod_u233.png differ diff --git a/assets/hbm/textures/items/rod_u235.png b/assets/hbm/textures/items/rod_u235.png index 8b2e29ce6..4a5791c63 100644 Binary files a/assets/hbm/textures/items/rod_u235.png and b/assets/hbm/textures/items/rod_u235.png differ diff --git a/assets/hbm/textures/items/rod_u238.png b/assets/hbm/textures/items/rod_u238.png index 4b5afa375..b163fdfda 100644 Binary files a/assets/hbm/textures/items/rod_u238.png and b/assets/hbm/textures/items/rod_u238.png differ diff --git a/assets/hbm/textures/items/rod_unobtainium.png b/assets/hbm/textures/items/rod_unobtainium.png index 1a377e79a..1afe4b705 100644 Binary files a/assets/hbm/textures/items/rod_unobtainium.png and b/assets/hbm/textures/items/rod_unobtainium.png differ diff --git a/assets/hbm/textures/items/rod_uranium.png b/assets/hbm/textures/items/rod_uranium.png index bd6180898..51267b3ff 100644 Binary files a/assets/hbm/textures/items/rod_uranium.png and b/assets/hbm/textures/items/rod_uranium.png differ diff --git a/assets/hbm/textures/items/rod_uranium_fuel.png b/assets/hbm/textures/items/rod_uranium_fuel.png index f0a7fca7e..2022f0267 100644 Binary files a/assets/hbm/textures/items/rod_uranium_fuel.png and b/assets/hbm/textures/items/rod_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/rod_uranium_fuel_depleted.png b/assets/hbm/textures/items/rod_uranium_fuel_depleted.png index 619839b7b..2bd574f1e 100644 Binary files a/assets/hbm/textures/items/rod_uranium_fuel_depleted.png and b/assets/hbm/textures/items/rod_uranium_fuel_depleted.png differ diff --git a/assets/hbm/textures/items/rod_verticium.png b/assets/hbm/textures/items/rod_verticium.png index 19028bb69..a44e58b90 100644 Binary files a/assets/hbm/textures/items/rod_verticium.png and b/assets/hbm/textures/items/rod_verticium.png differ diff --git a/assets/hbm/textures/items/rod_waste.png b/assets/hbm/textures/items/rod_waste.png index 6b217b750..92e8471a0 100644 Binary files a/assets/hbm/textures/items/rod_waste.png and b/assets/hbm/textures/items/rod_waste.png differ diff --git a/assets/hbm/textures/items/rod_water.png b/assets/hbm/textures/items/rod_water.png index 5fe5e70da..ebb15628a 100644 Binary files a/assets/hbm/textures/items/rod_water.png and b/assets/hbm/textures/items/rod_water.png differ diff --git a/assets/hbm/textures/items/rod_weidanium.png b/assets/hbm/textures/items/rod_weidanium.png index 5eb4076fa..c691f25f3 100644 Binary files a/assets/hbm/textures/items/rod_weidanium.png and b/assets/hbm/textures/items/rod_weidanium.png differ diff --git a/assets/hbm/textures/items/schrabidium_axe.png b/assets/hbm/textures/items/schrabidium_axe.png index f6298a24d..66632c793 100644 Binary files a/assets/hbm/textures/items/schrabidium_axe.png and b/assets/hbm/textures/items/schrabidium_axe.png differ diff --git a/assets/hbm/textures/items/schrabidium_hoe.png b/assets/hbm/textures/items/schrabidium_hoe.png index 2e6878b7a..5434410f0 100644 Binary files a/assets/hbm/textures/items/schrabidium_hoe.png and b/assets/hbm/textures/items/schrabidium_hoe.png differ diff --git a/assets/hbm/textures/items/schrabidium_pickaxe.png b/assets/hbm/textures/items/schrabidium_pickaxe.png index 96be57e0f..f59ab8e6c 100644 Binary files a/assets/hbm/textures/items/schrabidium_pickaxe.png and b/assets/hbm/textures/items/schrabidium_pickaxe.png differ diff --git a/assets/hbm/textures/items/schrabidium_shovel.png b/assets/hbm/textures/items/schrabidium_shovel.png index f4cbeda9c..f203ff8cf 100644 Binary files a/assets/hbm/textures/items/schrabidium_shovel.png and b/assets/hbm/textures/items/schrabidium_shovel.png differ diff --git a/assets/hbm/textures/items/schrabidium_sword.png b/assets/hbm/textures/items/schrabidium_sword.png index d6f406635..a96a9e88e 100644 Binary files a/assets/hbm/textures/items/schrabidium_sword.png and b/assets/hbm/textures/items/schrabidium_sword.png differ diff --git a/assets/hbm/textures/items/steel_axe.png b/assets/hbm/textures/items/steel_axe.png index 9c1fa76db..98a744194 100644 Binary files a/assets/hbm/textures/items/steel_axe.png and b/assets/hbm/textures/items/steel_axe.png differ diff --git a/assets/hbm/textures/items/steel_hoe.png b/assets/hbm/textures/items/steel_hoe.png index 3c4633a00..80783ac6a 100644 Binary files a/assets/hbm/textures/items/steel_hoe.png and b/assets/hbm/textures/items/steel_hoe.png differ diff --git a/assets/hbm/textures/items/steel_pickaxe.png b/assets/hbm/textures/items/steel_pickaxe.png index a2358d23c..eb8f91e85 100644 Binary files a/assets/hbm/textures/items/steel_pickaxe.png and b/assets/hbm/textures/items/steel_pickaxe.png differ diff --git a/assets/hbm/textures/items/steel_shovel.png b/assets/hbm/textures/items/steel_shovel.png index 1a2a1e91d..e8bfcb9fe 100644 Binary files a/assets/hbm/textures/items/steel_shovel.png and b/assets/hbm/textures/items/steel_shovel.png differ diff --git a/assets/hbm/textures/items/steel_sword.png b/assets/hbm/textures/items/steel_sword.png index edf914a1e..fa6ce4b64 100644 Binary files a/assets/hbm/textures/items/steel_sword.png and b/assets/hbm/textures/items/steel_sword.png differ diff --git a/assets/hbm/textures/items/titanium_axe.png b/assets/hbm/textures/items/titanium_axe.png index bc5c2ee4d..2a87f9477 100644 Binary files a/assets/hbm/textures/items/titanium_axe.png and b/assets/hbm/textures/items/titanium_axe.png differ diff --git a/assets/hbm/textures/items/titanium_hoe.png b/assets/hbm/textures/items/titanium_hoe.png index 09df9ec2e..0a93362dd 100644 Binary files a/assets/hbm/textures/items/titanium_hoe.png and b/assets/hbm/textures/items/titanium_hoe.png differ diff --git a/assets/hbm/textures/items/titanium_pickaxe.png b/assets/hbm/textures/items/titanium_pickaxe.png index 897056f30..65f2b268b 100644 Binary files a/assets/hbm/textures/items/titanium_pickaxe.png and b/assets/hbm/textures/items/titanium_pickaxe.png differ diff --git a/assets/hbm/textures/items/titanium_shovel.png b/assets/hbm/textures/items/titanium_shovel.png index 3b4a6ce10..998cbc36c 100644 Binary files a/assets/hbm/textures/items/titanium_shovel.png and b/assets/hbm/textures/items/titanium_shovel.png differ diff --git a/assets/hbm/textures/items/titanium_sword.png b/assets/hbm/textures/items/titanium_sword.png index 821b37636..0dca026eb 100644 Binary files a/assets/hbm/textures/items/titanium_sword.png and b/assets/hbm/textures/items/titanium_sword.png differ diff --git a/assets/hbm/textures/models/capes/CapeSchrabby.png b/assets/hbm/textures/models/capes/CapeSchrabby.png new file mode 100644 index 000000000..578d8cfc4 Binary files /dev/null and b/assets/hbm/textures/models/capes/CapeSchrabby.png differ diff --git a/assets/hbm/textures/models/capes/CapeSchrabbyAlt.png b/assets/hbm/textures/models/capes/CapeSchrabbyAlt.png new file mode 100644 index 000000000..43ba4bb00 Binary files /dev/null and b/assets/hbm/textures/models/capes/CapeSchrabbyAlt.png differ diff --git a/assets/hbm/textures/models/soyuz_launcher/launcher_support.png b/assets/hbm/textures/models/soyuz_launcher/launcher_support.png index 42aa4d818..e82fc9a42 100644 Binary files a/assets/hbm/textures/models/soyuz_launcher/launcher_support.png and b/assets/hbm/textures/models/soyuz_launcher/launcher_support.png differ diff --git a/assets/hbm/textures/models/soyuz_launcher/launcher_tower.png b/assets/hbm/textures/models/soyuz_launcher/launcher_tower.png index c9b22ae39..798769605 100644 Binary files a/assets/hbm/textures/models/soyuz_launcher/launcher_tower.png and b/assets/hbm/textures/models/soyuz_launcher/launcher_tower.png differ diff --git a/com/hbm/entity/effect/EntityBlackHole.java b/com/hbm/entity/effect/EntityBlackHole.java index 33819e28b..5050c7085 100644 --- a/com/hbm/entity/effect/EntityBlackHole.java +++ b/com/hbm/entity/effect/EntityBlackHole.java @@ -74,7 +74,7 @@ public class EntityBlackHole extends Entity { ExplosionNukeGeneric.succ(worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, (int)Math.ceil(size * 15)); - if(ExplosionNukeGeneric.dedify(worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, (int)Math.ceil(size * 2))) { + if(!worldObj.isRemote && ExplosionNukeGeneric.dedify(worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, (int)Math.ceil(size * 2))) { this.setDead(); int r = (int)Math.ceil(size); int r2 = r * r; diff --git a/com/hbm/entity/missile/EntitySoyuz.java b/com/hbm/entity/missile/EntitySoyuz.java index 47b894ae2..ba6ff5f2f 100644 --- a/com/hbm/entity/missile/EntitySoyuz.java +++ b/com/hbm/entity/missile/EntitySoyuz.java @@ -2,6 +2,7 @@ package com.hbm.entity.missile; import java.util.List; +import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; @@ -10,6 +11,7 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -41,9 +43,12 @@ public class EntitySoyuz extends Entity { if(!worldObj.isRemote) { - //if(this.ticksExisted < 20) { - // ExplosionLarge.spawnShock(worldObj, posX, posY, posZ, 13 + rand.nextInt(3), 4 + rand.nextGaussian() * 2); - //} + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox(posX - 5, posY - 15, posZ - 5, posX + 5, posY, posZ + 5)); + + for(Entity e : list) { + e.setFire(15); + e.attackEntityFrom(ModDamageSource.exhaust, 100.0F); + } } if(worldObj.isRemote) { diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 8c9a62f03..2db39b645 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -4271,14 +4271,14 @@ public class ModItems { GameRegistry.registerItem(rod_dual_th232, rod_dual_th232.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_th232, rod_quad_th232.getUnlocalizedName()); - GameRegistry.registerItem(rod_u235, rod_u235.getUnlocalizedName()); - GameRegistry.registerItem(rod_dual_u235, rod_dual_u235.getUnlocalizedName()); - GameRegistry.registerItem(rod_quad_u235, rod_quad_u235.getUnlocalizedName()); - GameRegistry.registerItem(rod_u233, rod_u233.getUnlocalizedName()); GameRegistry.registerItem(rod_dual_u233, rod_dual_u233.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_u233, rod_quad_u233.getUnlocalizedName()); + GameRegistry.registerItem(rod_u235, rod_u235.getUnlocalizedName()); + GameRegistry.registerItem(rod_dual_u235, rod_dual_u235.getUnlocalizedName()); + GameRegistry.registerItem(rod_quad_u235, rod_quad_u235.getUnlocalizedName()); + GameRegistry.registerItem(rod_u238, rod_u238.getUnlocalizedName()); GameRegistry.registerItem(rod_dual_u238, rod_dual_u238.getUnlocalizedName()); GameRegistry.registerItem(rod_quad_u238, rod_quad_u238.getUnlocalizedName()); diff --git a/com/hbm/items/tool/ItemMultitoolPassive.java b/com/hbm/items/tool/ItemMultitoolPassive.java index 41b6d2156..9b7fc43e5 100644 --- a/com/hbm/items/tool/ItemMultitoolPassive.java +++ b/com/hbm/items/tool/ItemMultitoolPassive.java @@ -126,7 +126,7 @@ public class ItemMultitoolPassive extends Item { if(s != null) { ItemStack t = s.copy(); if(!world.isRemote) - world.setBlock(x, y, z, Blocks.air); + world.setBlock(x, y, z, Blocks.air, 0, 3); if(!player.inventory.addItemStackToInventory(t)) player.dropPlayerItemWithRandomChoice(t, false); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 5f807fb94..2cb1708a0 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -69,6 +69,7 @@ public class Library { public static String Steelcourage = "ac49720b-4a9a-4459-a26f-bee92160287a"; public static String GOD___TM = "57146e3f-16b5-4e9f-b0b8-139bec2ca2cb"; public static String ZippySqrl = "03c20435-a229-489a-a1a1-671b803f7017"; + public static String Schrabby = "3a4a1944-5154-4e67-b80a-b6561e8630b7"; public static List superuser = new ArrayList(); diff --git a/com/hbm/lib/ModDamageSource.java b/com/hbm/lib/ModDamageSource.java index 01d98cfd3..76321f2f7 100644 --- a/com/hbm/lib/ModDamageSource.java +++ b/com/hbm/lib/ModDamageSource.java @@ -45,6 +45,7 @@ public class ModDamageSource extends DamageSource { public static DamageSource lead = (new DamageSource("lead")).setDamageIsAbsolute().setDamageBypassesArmor(); public static DamageSource enervation = (new DamageSource("enervation")).setDamageIsAbsolute().setDamageBypassesArmor(); public static DamageSource electricity = (new DamageSource("electricity")).setDamageIsAbsolute().setDamageBypassesArmor(); + public static DamageSource exhaust = (new DamageSource("exhaust")).setDamageIsAbsolute().setDamageBypassesArmor(); public ModDamageSource(String p_i1566_1_) { super(p_i1566_1_); diff --git a/com/hbm/render/util/RenderAccessoryUtility.java b/com/hbm/render/util/RenderAccessoryUtility.java index 5ed75cd8a..316c0a229 100644 --- a/com/hbm/render/util/RenderAccessoryUtility.java +++ b/com/hbm/render/util/RenderAccessoryUtility.java @@ -25,6 +25,7 @@ public class RenderAccessoryUtility { private static ResourceLocation god_tm = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeGodTM.png"); private static ResourceLocation zippy = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeZippySqrl.png"); 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"); public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { @@ -78,6 +79,9 @@ public class RenderAccessoryUtility { if(uuid.equals(Library.ZippySqrl)) { return zippy; } + if(uuid.equals(Library.Schrabby)) { + return schrabby; + } if(name.startsWith("Player")) { return test; } diff --git a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java index 0087c35a3..336501d77 100644 --- a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java +++ b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java @@ -139,6 +139,16 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS } } + public void invalidate() { + + super.invalidate(); + + if(audio != null) { + audio.stopSound(); + audio = null; + } + } + public void networkUnpack(NBTTagCompound data) { power = data.getLong("power"); mode = data.getByte("mode");