diff --git a/README.md b/README.md index 307896b10..84a760f20 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ https://minecraft.curseforge.com/projects/hbms-nuclear-tech-mod?gameCategorySlug=mc-mods&projectID=235439 ## Installation Instructions + +### Important note: Forge has since dropped support for 1.7.10, quite a few things are not going to work from the getgo. THIS IS NOT MY FAULT, so please, instead of opening an issue on this repository and making it my problem too, use this handy thing called "google" for instructions on how to fix 1.7.10 workspaces. The dependencies are also no longer available on the official forge site, you might have to resort to different versions of the CodeChicken mods, simply change the build.gradle file accordingly and check the code for any errors. + Tired of waiting until the next version comes out? Here is a tutorial on how to compile the very newest version yourself: 1. Download minecraft forge 1.7.10 src 2. Unpack it somewhere diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index fd6d26f1d..8a0b0df7a 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -171,6 +171,7 @@ chem.XENON=Lindeverfahren (Xenon) item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep item.record.vc.desc=Valve - Vortal Combat +item.record.glass.desc=? ? ? death.attack.nuclearBlast=%1$s wurde von einer Atomexplosion weggeblasen. death.attack.revolverBullet=%1$s wurde von %2$s in den Kopf geschossen. diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index c192497c6..74a8459a5 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -171,6 +171,7 @@ chem.XENON=Linde Xenon Cycle item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep item.record.vc.desc=Valve - Vortal Combat +item.record.glass.desc=? ? ? death.attack.nuclearBlast=%1$s was blown away by a nuclear explosion. death.attack.revolverBullet=%1$s was shot in the head by %2$s. diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 53602e42e..8dbc8655a 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -55,6 +55,7 @@ "music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]}, "music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]}, "music.recordVortalCombat": {"category": "record", "sounds": [{"name": "music/recordVortalCombat", "stream": true}]}, + "music.transmission": {"category": "record", "sounds": [{"name": "music/transmission", "stream": true}]}, "weapon.tauShoot": {"category": "player", "sounds": [{"name": "weapon/tauShoot", "stream": false}]}, "weapon.tauChargeLoop2": {"category": "player", "sounds": [{"name": "weapon/tauChargeLoop2", "stream": true}]}, diff --git a/assets/hbm/sounds/music/transmission.ogg b/assets/hbm/sounds/music/transmission.ogg new file mode 100644 index 000000000..e909ea0b3 Binary files /dev/null and b/assets/hbm/sounds/music/transmission.ogg differ diff --git a/assets/hbm/textures/blocks/dfc_core.png b/assets/hbm/textures/blocks/dfc_core.png index 8af6fe16d..995d8637a 100644 Binary files a/assets/hbm/textures/blocks/dfc_core.png and b/assets/hbm/textures/blocks/dfc_core.png differ diff --git a/assets/hbm/textures/items/cobalt_leggings.png b/assets/hbm/textures/items/cobalt_legs.png similarity index 100% rename from assets/hbm/textures/items/cobalt_leggings.png rename to assets/hbm/textures/items/cobalt_legs.png diff --git a/assets/hbm/textures/items/dynosphere_desh.png b/assets/hbm/textures/items/dynosphere_desh.png index 85cc2adfd..715386484 100644 Binary files a/assets/hbm/textures/items/dynosphere_desh.png and b/assets/hbm/textures/items/dynosphere_desh.png differ diff --git a/assets/hbm/textures/items/dynosphere_desh_charged.png b/assets/hbm/textures/items/dynosphere_desh_charged.png index 59b9f18ff..34398c603 100644 Binary files a/assets/hbm/textures/items/dynosphere_desh_charged.png and b/assets/hbm/textures/items/dynosphere_desh_charged.png differ diff --git a/assets/hbm/textures/items/dynosphere_dineutronium.png b/assets/hbm/textures/items/dynosphere_dineutronium.png index c88a935db..7b79c52aa 100644 Binary files a/assets/hbm/textures/items/dynosphere_dineutronium.png and b/assets/hbm/textures/items/dynosphere_dineutronium.png differ diff --git a/assets/hbm/textures/items/dynosphere_dineutronium_charged.png b/assets/hbm/textures/items/dynosphere_dineutronium_charged.png index 38117925c..98495bcad 100644 Binary files a/assets/hbm/textures/items/dynosphere_dineutronium_charged.png and b/assets/hbm/textures/items/dynosphere_dineutronium_charged.png differ diff --git a/assets/hbm/textures/items/dynosphere_euphemium.png b/assets/hbm/textures/items/dynosphere_euphemium.png index e5995b218..6b44d7721 100644 Binary files a/assets/hbm/textures/items/dynosphere_euphemium.png and b/assets/hbm/textures/items/dynosphere_euphemium.png differ diff --git a/assets/hbm/textures/items/dynosphere_euphemium_charged.png b/assets/hbm/textures/items/dynosphere_euphemium_charged.png index 562755686..5b66a3bc4 100644 Binary files a/assets/hbm/textures/items/dynosphere_euphemium_charged.png and b/assets/hbm/textures/items/dynosphere_euphemium_charged.png differ diff --git a/assets/hbm/textures/items/dynosphere_schrabidium.png b/assets/hbm/textures/items/dynosphere_schrabidium.png index feabea1b8..8204ae217 100644 Binary files a/assets/hbm/textures/items/dynosphere_schrabidium.png and b/assets/hbm/textures/items/dynosphere_schrabidium.png differ diff --git a/assets/hbm/textures/items/dynosphere_schrabidium_charged.png b/assets/hbm/textures/items/dynosphere_schrabidium_charged.png index 4d605201b..9d6c03146 100644 Binary files a/assets/hbm/textures/items/dynosphere_schrabidium_charged.png and b/assets/hbm/textures/items/dynosphere_schrabidium_charged.png differ diff --git a/assets/hbm/textures/items/ingot_hes.png b/assets/hbm/textures/items/ingot_hes.png index 47aa3e5b4..e2dd256e2 100644 Binary files a/assets/hbm/textures/items/ingot_hes.png and b/assets/hbm/textures/items/ingot_hes.png differ diff --git a/assets/hbm/textures/items/ingot_les.png b/assets/hbm/textures/items/ingot_les.png index 6b690e59a..69aa56a7f 100644 Binary files a/assets/hbm/textures/items/ingot_les.png and b/assets/hbm/textures/items/ingot_les.png differ diff --git a/assets/hbm/textures/items/ingot_mox_fuel.png b/assets/hbm/textures/items/ingot_mox_fuel.png index 884f507da..a73a1e564 100644 Binary files a/assets/hbm/textures/items/ingot_mox_fuel.png and b/assets/hbm/textures/items/ingot_mox_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_pu238.png b/assets/hbm/textures/items/ingot_pu238.png index f2758f042..3de4b9d39 100644 Binary files a/assets/hbm/textures/items/ingot_pu238.png and b/assets/hbm/textures/items/ingot_pu238.png differ diff --git a/assets/hbm/textures/items/ingot_pu239.png b/assets/hbm/textures/items/ingot_pu239.png index 0dc5c7e5d..ea95a0a7c 100644 Binary files a/assets/hbm/textures/items/ingot_pu239.png and b/assets/hbm/textures/items/ingot_pu239.png differ diff --git a/assets/hbm/textures/items/ingot_pu240.png b/assets/hbm/textures/items/ingot_pu240.png index 8214d4cbb..292e4f242 100644 Binary files a/assets/hbm/textures/items/ingot_pu240.png and b/assets/hbm/textures/items/ingot_pu240.png differ diff --git a/assets/hbm/textures/items/ingot_thorium_fuel.png b/assets/hbm/textures/items/ingot_thorium_fuel.png index 4d23cd278..dea49f0eb 100644 Binary files a/assets/hbm/textures/items/ingot_thorium_fuel.png and b/assets/hbm/textures/items/ingot_thorium_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_u233.png b/assets/hbm/textures/items/ingot_u233.png index 61ba1a91c..6cbb0bb42 100644 Binary files a/assets/hbm/textures/items/ingot_u233.png and b/assets/hbm/textures/items/ingot_u233.png differ diff --git a/assets/hbm/textures/items/ingot_u235.png b/assets/hbm/textures/items/ingot_u235.png index 013428833..9cfab5a34 100644 Binary files a/assets/hbm/textures/items/ingot_u235.png and b/assets/hbm/textures/items/ingot_u235.png differ diff --git a/assets/hbm/textures/items/ingot_u238.png b/assets/hbm/textures/items/ingot_u238.png index 57b504eef..71a09036e 100644 Binary files a/assets/hbm/textures/items/ingot_u238.png and b/assets/hbm/textures/items/ingot_u238.png differ diff --git a/assets/hbm/textures/items/powder_iodine.png b/assets/hbm/textures/items/powder_iodine.png index 7f13cee60..b6e732bcb 100644 Binary files a/assets/hbm/textures/items/powder_iodine.png and b/assets/hbm/textures/items/powder_iodine.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 19787ac03..f030d2333 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_mox_fuel.png b/assets/hbm/textures/items/rod_mox_fuel.png index cf683da3b..1584afe03 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_quad_mox_fuel.png b/assets/hbm/textures/items/rod_quad_mox_fuel.png index 238443d49..d4274a4d4 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/models/capes/CapeGodTM.png b/assets/hbm/textures/models/capes/CapeGodTM.png index 459608369..8c4b227dd 100644 Binary files a/assets/hbm/textures/models/capes/CapeGodTM.png and b/assets/hbm/textures/models/capes/CapeGodTM.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 7650a531f..386a9e1db 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -826,18 +826,18 @@ public class ModBlocks { ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt"); block_uranium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_uranium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium"); - block_u233 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_u233").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u233"); - block_u235 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_u235").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u235"); + block_u233 = new BlockOre(Material.iron, 10F, 100F).setBlockName("block_u233").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u233"); + block_u235 = new BlockOre(Material.iron, 10F, 100F).setBlockName("block_u235").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u235"); block_u238 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_u238").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_u238"); - block_uranium_fuel = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_uranium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium_fuel"); + block_uranium_fuel = new BlockOre(Material.iron, 2.5F, 50F).setBlockName("block_uranium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium_fuel"); block_thorium = new BlockGeneric(Material.iron).setBlockName("block_thorium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_thorium"); block_thorium_fuel = new BlockGeneric(Material.iron).setBlockName("block_thorium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_thorium_fuel"); - block_neptunium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_neptunium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_neptunium"); - block_plutonium = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_plutonium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_plutonium"); + block_neptunium = new BlockOre(Material.iron, 10F, 100F).setBlockName("block_neptunium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_neptunium"); + block_plutonium = new BlockOre(Material.iron, 15F, 150F).setBlockName("block_plutonium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_plutonium"); block_pu238 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_pu238").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu238"); - block_pu239 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_pu239").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu239"); - block_pu240 = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_pu240").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu240"); - block_plutonium_fuel = new BlockOre(Material.iron, 0.1F, 1.5F).setBlockName("block_plutonium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_plutonium_fuel"); + block_pu239 = new BlockOre(Material.iron, 15F, 150F).setBlockName("block_pu239").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu239"); + block_pu240 = new BlockOre(Material.iron, 10F, 100F).setBlockName("block_pu240").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_pu240"); + block_plutonium_fuel = new BlockOre(Material.iron, 5F, 50F).setBlockName("block_plutonium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_plutonium_fuel"); block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium"); block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur"); block_niter = new BlockGeneric(Material.iron).setBlockName("block_niter").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_niter"); @@ -855,7 +855,7 @@ public class ModBlocks { block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_beryllium"); block_schrabidium = new BlockGeneric(Material.iron).setBlockName("block_schrabidium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium"); block_solinium = new BlockGeneric(Material.iron).setBlockName("block_solinium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_solinium"); - block_schrabidium_fuel = new BlockGeneric(Material.iron).setBlockName("block_schrabidium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium_fuel"); + block_schrabidium_fuel = new BlockOre(Material.iron, 20F, 250F).setBlockName("block_schrabidium_fuel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium_fuel"); block_euphemium = new BlockGeneric(Material.iron).setBlockName("block_euphemium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(60000.0F).setBlockTextureName(RefStrings.MODID + ":block_euphemium"); block_schrabidium_cluster = new BlockGenericPillar(Material.rock).setBlockName("block_schrabidium_cluster").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(60000.0F); block_euphemium_cluster = new BlockGenericPillar(Material.rock).setBlockName("block_euphemium_cluster").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(60000.0F); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 7eb8a5f5a..64fdba6ea 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -38,6 +38,8 @@ import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemSoup; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -1469,6 +1471,14 @@ public class ModItems { public static Item security_plate; public static Item security_legs; public static Item security_boots; + public static Item cobalt_helmet; + public static Item cobalt_plate; + public static Item cobalt_legs; + public static Item cobalt_boots; + public static Item starmetal_helmet; + public static Item starmetal_plate; + public static Item starmetal_legs; + public static Item starmetal_boots; public static Item australium_iii; public static Item australium_iv; @@ -1701,6 +1711,7 @@ public class ModItems { public static Item record_lc; public static Item record_ss; public static Item record_vc; + public static Item record_glass; public static Item polaroid; public static Item glitch; @@ -3281,57 +3292,73 @@ public class ModItems { bobmazon_tools = new ItemCatalog().setUnlocalizedName("bobmazon_tools").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":bobmazon_tools"); bobmazon_hidden = new ItemCatalog().setUnlocalizedName("bobmazon_hidden").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":bobmazon_special"); - 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"); - euphemium_legs = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 2).setUnlocalizedName("euphemium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_legs"); - euphemium_boots = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 3).setUnlocalizedName("euphemium_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_boots"); + euphemium_helmet = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet"); + euphemium_plate = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate"); + euphemium_legs = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 2).setUnlocalizedName("euphemium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_legs"); + euphemium_boots = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 3).setUnlocalizedName("euphemium_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_boots"); goggles = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("goggles").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":goggles"); gas_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask"); gas_mask_m65 = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask_m65").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask_m65"); //oxy_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("oxy_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":oxy_mask"); - t45_helmet = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 0).setUnlocalizedName("t45_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_helmet"); - t45_plate = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 1).setUnlocalizedName("t45_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_plate"); - t45_legs = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 2).setUnlocalizedName("t45_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_legs"); - t45_boots = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 3).setUnlocalizedName("t45_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_boots"); + t45_helmet = new ArmorT45(MainRegistry.aMatT45, 2, 0).setUnlocalizedName("t45_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_helmet"); + t45_plate = new ArmorT45(MainRegistry.aMatT45, 2, 1).setUnlocalizedName("t45_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_plate"); + t45_legs = new ArmorT45(MainRegistry.aMatT45, 2, 2).setUnlocalizedName("t45_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_legs"); + t45_boots = new ArmorT45(MainRegistry.aMatT45, 2, 3).setUnlocalizedName("t45_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_boots"); chainsaw = new ModAxe(MainRegistry.enumToolMaterialChainsaw).setUnlocalizedName("chainsaw").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":chainsaw"); - schrabidium_helmet = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 0, RefStrings.MODID + ":textures/armor/schrabidium_1.png").setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_helmet").setTextureName(RefStrings.MODID + ":schrabidium_helmet"); - schrabidium_plate = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 1, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setUnlocalizedName("schrabidium_plate").setTextureName(RefStrings.MODID + ":schrabidium_plate"); - schrabidium_legs = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 2, RefStrings.MODID + ":textures/armor/schrabidium_2.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_legs").setTextureName(RefStrings.MODID + ":schrabidium_legs"); - schrabidium_boots = new ArmorFSB(MainRegistry.enumArmorMaterialSchrabidium, 7, 3, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_boots").setTextureName(RefStrings.MODID + ":schrabidium_boots"); - titanium_helmet = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 0, RefStrings.MODID + ":textures/armor/titanium_1.png").setMod(0.75F).setUnlocalizedName("titanium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_helmet"); - titanium_plate = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 1, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_plate"); - titanium_legs = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 2, RefStrings.MODID + ":textures/armor/titanium_2.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_legs"); - titanium_boots = new ArmorFSB(MainRegistry.enumArmorMaterialTitanium, 7, 3, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_boots").setTextureName(RefStrings.MODID + ":titanium_boots"); - steel_helmet = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 0).setUnlocalizedName("steel_helmet").setTextureName(RefStrings.MODID + ":steel_helmet"); - steel_plate = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("steel_plate").setTextureName(RefStrings.MODID + ":steel_plate"); - steel_legs = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 2).setUnlocalizedName("steel_legs").setTextureName(RefStrings.MODID + ":steel_legs"); - steel_boots = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 3).setUnlocalizedName("steel_boots").setTextureName(RefStrings.MODID + ":steel_boots"); - alloy_helmet = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 0).setUnlocalizedName("alloy_helmet").setTextureName(RefStrings.MODID + ":alloy_helmet"); - alloy_plate = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 1).setUnlocalizedName("alloy_plate").setTextureName(RefStrings.MODID + ":alloy_plate"); - alloy_legs = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 2).setUnlocalizedName("alloy_legs").setTextureName(RefStrings.MODID + ":alloy_legs"); - alloy_boots = new ModArmor(MainRegistry.enumArmorMaterialAlloy, 7, 3).setUnlocalizedName("alloy_boots").setTextureName(RefStrings.MODID + ":alloy_boots"); - cmb_helmet = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 0).setUnlocalizedName("cmb_helmet").setTextureName(RefStrings.MODID + ":cmb_helmet"); - cmb_plate = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 1).setUnlocalizedName("cmb_plate").setTextureName(RefStrings.MODID + ":cmb_plate"); - cmb_legs = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 2).setUnlocalizedName("cmb_legs").setTextureName(RefStrings.MODID + ":cmb_legs"); - cmb_boots = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 3).setUnlocalizedName("cmb_boots").setTextureName(RefStrings.MODID + ":cmb_boots"); - paa_plate = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 1).setUnlocalizedName("paa_plate").setTextureName(RefStrings.MODID + ":paa_plate"); - paa_legs = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 2).setUnlocalizedName("paa_legs").setTextureName(RefStrings.MODID + ":paa_legs"); - paa_boots = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 3).setUnlocalizedName("paa_boots").setTextureName(RefStrings.MODID + ":paa_boots"); - asbestos_helmet = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 0, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setOverlay(RefStrings.MODID + ":textures/misc/overlay_asbestos.png").setUnlocalizedName("asbestos_helmet").setTextureName(RefStrings.MODID + ":asbestos_helmet"); - asbestos_plate = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 1, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_plate").setTextureName(RefStrings.MODID + ":asbestos_plate"); - asbestos_legs = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 2, RefStrings.MODID + ":textures/armor/asbestos_2.png").setFireproof(true).setUnlocalizedName("asbestos_legs").setTextureName(RefStrings.MODID + ":asbestos_legs"); - asbestos_boots = new ArmorFSB(MainRegistry.enumArmorMaterialAsbestos, 7, 3, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_boots").setTextureName(RefStrings.MODID + ":asbestos_boots"); - security_helmet = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 0).setUnlocalizedName("security_helmet").setTextureName(RefStrings.MODID + ":security_helmet"); - security_plate = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 1).setUnlocalizedName("security_plate").setTextureName(RefStrings.MODID + ":security_plate"); - security_legs = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 2).setUnlocalizedName("security_legs").setTextureName(RefStrings.MODID + ":security_legs"); - security_boots = new ModArmor(MainRegistry.enumArmorMaterialSecurity, 7, 3).setUnlocalizedName("security_boots").setTextureName(RefStrings.MODID + ":security_boots"); + schrabidium_helmet = new ArmorFSB(MainRegistry.aMatSchrab, 7, 0, RefStrings.MODID + ":textures/armor/schrabidium_1.png").setCap(4F).setMod(0.1F) + .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 2)) + .addEffect(new PotionEffect(Potion.damageBoost.id, 20, 2)) + .addEffect(new PotionEffect(Potion.jump.id, 20, 1)) + .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 2)) + .addEffect(new PotionEffect(Potion.field_76443_y.id, 20, 0)).setUnlocalizedName("schrabidium_helmet").setTextureName(RefStrings.MODID + ":schrabidium_helmet"); + schrabidium_plate = new ArmorFSB(MainRegistry.aMatSchrab, 7, 1, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setUnlocalizedName("schrabidium_plate").setTextureName(RefStrings.MODID + ":schrabidium_plate"); + schrabidium_legs = new ArmorFSB(MainRegistry.aMatSchrab, 7, 2, RefStrings.MODID + ":textures/armor/schrabidium_2.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_legs").setTextureName(RefStrings.MODID + ":schrabidium_legs"); + schrabidium_boots = new ArmorFSB(MainRegistry.aMatSchrab, 7, 3, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_boots").setTextureName(RefStrings.MODID + ":schrabidium_boots"); + titanium_helmet = new ArmorFSB(MainRegistry.aMatTitan, 7, 0, RefStrings.MODID + ":textures/armor/titanium_1.png").setMod(0.75F).setUnlocalizedName("titanium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_helmet"); + titanium_plate = new ArmorFSB(MainRegistry.aMatTitan, 7, 1, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_plate"); + titanium_legs = new ArmorFSB(MainRegistry.aMatTitan, 7, 2, RefStrings.MODID + ":textures/armor/titanium_2.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_legs"); + titanium_boots = new ArmorFSB(MainRegistry.aMatTitan, 7, 3, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_boots").setTextureName(RefStrings.MODID + ":titanium_boots"); + steel_helmet = new ArmorFSB(MainRegistry.aMatSteel, 7, 0, RefStrings.MODID + ":textures/armor/steel_1.png").setMod(0.9F).setUnlocalizedName("steel_helmet").setTextureName(RefStrings.MODID + ":steel_helmet"); + steel_plate = new ArmorFSB(MainRegistry.aMatSteel, 7, 1, RefStrings.MODID + ":textures/armor/steel_1.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_plate").setTextureName(RefStrings.MODID + ":steel_plate"); + steel_legs = new ArmorFSB(MainRegistry.aMatSteel, 7, 2, RefStrings.MODID + ":textures/armor/steel_2.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_legs").setTextureName(RefStrings.MODID + ":steel_legs"); + steel_boots = new ArmorFSB(MainRegistry.aMatSteel, 7, 3, RefStrings.MODID + ":textures/armor/steel_1.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_boots").setTextureName(RefStrings.MODID + ":steel_boots"); + alloy_helmet = new ArmorFSB(MainRegistry.aMatAlloy, 7, 0, RefStrings.MODID + ":textures/armor/alloy_1.png").setMod(0.6F).setUnlocalizedName("alloy_helmet").setTextureName(RefStrings.MODID + ":alloy_helmet"); + alloy_plate = new ArmorFSB(MainRegistry.aMatAlloy, 7, 1, RefStrings.MODID + ":textures/armor/alloy_1.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_plate").setTextureName(RefStrings.MODID + ":alloy_plate"); + alloy_legs = new ArmorFSB(MainRegistry.aMatAlloy, 7, 2, RefStrings.MODID + ":textures/armor/alloy_2.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_legs").setTextureName(RefStrings.MODID + ":alloy_legs"); + alloy_boots = new ArmorFSB(MainRegistry.aMatAlloy, 7, 3, RefStrings.MODID + ":textures/armor/alloy_1.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_boots").setTextureName(RefStrings.MODID + ":alloy_boots"); + cmb_helmet = new ArmorFSB(MainRegistry.aMatCMB, 7, 0, RefStrings.MODID + ":textures/armor/cmb_1.png").setCap(10F).setMod(0.5F) + .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 2)) + .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 0)).setUnlocalizedName("cmb_helmet").setTextureName(RefStrings.MODID + ":cmb_helmet"); + cmb_plate = new ArmorFSB(MainRegistry.aMatCMB, 7, 1, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_plate").setTextureName(RefStrings.MODID + ":cmb_plate"); + cmb_legs = new ArmorFSB(MainRegistry.aMatCMB, 7, 2, RefStrings.MODID + ":textures/armor/cmb_2.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_legs").setTextureName(RefStrings.MODID + ":cmb_legs"); + cmb_boots = new ArmorFSB(MainRegistry.aMatCMB, 7, 3, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_boots").setTextureName(RefStrings.MODID + ":cmb_boots"); + paa_plate = new ArmorFSB(MainRegistry.aMatPaa, 7, 1, RefStrings.MODID + ":textures/armor/paa_1.png").setCap(6F).setMod(0.3F).setNoHelmet(true) + .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 0)).setUnlocalizedName("paa_plate").setTextureName(RefStrings.MODID + ":paa_plate"); + paa_legs = new ArmorFSB(MainRegistry.aMatPaa, 7, 2, RefStrings.MODID + ":textures/armor/paa_2.png").cloneStats((ArmorFSB) paa_plate).setUnlocalizedName("paa_legs").setTextureName(RefStrings.MODID + ":paa_legs"); + paa_boots = new ArmorFSB(MainRegistry.aMatPaa, 7, 3, RefStrings.MODID + ":textures/armor/paa_1.png").cloneStats((ArmorFSB) paa_plate).setUnlocalizedName("paa_boots").setTextureName(RefStrings.MODID + ":paa_boots"); + asbestos_helmet = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 0, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setOverlay(RefStrings.MODID + ":textures/misc/overlay_asbestos.png").setUnlocalizedName("asbestos_helmet").setTextureName(RefStrings.MODID + ":asbestos_helmet"); + asbestos_plate = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 1, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_plate").setTextureName(RefStrings.MODID + ":asbestos_plate"); + asbestos_legs = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 2, RefStrings.MODID + ":textures/armor/asbestos_2.png").setFireproof(true).setUnlocalizedName("asbestos_legs").setTextureName(RefStrings.MODID + ":asbestos_legs"); + asbestos_boots = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 3, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_boots").setTextureName(RefStrings.MODID + ":asbestos_boots"); + security_helmet = new ArmorFSB(MainRegistry.aMatSecurity, 7, 0, RefStrings.MODID + ":textures/armor/security_1.png").setMod(0.5F).setUnlocalizedName("security_helmet").setTextureName(RefStrings.MODID + ":security_helmet"); + security_plate = new ArmorFSB(MainRegistry.aMatSecurity, 7, 1, RefStrings.MODID + ":textures/armor/security_1.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_plate").setTextureName(RefStrings.MODID + ":security_plate"); + security_legs = new ArmorFSB(MainRegistry.aMatSecurity, 7, 2, RefStrings.MODID + ":textures/armor/security_2.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_legs").setTextureName(RefStrings.MODID + ":security_legs"); + security_boots = new ArmorFSB(MainRegistry.aMatSecurity, 7, 3, RefStrings.MODID + ":textures/armor/security_1.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_boots").setTextureName(RefStrings.MODID + ":security_boots"); + cobalt_helmet = new ArmorFSB(MainRegistry.aMatCobalt, 7, 0, RefStrings.MODID + ":textures/armor/cobalt_1.png").setMod(0.5F).setUnlocalizedName("cobalt_helmet").setTextureName(RefStrings.MODID + ":cobalt_helmet"); + cobalt_plate = new ArmorFSB(MainRegistry.aMatCobalt, 7, 1, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_plate").setTextureName(RefStrings.MODID + ":cobalt_plate"); + cobalt_legs = new ArmorFSB(MainRegistry.aMatCobalt, 7, 2, RefStrings.MODID + ":textures/armor/cobalt_2.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_legs").setTextureName(RefStrings.MODID + ":cobalt_legs"); + cobalt_boots = new ArmorFSB(MainRegistry.aMatCobalt, 7, 3, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_boots").setTextureName(RefStrings.MODID + ":cobalt_boots"); + starmetal_helmet = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setMod(0.5F).setUnlocalizedName("starmetal_helmet").setTextureName(RefStrings.MODID + ":starmetal_helmet"); + starmetal_plate = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_plate").setTextureName(RefStrings.MODID + ":starmetal_plate"); + starmetal_legs = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_legs").setTextureName(RefStrings.MODID + ":starmetal_legs"); + starmetal_boots = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_boots").setTextureName(RefStrings.MODID + ":starmetal_boots"); - jackt = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); - jackt2 = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); + jackt = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); + jackt2 = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); schrabidium_sword = new SwordSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_sword").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_sword"); schrabidium_pickaxe = new PickaxeSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_pickaxe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_pickaxe"); @@ -3370,36 +3397,36 @@ public class ModItems { mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy"); - hazmat_helmet = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat, 9, 0).setUnlocalizedName("hazmat_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet"); - hazmat_plate = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat, 9, 1).setUnlocalizedName("hazmat_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate"); - hazmat_legs = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat, 9, 2).setUnlocalizedName("hazmat_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_legs"); - hazmat_boots = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat, 9, 3).setUnlocalizedName("hazmat_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_boots"); - hazmat_helmet_red = new ArmorModel(MainRegistry.enumArmorMaterialHazmat2, 9, 0).setUnlocalizedName("hazmat_helmet_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet_red"); - hazmat_plate_red = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat2, 9, 1).setUnlocalizedName("hazmat_plate_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate_red"); - hazmat_legs_red = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat2, 9, 2).setUnlocalizedName("hazmat_legs_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_legs_red"); - hazmat_boots_red = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat2, 9, 3).setUnlocalizedName("hazmat_boots_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_boots_red"); - hazmat_helmet_grey = new ArmorModel(MainRegistry.enumArmorMaterialHazmat3, 9, 0).setUnlocalizedName("hazmat_helmet_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet_grey"); - hazmat_plate_grey = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat3, 9, 1).setUnlocalizedName("hazmat_plate_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate_grey"); - hazmat_legs_grey = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat3, 9, 2).setUnlocalizedName("hazmat_legs_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_legs_grey"); - hazmat_boots_grey = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat3, 9, 3).setUnlocalizedName("hazmat_boots_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_boots_grey"); - hazmat_paa_helmet = new ArmorHazmat(MainRegistry.enumArmorMaterialPaa, 9, 0).setUnlocalizedName("hazmat_paa_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_helmet"); - hazmat_paa_plate = new ArmorHazmat(MainRegistry.enumArmorMaterialPaa, 9, 1).setUnlocalizedName("hazmat_paa_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_plate"); - hazmat_paa_legs = new ArmorHazmat(MainRegistry.enumArmorMaterialPaa, 9, 2).setUnlocalizedName("hazmat_paa_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_legs"); - hazmat_paa_boots = new ArmorHazmat(MainRegistry.enumArmorMaterialPaa, 9, 3).setUnlocalizedName("hazmat_paa_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_boots"); + hazmat_helmet = new ArmorHazmat(MainRegistry.aMatHaz, 9, 0).setUnlocalizedName("hazmat_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet"); + hazmat_plate = new ArmorHazmat(MainRegistry.aMatHaz, 9, 1).setUnlocalizedName("hazmat_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate"); + hazmat_legs = new ArmorHazmat(MainRegistry.aMatHaz, 9, 2).setUnlocalizedName("hazmat_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_legs"); + hazmat_boots = new ArmorHazmat(MainRegistry.aMatHaz, 9, 3).setUnlocalizedName("hazmat_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_boots"); + hazmat_helmet_red = new ArmorModel(MainRegistry.aMatHaz2, 9, 0).setUnlocalizedName("hazmat_helmet_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet_red"); + hazmat_plate_red = new ArmorHazmat(MainRegistry.aMatHaz2, 9, 1).setUnlocalizedName("hazmat_plate_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate_red"); + hazmat_legs_red = new ArmorHazmat(MainRegistry.aMatHaz2, 9, 2).setUnlocalizedName("hazmat_legs_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_legs_red"); + hazmat_boots_red = new ArmorHazmat(MainRegistry.aMatHaz2, 9, 3).setUnlocalizedName("hazmat_boots_red").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_boots_red"); + hazmat_helmet_grey = new ArmorModel(MainRegistry.aMatHaz3, 9, 0).setUnlocalizedName("hazmat_helmet_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet_grey"); + hazmat_plate_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 9, 1).setUnlocalizedName("hazmat_plate_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate_grey"); + hazmat_legs_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 9, 2).setUnlocalizedName("hazmat_legs_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_legs_grey"); + hazmat_boots_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 9, 3).setUnlocalizedName("hazmat_boots_grey").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_boots_grey"); + hazmat_paa_helmet = new ArmorHazmat(MainRegistry.aMatPaa, 9, 0).setUnlocalizedName("hazmat_paa_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_helmet"); + hazmat_paa_plate = new ArmorHazmat(MainRegistry.aMatPaa, 9, 1).setUnlocalizedName("hazmat_paa_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_plate"); + hazmat_paa_legs = new ArmorHazmat(MainRegistry.aMatPaa, 9, 2).setUnlocalizedName("hazmat_paa_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_legs"); + hazmat_paa_boots = new ArmorHazmat(MainRegistry.aMatPaa, 9, 3).setUnlocalizedName("hazmat_paa_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_paa_boots"); - australium_iii = new ArmorAustralium(MainRegistry.enumArmorMaterialAusIII, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii"); - australium_iv = new ArmorAustralium(MainRegistry.enumArmorMaterialAusIV, 9, 1).setUnlocalizedName("australium_iv").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iv"); - australium_v = new ArmorAustralium(MainRegistry.enumArmorMaterialAusV, 9, 1).setUnlocalizedName("australium_v").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_v"); + australium_iii = new ArmorAustralium(MainRegistry.aMatAus3, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii"); + //australium_iv = new ArmorAustralium(MainRegistry.enumArmorMaterialAusIV, 9, 1).setUnlocalizedName("australium_iv").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iv"); + //australium_v = new ArmorAustralium(MainRegistry.enumArmorMaterialAusV, 9, 1).setUnlocalizedName("australium_v").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_v"); - jetpack_boost = new JetpackBooster(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_boost").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost"); - jetpack_break = new JetpackBreak(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_break").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break"); - jetpack_fly = new JetpackRegular(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_fly").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly"); - jetpack_vector = new JetpackVectorized(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_vector").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector"); + jetpack_boost = new JetpackBooster(MainRegistry.aMatSteel, 9, 1).setUnlocalizedName("jetpack_boost").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost"); + jetpack_break = new JetpackBreak(MainRegistry.aMatSteel, 9, 1).setUnlocalizedName("jetpack_break").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break"); + jetpack_fly = new JetpackRegular(MainRegistry.aMatSteel, 9, 1).setUnlocalizedName("jetpack_fly").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly"); + jetpack_vector = new JetpackVectorized(MainRegistry.aMatSteel, 9, 1).setUnlocalizedName("jetpack_vector").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector"); cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test"); cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation"); cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask"); - cape_schrabidium = new ArmorModel(MainRegistry.enumArmorMaterialSchrabidium, 9, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium"); + cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 9, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium"); //cape_hbm = new ArmorModel(MainRegistry.enumArmorMaterialSchrabidium, 9, 1).setUnlocalizedName("cape_hbm").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); //cape_dafnik = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_dafnik").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); //cape_lpkukin = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_lpkukin").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); @@ -3454,6 +3481,7 @@ public class ModItems { record_lc = new ItemModRecord("lc").setUnlocalizedName("record_lc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_lc"); record_ss = new ItemModRecord("ss").setUnlocalizedName("record_ss").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_ss"); record_vc = new ItemModRecord("vc").setUnlocalizedName("record_vc").setCreativeTab(CreativeTabs.tabMisc).setTextureName(RefStrings.MODID + ":record_vc"); + record_glass = new ItemModRecord("glass").setUnlocalizedName("record_glass").setCreativeTab(null).setTextureName(RefStrings.MODID + ":record_glass"); polaroid = new ItemPolaroid().setUnlocalizedName("polaroid").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":polaroid_" + MainRegistry.polaroidID); glitch = new ItemGlitch().setUnlocalizedName("glitch").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":glitch_" + MainRegistry.polaroidID); @@ -5234,6 +5262,14 @@ public class ModItems { GameRegistry.registerItem(security_plate, security_plate.getUnlocalizedName()); GameRegistry.registerItem(security_legs, security_legs.getUnlocalizedName()); GameRegistry.registerItem(security_boots, security_boots.getUnlocalizedName()); + GameRegistry.registerItem(cobalt_helmet, cobalt_helmet.getUnlocalizedName()); + GameRegistry.registerItem(cobalt_plate, cobalt_plate.getUnlocalizedName()); + GameRegistry.registerItem(cobalt_legs, cobalt_legs.getUnlocalizedName()); + GameRegistry.registerItem(cobalt_boots, cobalt_boots.getUnlocalizedName()); + GameRegistry.registerItem(starmetal_helmet, starmetal_helmet.getUnlocalizedName()); + GameRegistry.registerItem(starmetal_plate, starmetal_plate.getUnlocalizedName()); + GameRegistry.registerItem(starmetal_legs, starmetal_legs.getUnlocalizedName()); + GameRegistry.registerItem(starmetal_boots, starmetal_boots.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_helmet, schrabidium_helmet.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_plate, schrabidium_plate.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_legs, schrabidium_legs.getUnlocalizedName()); @@ -5315,6 +5351,7 @@ public class ModItems { GameRegistry.registerItem(record_lc, record_lc.getUnlocalizedName()); GameRegistry.registerItem(record_ss, record_ss.getUnlocalizedName()); GameRegistry.registerItem(record_vc, record_vc.getUnlocalizedName()); + GameRegistry.registerItem(record_glass, record_glass.getUnlocalizedName()); //Technical Items GameRegistry.registerItem(smoke1, smoke1.getUnlocalizedName()); diff --git a/com/hbm/items/gear/ArmorFSB.java b/com/hbm/items/gear/ArmorFSB.java index 0132b4f2b..dcfce0e1e 100644 --- a/com/hbm/items/gear/ArmorFSB.java +++ b/com/hbm/items/gear/ArmorFSB.java @@ -34,6 +34,7 @@ public class ArmorFSB extends ItemArmor { public float damageCap = -1; public float damageMod = -1; public boolean fireproof = false; + public boolean noHelmet = false; public ArmorFSB(ArmorMaterial material, int layer, int slot, String texture) { super(material, layer, slot); @@ -65,6 +66,11 @@ public class ArmorFSB extends ItemArmor { return this; } + public ArmorFSB setNoHelmet(boolean noHelmet) { + this.noHelmet = noHelmet; + return this; + } + public ArmorFSB setOverlay(String path) { this.overlay = new ResourceLocation(path); return this; @@ -78,6 +84,7 @@ public class ArmorFSB extends ItemArmor { this.damageCap = original.damageCap; this.damageMod = original.damageMod; this.fireproof = original.fireproof; + this.noHelmet = original.noHelmet; //overlay doesn't need to be copied because it's helmet exclusive return this; } diff --git a/com/hbm/items/special/ItemModRecord.java b/com/hbm/items/special/ItemModRecord.java index dc1282065..460f8d563 100644 --- a/com/hbm/items/special/ItemModRecord.java +++ b/com/hbm/items/special/ItemModRecord.java @@ -101,6 +101,8 @@ public class ItemModRecord extends ItemRecord { s = RefStrings.MODID + ":music.recordSectorSweep"; if(name.equals("records.vc")) s = RefStrings.MODID + ":music.recordVortalCombat"; + if(name.equals("records.glass")) + s = RefStrings.MODID + ":music.transmission"; return new ResourceLocation(s); } diff --git a/com/hbm/lib/HbmWorldGen.java b/com/hbm/lib/HbmWorldGen.java index 2cfd68cb1..f29e06269 100644 --- a/com/hbm/lib/HbmWorldGen.java +++ b/com/hbm/lib/HbmWorldGen.java @@ -3,8 +3,10 @@ package com.hbm.lib; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntitySafe; +import com.hbm.tileentity.machine.TileEntitySoyuzCapsule; import com.hbm.world.dungeon.Antenna; import com.hbm.world.dungeon.Barrel; import com.hbm.world.dungeon.Bunker; @@ -27,6 +29,7 @@ import com.hbm.world.feature.Sellafield; import com.hbm.world.generator.CellularDungeonFactory; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.WeightedRandomChestContent; @@ -382,11 +385,12 @@ public class HbmWorldGen implements IWorldGenerator { int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); - if(world.getBlock(x, y, z).canPlaceTorchOnTop(world, x, y, z)) + if(world.getBlock(x, y, z).canPlaceTorchOnTop(world, x, y, z)) { world.setBlock(x, y + 1, z, ModBlocks.broadcaster_pc, rand.nextInt(4) + 2, 2); - - if(MainRegistry.enableDebugMode) - MainRegistry.logger.info("[Debug] Successfully spawned corrupted broadcaster at " + x + " " + (y + 1) +" " + z); + + if(MainRegistry.enableDebugMode) + MainRegistry.logger.info("[Debug] Successfully spawned corrupted broadcaster at " + x + " " + (y + 1) +" " + z); + } } if (MainRegistry.enableMines && rand.nextInt(MainRegistry.minefreq) == 0) { @@ -438,6 +442,26 @@ public class HbmWorldGen implements IWorldGenerator { new GeyserLarge().generate(world, rand, x, y, z); } + if (biome == BiomeGenBase.beach && rand.nextInt(MainRegistry.capsuleStructure) == 0) { + int x = i + rand.nextInt(16); + int z = j + rand.nextInt(16); + int y = world.getHeightValue(x, z) - 4; + + if(world.getBlock(x, y + 1, z).canPlaceTorchOnTop(world, x, y + 1, z)) { + + world.setBlock(x, y, z, ModBlocks.soyuz_capsule, 3, 2); + + TileEntitySoyuzCapsule cap = (TileEntitySoyuzCapsule)world.getTileEntity(x, y, z); + + if(cap != null) { + cap.setInventorySlotContents(rand.nextInt(cap.getSizeInventory()), new ItemStack(ModItems.record_glass)); + } + + if(MainRegistry.enableDebugMode) + MainRegistry.logger.info("[Debug] Successfully spawned capsule at " + x + " " + z); + } + } + if (rand.nextInt(MainRegistry.geyserVapor) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); @@ -451,10 +475,17 @@ public class HbmWorldGen implements IWorldGenerator { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); + boolean done = false; + for(int k = 0; k < 256; k++) { - if(world.getBlock(x, k, z) == Blocks.log && world.getBlockMetadata(x, k, z) == 0) + if(world.getBlock(x, k, z) == Blocks.log && world.getBlockMetadata(x, k, z) == 0) { world.setBlock(x, k, z, ModBlocks.pink_log); + done = true; + } } + + if(MainRegistry.enableDebugMode && done) + MainRegistry.logger.info("[Debug] Successfully spawned pink tree at " + x + " " + z); } if (MainRegistry.enableVaults && rand.nextInt(MainRegistry.vaultfreq) == 0) { @@ -515,9 +546,9 @@ public class HbmWorldGen implements IWorldGenerator { int y = world.getHeightValue(x, z); - for(int f = 1; f < 4; f++) + for(int f = 0; f < 3; f++) world.setBlock(x, y + f, z, ModBlocks.meteor_pillar); - world.setBlock(x, y + 4, z, ModBlocks.meteor_brick_chiseled); + world.setBlock(x, y + 3, z, ModBlocks.meteor_brick_chiseled); for(int f = 0; f < 10; f++) { diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index f2060d31f..9cadeb931 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -136,6 +136,19 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_broken), 1), new Object[] { "###", "###", "###", '#', ModItems.fragment_meteorite }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_yellowcake), 1), new Object[] { "###", "###", "###", '#', ModItems.powder_yellowcake }); GameRegistry.addRecipe(new ItemStack(ModBlocks.block_starmetal, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_u233, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_u233 }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_u235, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_u235 }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_u238, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_u238 }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_uranium_fuel, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_uranium_fuel }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_neptunium, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_neptunium }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_plutonium, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_plutonium }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_pu238, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_pu238 }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_pu239, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_pu239 }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_pu240, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_pu240 }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_plutonium_fuel, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_plutonium_fuel }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_thorium_fuel, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_thorium_fuel }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_solinium, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_solinium }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_schrabidium_fuel, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_schrabidium_fuel }); GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth }); GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat }); @@ -182,6 +195,19 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ingot_desh, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_desh) }); GameRegistry.addRecipe(new ItemStack(ModItems.powder_yellowcake, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_yellowcake) }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_starmetal, 9), new Object[] { "#", '#', ModBlocks.block_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_u233, 9), new Object[] { "#", '#', ModBlocks.block_u233 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_u235, 9), new Object[] { "#", '#', ModBlocks.block_u235 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_u238, 9), new Object[] { "#", '#', ModBlocks.block_u238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 9), new Object[] { "#", '#', ModBlocks.block_uranium_fuel }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_neptunium, 9), new Object[] { "#", '#', ModBlocks.block_neptunium }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_plutonium, 9), new Object[] { "#", '#', ModBlocks.block_plutonium }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_pu238, 9), new Object[] { "#", '#', ModBlocks.block_pu238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_pu239, 9), new Object[] { "#", '#', ModBlocks.block_pu239 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_pu240, 9), new Object[] { "#", '#', ModBlocks.block_pu240 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 9), new Object[] { "#", '#', ModBlocks.block_plutonium_fuel }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_thorium_fuel, 9), new Object[] { "#", '#', ModBlocks.block_thorium_fuel }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_solinium, 9), new Object[] { "#", '#', ModBlocks.block_solinium }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_schrabidium_fuel, 9), new Object[] { "#", '#', ModBlocks.block_schrabidium_fuel }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_plutonium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_plutonium }); GameRegistry.addRecipe(new ItemStack(ModItems.nugget_plutonium, 9), new Object[] { "#", '#', ModItems.ingot_plutonium }); @@ -903,6 +929,12 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_pip, 16), new Object[] { " I ", "GCM", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_44, 'P', ModItems.primer_44, 'M', ModItems.powder_magic })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_12gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_12gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_4gauge_slug, 8), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_4gauge_slug, 8), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer })); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 4), new Object[] { " I ", "GCL", " P ", 'I', Blocks.tnt, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 4), new Object[] { " I ", "GCL", " P ", 'I', Blocks.tnt, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 8), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_slug, 8), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 378b0ca60..9a4b8c7ae 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -110,23 +110,23 @@ public class MainRegistry public static ToolMaterial enumToolMaterialMultitool = EnumHelper.addToolMaterial("MULTITOOL", 3, 5000, 25F, 5.5F, 25); //Armor Materials - public static ArmorMaterial enumArmorMaterialEmerald = EnumHelper.addArmorMaterial("TEST", 2500, new int[] {3, 8, 6, 3}, 30); - public static ArmorMaterial enumArmorMaterialSchrabidium = EnumHelper.addArmorMaterial("SCHRABIDIUM", 100, new int[] {3, 8, 6, 3}, 50); - public static ArmorMaterial enumArmorMaterialEuphemium = EnumHelper.addArmorMaterial("EUPHEMIUM", 15000000, new int[] {3, 8, 6, 3}, 100); - public static ArmorMaterial enumArmorMaterialHazmat = EnumHelper.addArmorMaterial("HAZMAT", 60, new int[] {2, 5, 4, 1}, 5); - public static ArmorMaterial enumArmorMaterialHazmat2 = EnumHelper.addArmorMaterial("HAZMAT2", 60, new int[] {2, 5, 4, 1}, 5); - public static ArmorMaterial enumArmorMaterialHazmat3 = EnumHelper.addArmorMaterial("HAZMAT3", 60, new int[] {2, 5, 4, 1}, 5); - public static ArmorMaterial enumArmorMaterialT45 = EnumHelper.addArmorMaterial("T45", 1000, new int[] {2, 5, 4, 1}, 0); - public static ArmorMaterial enumArmorMaterialSteel = EnumHelper.addArmorMaterial("STEEL", 20, new int[] {2, 6, 5, 2}, 5); - public static ArmorMaterial enumArmorMaterialAsbestos = EnumHelper.addArmorMaterial("ASBESTOS", 20, new int[] {1, 4, 3, 1}, 5); - public static ArmorMaterial enumArmorMaterialTitanium = EnumHelper.addArmorMaterial("TITANIUM", 25, new int[] {3, 8, 6, 3}, 9); - public static ArmorMaterial enumArmorMaterialAlloy = EnumHelper.addArmorMaterial("ALLOY", 40, new int[] {3, 8, 6, 3}, 12); - public static ArmorMaterial enumArmorMaterialPaa = EnumHelper.addArmorMaterial("PAA", 75, new int[] {3, 8, 6, 3}, 25); - public static ArmorMaterial enumArmorMaterialCmb = EnumHelper.addArmorMaterial("CMB", 60, new int[] {3, 8, 6, 3}, 50); - public static ArmorMaterial enumArmorMaterialAusIII = EnumHelper.addArmorMaterial("AUSIII", 375, new int[] {2, 6, 5, 2}, 0); - public static ArmorMaterial enumArmorMaterialAusIV = EnumHelper.addArmorMaterial("AUSIV", 375, new int[] {2, 6, 5, 2}, 0); - public static ArmorMaterial enumArmorMaterialAusV = EnumHelper.addArmorMaterial("AUSV", 375, new int[] {2, 6, 5, 2}, 0); - public static ArmorMaterial enumArmorMaterialSecurity = EnumHelper.addArmorMaterial("SECURITY", 100, new int[] {3, 8, 6, 3}, 15); + public static ArmorMaterial enumArmorMaterialEmerald = EnumHelper.addArmorMaterial("HBM_TEST", 2500, new int[] {3, 8, 6, 3}, 30); + public static ArmorMaterial aMatSchrab = EnumHelper.addArmorMaterial("HBM_SCHRABIDIUM", 100, new int[] {3, 8, 6, 3}, 50); + public static ArmorMaterial aMatEuph = EnumHelper.addArmorMaterial("HBM_EUPHEMIUM", 15000000, new int[] {3, 8, 6, 3}, 100); + public static ArmorMaterial aMatHaz = EnumHelper.addArmorMaterial("HBM_HAZMAT", 60, new int[] {2, 5, 4, 1}, 5); + public static ArmorMaterial aMatHaz2 = EnumHelper.addArmorMaterial("HBM_HAZMAT2", 60, new int[] {2, 5, 4, 1}, 5); + public static ArmorMaterial aMatHaz3 = EnumHelper.addArmorMaterial("HBM_HAZMAT3", 60, new int[] {2, 5, 4, 1}, 5); + public static ArmorMaterial aMatT45 = EnumHelper.addArmorMaterial("HBM_T45", 1000, new int[] {2, 5, 4, 1}, 0); + public static ArmorMaterial aMatSteel = EnumHelper.addArmorMaterial("HBM_STEEL", 20, new int[] {2, 6, 5, 2}, 5); + public static ArmorMaterial aMatAsbestos = EnumHelper.addArmorMaterial("HBM_ASBESTOS", 20, new int[] {1, 4, 3, 1}, 5); + public static ArmorMaterial aMatTitan = EnumHelper.addArmorMaterial("HBM_TITANIUM", 25, new int[] {3, 8, 6, 3}, 9); + public static ArmorMaterial aMatAlloy = EnumHelper.addArmorMaterial("HBM_ALLOY", 40, new int[] {3, 8, 6, 3}, 12); + public static ArmorMaterial aMatPaa = EnumHelper.addArmorMaterial("HBM_PAA", 75, new int[] {3, 8, 6, 3}, 25); + public static ArmorMaterial aMatCMB = EnumHelper.addArmorMaterial("HBM_CMB", 60, new int[] {3, 8, 6, 3}, 50); + public static ArmorMaterial aMatAus3 = EnumHelper.addArmorMaterial("HBM_AUSIII", 375, new int[] {2, 6, 5, 2}, 0); + public static ArmorMaterial aMatSecurity = EnumHelper.addArmorMaterial("HBM_SECURITY", 100, new int[] {3, 8, 6, 3}, 15); + public static ArmorMaterial aMatCobalt = EnumHelper.addArmorMaterial("HBM_COBALT", 70, new int[] {3, 8, 6, 3}, 25); + public static ArmorMaterial aMatStarmetal = EnumHelper.addArmorMaterial("HBM_STARMETAL", 150, new int[] {3, 8, 6, 3}, 100); //Creative Tabs //ingots, nuggets, wires, machine parts @@ -294,6 +294,7 @@ public class MainRegistry public static int geyserChlorine = 3000; public static int geyserVapor = 500; public static int meteorStructure = 15000; + public static int capsuleStructure = 100; public static int broadcaster = 5000; public static int minefreq = 64; @@ -380,21 +381,21 @@ public class MainRegistry Library.initBooks(); - enumArmorMaterialSchrabidium.customCraftingMaterial = ModItems.ingot_schrabidium; - enumArmorMaterialHazmat.customCraftingMaterial = ModItems.hazmat_cloth; - enumArmorMaterialHazmat2.customCraftingMaterial = ModItems.hazmat_cloth_red; - enumArmorMaterialHazmat3.customCraftingMaterial = ModItems.hazmat_cloth_grey; - enumArmorMaterialT45.customCraftingMaterial = ModItems.plate_titanium; - enumArmorMaterialTitanium.customCraftingMaterial = ModItems.ingot_titanium; - enumArmorMaterialSteel.customCraftingMaterial = ModItems.ingot_steel; - enumArmorMaterialAsbestos.customCraftingMaterial = ModItems.asbestos_cloth; - enumArmorMaterialAlloy.customCraftingMaterial = ModItems.ingot_advanced_alloy; - enumArmorMaterialPaa.customCraftingMaterial = ModItems.plate_paa; - enumArmorMaterialCmb.customCraftingMaterial = ModItems.ingot_combine_steel; - enumArmorMaterialAusIII.customCraftingMaterial = ModItems.ingot_australium; - enumArmorMaterialAusIV.customCraftingMaterial = ModItems.rod_australium; - enumArmorMaterialAusV.customCraftingMaterial = ModItems.nugget_australium; - enumArmorMaterialSecurity.customCraftingMaterial = ModItems.plate_kevlar; + aMatSchrab.customCraftingMaterial = ModItems.ingot_schrabidium; + aMatHaz.customCraftingMaterial = ModItems.hazmat_cloth; + aMatHaz2.customCraftingMaterial = ModItems.hazmat_cloth_red; + aMatHaz3.customCraftingMaterial = ModItems.hazmat_cloth_grey; + aMatT45.customCraftingMaterial = ModItems.plate_titanium; + aMatTitan.customCraftingMaterial = ModItems.ingot_titanium; + aMatSteel.customCraftingMaterial = ModItems.ingot_steel; + aMatAsbestos.customCraftingMaterial = ModItems.asbestos_cloth; + aMatAlloy.customCraftingMaterial = ModItems.ingot_advanced_alloy; + aMatPaa.customCraftingMaterial = ModItems.plate_paa; + aMatCMB.customCraftingMaterial = ModItems.ingot_combine_steel; + aMatAus3.customCraftingMaterial = ModItems.ingot_australium; + aMatSecurity.customCraftingMaterial = ModItems.plate_kevlar; + aMatCobalt.customCraftingMaterial = ModItems.ingot_cobalt; + aMatStarmetal.customCraftingMaterial = ModItems.ingot_starmetal; enumToolMaterialSchrabidium.setRepairItem(new ItemStack(ModItems.ingot_schrabidium)); enumToolMaterialHammer.setRepairItem(new ItemStack(Item.getItemFromBlock(ModBlocks.block_schrabidium))); enumToolMaterialChainsaw.setRepairItem(new ItemStack(ModItems.ingot_steel)); @@ -1745,7 +1746,8 @@ public class MainRegistry Property pGV = config.get(CATEGORY_DUNGEON, "4.19_geyserVaporSpawn", 500); pGV.comment = "Spawn vapor geyser on every nTH chunk"; geyserVapor = pGV.getInt(); - meteorStructure = createConfigInt(config, CATEGORY_DUNGEON, "meteorStructure", "Spawn meteor dungeon on every nTH chunk", 15000); + meteorStructure = createConfigInt(config, CATEGORY_DUNGEON, "4.20_meteorSpawn", "Spawn meteor dungeon on every nTH chunk", 15000); + capsuleStructure = createConfigInt(config, CATEGORY_DUNGEON, "4.21_capsuleSpawn", "Spawn landing capsule on every nTH chunk", 100); final String CATEGORY_METEOR = "05_meteors"; Property propMeteorStrikeChance = config.get(CATEGORY_METEOR, "5.00_meteorStrikeChance", 20 * 60 * 60 * 5); @@ -1859,6 +1861,7 @@ public class MainRegistry meteorStrikeChance = setDef(meteorStrikeChance, 1000); meteorShowerChance = setDef(meteorShowerChance, 1000); meteorStructure = setDef(meteorStructure, 15000); + capsuleStructure = setDef(capsuleStructure, 100); fogCh = setDef(fogCh, 20); } diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index 1d288deff..7c8938d35 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -373,18 +373,22 @@ public class ModEventHandler ItemStack legs = player.inventory.armorInventory[1]; ItemStack boots = player.inventory.armorInventory[0]; - if(helmet != null && plate != null && legs != null && boots != null) { + if(plate != null && plate.getItem() instanceof ArmorFSB) { - if(plate.getItem() instanceof ArmorFSB && - ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)plate.getItem()).getArmorMaterial() && - ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && - ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { + ArmorFSB chestplate = (ArmorFSB)plate.getItem(); + + boolean noHelmet = chestplate.noHelmet; + + if((helmet != null || noHelmet) && plate != null && legs != null && boots != null) { - ArmorFSB armor = (ArmorFSB)plate.getItem(); - - if(armor.fireproof && event.source.isFireDamage()) { - player.extinguish(); - event.setCanceled(true); + if((noHelmet || chestplate.getArmorMaterial() == ((ArmorFSB)helmet.getItem()).getArmorMaterial()) && + chestplate.getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && + chestplate.getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { + + if(chestplate.fireproof && event.source.isFireDamage()) { + player.extinguish(); + event.setCanceled(true); + } } } } @@ -404,29 +408,33 @@ public class ModEventHandler ItemStack legs = player.inventory.armorInventory[1]; ItemStack boots = player.inventory.armorInventory[0]; - if(helmet != null && plate != null && legs != null && boots != null) { + if(plate != null && plate.getItem() instanceof ArmorFSB) { - if(plate.getItem() instanceof ArmorFSB && - ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)plate.getItem()).getArmorMaterial() && - ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && - ((ArmorFSB)helmet.getItem()).getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { + ArmorFSB chestplate = (ArmorFSB)plate.getItem(); + + boolean noHelmet = chestplate.noHelmet; + + if((helmet != null || noHelmet) && plate != null && legs != null && boots != null) { - ArmorFSB armor = (ArmorFSB)plate.getItem(); - - if(armor.damageMod != -1) { - event.ammount *= armor.damageMod; - } - - if(armor.resistance.get(event.source.getDamageType()) != null) { - event.ammount *= armor.resistance.get(event.source); - } - - if(armor.blastProtection != -1 && event.source.isExplosion()) { - event.ammount *= armor.blastProtection; - } - - if(armor.damageCap != -1) { - event.ammount = Math.min(event.ammount, armor.damageCap); + if((noHelmet || chestplate.getArmorMaterial() == ((ArmorFSB)helmet.getItem()).getArmorMaterial()) && + chestplate.getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && + chestplate.getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { + + if(chestplate.damageMod != -1) { + event.ammount *= chestplate.damageMod; + } + + if(chestplate.resistance.get(event.source.getDamageType()) != null) { + event.ammount *= chestplate.resistance.get(event.source); + } + + if(chestplate.blastProtection != -1 && event.source.isExplosion()) { + event.ammount *= chestplate.blastProtection; + } + + if(chestplate.damageCap != -1) { + event.ammount = Math.min(event.ammount, chestplate.damageCap); + } } } } @@ -447,20 +455,24 @@ public class ModEventHandler ItemStack plate = player.inventory.armorInventory[2]; ItemStack legs = player.inventory.armorInventory[1]; ItemStack boots = player.inventory.armorInventory[0]; - - if (helmet != null && plate != null && legs != null && boots != null) { - - if (plate.getItem() instanceof ArmorFSB - && ((ArmorFSB) helmet.getItem()).getArmorMaterial() == ((ArmorFSB) plate.getItem()).getArmorMaterial() - && ((ArmorFSB) helmet.getItem()).getArmorMaterial() == ((ArmorFSB) legs.getItem()).getArmorMaterial() - && ((ArmorFSB) helmet.getItem()).getArmorMaterial() == ((ArmorFSB) boots.getItem()).getArmorMaterial()) { + + if(plate != null && plate.getItem() instanceof ArmorFSB) { + + ArmorFSB chestplate = (ArmorFSB)plate.getItem(); + + boolean noHelmet = chestplate.noHelmet; + + if((helmet != null || noHelmet) && plate != null && legs != null && boots != null) { - ArmorFSB armor = (ArmorFSB)plate.getItem(); - - if(!armor.effects.isEmpty()) { + if((noHelmet || chestplate.getArmorMaterial() == ((ArmorFSB)helmet.getItem()).getArmorMaterial()) && + chestplate.getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && + chestplate.getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { - for(PotionEffect i : armor.effects) { - player.addPotionEffect(new PotionEffect(i.getPotionID(), i.getDuration(), i.getAmplifier(), i.getIsAmbient())); + if(!chestplate.effects.isEmpty()) { + + for(PotionEffect i : chestplate.effects) { + player.addPotionEffect(new PotionEffect(i.getPotionID(), i.getDuration(), i.getAmplifier(), i.getIsAmbient())); + } } } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactor.java b/com/hbm/tileentity/machine/TileEntityMachineReactor.java index fec751f80..0797f9c44 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactor.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactor.java @@ -20,7 +20,6 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent public int dualPower; public static final int maxPower = 1000; public static final int processingSpeed = 1000; - public boolean runsOnRtg = false; private static final int[] slots_top = new int[] {1}; private static final int[] slots_bottom = new int[] {2, 0}; @@ -113,7 +112,9 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent return 0; }else{ Item item = itemStack.getItem(); - + + if(item == ModItems.pellet_rtg_weak) return 1; + if(item == ModItems.pellet_rtg) return 2; if(item == ModItems.rod_u238) return 1; if(item == ModItems.rod_dual_u238) return 2; if(item == ModItems.rod_quad_u238) return 4; @@ -172,7 +173,6 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent dualPower = nbt.getShort("powerTime"); dualCookTime = nbt.getShort("CookTime"); - runsOnRtg = nbt.getBoolean("runsOnRtg"); slots = new ItemStack[getSizeInventory()]; for(int i = 0; i < list.tagCount(); i++) @@ -191,7 +191,6 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent super.writeToNBT(nbt); nbt.setShort("powerTime", (short) dualPower); nbt.setShort("cookTime", (short) dualCookTime); - nbt.setBoolean("runsOnRtg", runsOnRtg); NBTTagList list = new NBTTagList(); for(int i = 0; i < slots.length; i++) @@ -292,11 +291,6 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent slots[i] = null; } } - - if(!runsOnRtg) - { - dualPower--; - } } } @@ -329,19 +323,6 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent } } - if(this.slots[0] != null && this.slots[0].getItem() == ModItems.pellet_rtg && this.dualPower == 0) - { - this.slots[0].stackSize--; - if(this.slots[0].stackSize == 0) - { - this.slots[0] = this.slots[0].getItem().getContainerItem(this.slots[0]); - } - - this.runsOnRtg = true; - - this.dualPower = 1; - } - if(hasPower() && canProcess()) { dualCookTime++; diff --git a/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java b/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java index 39ac64ed5..101e4b0ea 100644 --- a/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java +++ b/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java @@ -2,6 +2,10 @@ package com.hbm.tileentity.machine; import com.hbm.tileentity.TileEntityInventoryBase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.AxisAlignedBB; + public class TileEntitySoyuzCapsule extends TileEntityInventoryBase { public TileEntitySoyuzCapsule() { @@ -12,5 +16,11 @@ public class TileEntitySoyuzCapsule extends TileEntityInventoryBase { public String getName() { return "container.soyuzCapsule"; } + + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() { + + return AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord - 1, zCoord - 1, xCoord + 2, yCoord + 3, zCoord + 2); + } } diff --git a/com/hbm/world/generator/CellularDungeon.java b/com/hbm/world/generator/CellularDungeon.java index 390a305f2..db1cd9cbe 100644 --- a/com/hbm/world/generator/CellularDungeon.java +++ b/com/hbm/world/generator/CellularDungeon.java @@ -115,32 +115,20 @@ public class CellularDungeon { return false; } - //CellularDungeonRoom next = DungeonToolbox.getRandom(rooms, rand); - if(room.daisyChain == null || addRoom(x + room.daisyDirection.offsetX, z + room.daisyDirection.offsetZ, rand, ForgeDirection.UNKNOWN, room.daisyChain)) { cells[x][z] = room; doors[x][z] = door; order.add(new int[] { x, z }); } - //if(room.daisyChain == null) - for(int i = 0; i < 3; i++) { - ForgeDirection dir = getRandomDir(rand); - addRoom(x + dir.offsetX, z + dir.offsetZ, rand, dir.getOpposite(), DungeonToolbox.getRandom(rooms, rand)); - } + for(int i = 0; i < 3; i++) { + ForgeDirection dir = getRandomDir(rand); + addRoom(x + dir.offsetX, z + dir.offsetZ, rand, dir.getOpposite(), DungeonToolbox.getRandom(rooms, rand)); + } return true; } - /*public boolean addDaisychain(int x, int z, Random rand, ForgeDirection door, CellularDungeonRoom room) { - - if(x < 0 || z < 0 || x >= dimX || z >= dimZ) - return false; - - if(cells[x][z] != null) - return false; - }*/ - public static ForgeDirection getRandomDir(Random rand) { return ForgeDirection.getOrientation(rand.nextInt(4) + 2);