diff --git a/assets/hbm/textures/items/hazmat_cloth.png b/assets/hbm/textures/items/hazmat_cloth.png new file mode 100644 index 000000000..17c5c9dd1 Binary files /dev/null and b/assets/hbm/textures/items/hazmat_cloth.png differ diff --git a/assets/hbm/textures/items/war_head_medium.png b/assets/hbm/textures/items/warhead_buster_large.png similarity index 100% rename from assets/hbm/textures/items/war_head_medium.png rename to assets/hbm/textures/items/warhead_buster_large.png diff --git a/assets/hbm/textures/items/war_head_large.png b/assets/hbm/textures/items/warhead_buster_medium.png similarity index 100% rename from assets/hbm/textures/items/war_head_large.png rename to assets/hbm/textures/items/warhead_buster_medium.png diff --git a/assets/hbm/textures/items/war_head_small.png b/assets/hbm/textures/items/warhead_buster_small.png similarity index 100% rename from assets/hbm/textures/items/war_head_small.png rename to assets/hbm/textures/items/warhead_buster_small.png diff --git a/assets/hbm/textures/items/warhead_cluster_large.png b/assets/hbm/textures/items/warhead_cluster_large.png new file mode 100644 index 000000000..705e70a86 Binary files /dev/null and b/assets/hbm/textures/items/warhead_cluster_large.png differ diff --git a/assets/hbm/textures/items/warhead_cluster_medium.png b/assets/hbm/textures/items/warhead_cluster_medium.png new file mode 100644 index 000000000..9bf590918 Binary files /dev/null and b/assets/hbm/textures/items/warhead_cluster_medium.png differ diff --git a/assets/hbm/textures/items/warhead_cluster_small.png b/assets/hbm/textures/items/warhead_cluster_small.png new file mode 100644 index 000000000..fb8d2badc Binary files /dev/null and b/assets/hbm/textures/items/warhead_cluster_small.png differ diff --git a/assets/hbm/textures/items/warhead_generic_large.png b/assets/hbm/textures/items/warhead_generic_large.png new file mode 100644 index 000000000..705e70a86 Binary files /dev/null and b/assets/hbm/textures/items/warhead_generic_large.png differ diff --git a/assets/hbm/textures/items/warhead_generic_medium.png b/assets/hbm/textures/items/warhead_generic_medium.png new file mode 100644 index 000000000..9bf590918 Binary files /dev/null and b/assets/hbm/textures/items/warhead_generic_medium.png differ diff --git a/assets/hbm/textures/items/warhead_generic_small.png b/assets/hbm/textures/items/warhead_generic_small.png new file mode 100644 index 000000000..fb8d2badc Binary files /dev/null and b/assets/hbm/textures/items/warhead_generic_small.png differ diff --git a/assets/hbm/textures/items/warhead_incendiary_large.png b/assets/hbm/textures/items/warhead_incendiary_large.png new file mode 100644 index 000000000..705e70a86 Binary files /dev/null and b/assets/hbm/textures/items/warhead_incendiary_large.png differ diff --git a/assets/hbm/textures/items/warhead_incendiary_medium.png b/assets/hbm/textures/items/warhead_incendiary_medium.png new file mode 100644 index 000000000..9bf590918 Binary files /dev/null and b/assets/hbm/textures/items/warhead_incendiary_medium.png differ diff --git a/assets/hbm/textures/items/warhead_incendiary_small.png b/assets/hbm/textures/items/warhead_incendiary_small.png new file mode 100644 index 000000000..fb8d2badc Binary files /dev/null and b/assets/hbm/textures/items/warhead_incendiary_small.png differ diff --git a/assets/hbm/textures/items/war_head_nucelar.png b/assets/hbm/textures/items/warhead_mirv.png similarity index 100% rename from assets/hbm/textures/items/war_head_nucelar.png rename to assets/hbm/textures/items/warhead_mirv.png diff --git a/assets/hbm/textures/items/warhead_mirvlet.png b/assets/hbm/textures/items/warhead_mirvlet.png new file mode 100644 index 000000000..24a425030 Binary files /dev/null and b/assets/hbm/textures/items/warhead_mirvlet.png differ diff --git a/assets/hbm/textures/items/warhead_nuclear.png b/assets/hbm/textures/items/warhead_nuclear.png new file mode 100644 index 000000000..24a425030 Binary files /dev/null and b/assets/hbm/textures/items/warhead_nuclear.png differ diff --git a/assets/hbm/textures/items/warhead_thermo_endo.png b/assets/hbm/textures/items/warhead_thermo_endo.png new file mode 100644 index 000000000..24a425030 Binary files /dev/null and b/assets/hbm/textures/items/warhead_thermo_endo.png differ diff --git a/assets/hbm/textures/items/warhead_thermo_exo.png b/assets/hbm/textures/items/warhead_thermo_exo.png new file mode 100644 index 000000000..24a425030 Binary files /dev/null and b/assets/hbm/textures/items/warhead_thermo_exo.png differ diff --git a/assets/hbm/textures/models/MissileGeneric.png b/assets/hbm/textures/models/MissileGeneric.png index 5b70601a2..e66a9b29f 100644 Binary files a/assets/hbm/textures/models/MissileGeneric.png and b/assets/hbm/textures/models/MissileGeneric.png differ diff --git a/assets/hbm/textures/models/MissileGenericBuster.png b/assets/hbm/textures/models/MissileGenericBuster.png new file mode 100644 index 000000000..465c99822 Binary files /dev/null and b/assets/hbm/textures/models/MissileGenericBuster.png differ diff --git a/assets/hbm/textures/models/MissileGenericCluster.png b/assets/hbm/textures/models/MissileGenericCluster.png new file mode 100644 index 000000000..ac443eb03 Binary files /dev/null and b/assets/hbm/textures/models/MissileGenericCluster.png differ diff --git a/assets/hbm/textures/models/MissileGenericIncendiary.png b/assets/hbm/textures/models/MissileGenericIncendiary.png new file mode 100644 index 000000000..325b7acbb Binary files /dev/null and b/assets/hbm/textures/models/MissileGenericIncendiary.png differ diff --git a/com/hbm/blocks/BlockOre.java b/com/hbm/blocks/BlockOre.java index 7b1bb96c7..6fc98c535 100644 --- a/com/hbm/blocks/BlockOre.java +++ b/com/hbm/blocks/BlockOre.java @@ -13,6 +13,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -132,6 +133,14 @@ public class BlockOre extends Block { if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); entity.setDead(); + } else if(entity instanceof EntityCow) { + EntityMooshroom creep = new EntityMooshroom(p_149724_1_); + creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + //creep.setRotationYawHead(((EntityCow)entity).rotationYawHead); + if(!entity.isDead) + if(!p_149724_1_.isRemote) + p_149724_1_.spawnEntityInWorld(creep); + entity.setDead(); } else if(!(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 10 * 60 * 20, 4)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 4 * 60 * 20, 2)); diff --git a/com/hbm/blocks/LaunchPad.java b/com/hbm/blocks/LaunchPad.java index 3416e9929..01fe46765 100644 --- a/com/hbm/blocks/LaunchPad.java +++ b/com/hbm/blocks/LaunchPad.java @@ -23,6 +23,8 @@ import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -393,4 +395,11 @@ public class LaunchPad extends BlockContainer { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) + { + return Item.getItemFromBlock(ModBlocks.launch_pad); + } + } diff --git a/com/hbm/blocks/MachineDiFurnace.java b/com/hbm/blocks/MachineDiFurnace.java index dac5dfbd9..162ba2d7f 100644 --- a/com/hbm/blocks/MachineDiFurnace.java +++ b/com/hbm/blocks/MachineDiFurnace.java @@ -263,4 +263,11 @@ public class MachineDiFurnace extends BlockContainer { } } } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) + { + return Item.getItemFromBlock(ModBlocks.machine_difurnace_off); + } } diff --git a/com/hbm/blocks/MachineElectricFurnace.java b/com/hbm/blocks/MachineElectricFurnace.java index 28a02da67..1c3be36d3 100644 --- a/com/hbm/blocks/MachineElectricFurnace.java +++ b/com/hbm/blocks/MachineElectricFurnace.java @@ -257,4 +257,11 @@ public class MachineElectricFurnace extends BlockContainer { } } } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) + { + return Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off); + } } diff --git a/com/hbm/blocks/MachineNukeFurnace.java b/com/hbm/blocks/MachineNukeFurnace.java index f52c5f0e6..0f2300d81 100644 --- a/com/hbm/blocks/MachineNukeFurnace.java +++ b/com/hbm/blocks/MachineNukeFurnace.java @@ -256,4 +256,11 @@ public class MachineNukeFurnace extends BlockContainer { } } + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) + { + return Item.getItemFromBlock(ModBlocks.machine_nuke_furnace_off); + } + } diff --git a/com/hbm/blocks/MachineRtgFurnace.java b/com/hbm/blocks/MachineRtgFurnace.java index f99077b09..84c160833 100644 --- a/com/hbm/blocks/MachineRtgFurnace.java +++ b/com/hbm/blocks/MachineRtgFurnace.java @@ -256,4 +256,11 @@ public class MachineRtgFurnace extends BlockContainer { } } } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) + { + return Item.getItemFromBlock(ModBlocks.machine_rtg_furnace_off); + } } diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index bff95b634..b747cd8c1 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -331,22 +331,22 @@ public class ModBlocks { red_wire_coated = new WireCoated(Material.iron).setBlockName("red_wire_coated").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":red_wire_coated"); launch_pad = new LaunchPad(Material.iron).setBlockName("launch_pad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":launch_pad"); - launch_pad_generic = new LaunchPad(Material.iron).setBlockName("launch_pad_generic").setHardness(5.0F).setResistance(10.0F); - launch_pad_incendiary = new LaunchPad(Material.iron).setBlockName("launch_pad_incendiary").setHardness(5.0F).setResistance(10.0F); - launch_pad_cluster = new LaunchPad(Material.iron).setBlockName("launch_pad_cluster").setHardness(5.0F).setResistance(10.0F); - launch_pad_buster = new LaunchPad(Material.iron).setBlockName("launch_pad_buster").setHardness(5.0F).setResistance(10.0F); - launch_pad_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_strong").setHardness(5.0F).setResistance(10.0F); - launch_pad_incendiary_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_incendiary_strong").setHardness(5.0F).setResistance(10.0F); - launch_pad_cluster_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_cluster_strong").setHardness(5.0F).setResistance(10.0F); - launch_pad_buster_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_buster_strong").setHardness(5.0F).setResistance(10.0F); - launch_pad_burst = new LaunchPad(Material.iron).setBlockName("launch_pad_burst").setHardness(5.0F).setResistance(10.0F); - launch_pad_inferno = new LaunchPad(Material.iron).setBlockName("launch_pad_inferno").setHardness(5.0F).setResistance(10.0F); - launch_pad_rain = new LaunchPad(Material.iron).setBlockName("launch_pad_rain").setHardness(5.0F).setResistance(10.0F); - launch_pad_drill = new LaunchPad(Material.iron).setBlockName("launch_pad_drill").setHardness(5.0F).setResistance(10.0F); - launch_pad_nuclear = new LaunchPad(Material.iron).setBlockName("launch_pad_nuclear").setHardness(5.0F).setResistance(10.0F); - launch_pad_endo = new LaunchPad(Material.iron).setBlockName("launch_pad_endo").setHardness(5.0F).setResistance(10.0F); - launch_pad_exo = new LaunchPad(Material.iron).setBlockName("launch_pad_exo").setHardness(5.0F).setResistance(10.0F); - launch_pad_mirv = new LaunchPad(Material.iron).setBlockName("launch_pad_mirv").setHardness(5.0F).setResistance(10.0F); + launch_pad_generic = new LaunchPad(Material.iron).setBlockName("launch_pad_generic").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_incendiary = new LaunchPad(Material.iron).setBlockName("launch_pad_incendiary").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_cluster = new LaunchPad(Material.iron).setBlockName("launch_pad_cluster").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_buster = new LaunchPad(Material.iron).setBlockName("launch_pad_buster").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_strong").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_incendiary_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_incendiary_strong").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_cluster_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_cluster_strong").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_buster_strong = new LaunchPad(Material.iron).setBlockName("launch_pad_buster_strong").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_burst = new LaunchPad(Material.iron).setBlockName("launch_pad_burst").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_inferno = new LaunchPad(Material.iron).setBlockName("launch_pad_inferno").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_rain = new LaunchPad(Material.iron).setBlockName("launch_pad_rain").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_drill = new LaunchPad(Material.iron).setBlockName("launch_pad_drill").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_nuclear = new LaunchPad(Material.iron).setBlockName("launch_pad_nuclear").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_endo = new LaunchPad(Material.iron).setBlockName("launch_pad_endo").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_exo = new LaunchPad(Material.iron).setBlockName("launch_pad_exo").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); + launch_pad_mirv = new LaunchPad(Material.iron).setBlockName("launch_pad_mirv").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke); diff --git a/com/hbm/blocks/TileEntityYellowBarrel.java b/com/hbm/blocks/TileEntityYellowBarrel.java index b4eab8e16..8415b8936 100644 --- a/com/hbm/blocks/TileEntityYellowBarrel.java +++ b/com/hbm/blocks/TileEntityYellowBarrel.java @@ -9,6 +9,7 @@ import com.hbm.lib.Library; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -73,6 +74,14 @@ public class TileEntityYellowBarrel extends TileEntity { if(!worldObj.isRemote) worldObj.spawnEntityInWorld(creep); entity.setDead(); + } else if(entity instanceof EntityCow) { + EntityMooshroom creep = new EntityMooshroom(worldObj); + creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + //creep.setRotationYawHead(((EntityCow)entity).rotationYawHead); + if(!entity.isDead) + if(!worldObj.isRemote) + worldObj.spawnEntityInWorld(creep); + entity.setDead(); } else if(entity instanceof EntityLivingBase && !(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.getId(), 2 * 60 * 20, 2)); diff --git a/com/hbm/blocks/WasteEarth.java b/com/hbm/blocks/WasteEarth.java index 6135b5e88..c5502a362 100644 --- a/com/hbm/blocks/WasteEarth.java +++ b/com/hbm/blocks/WasteEarth.java @@ -172,6 +172,13 @@ public class WasteEarth extends Block { } if(count > 0 && count < 5) world.setBlock(x, y + 1, z, ModBlocks.mush); + if (!world.isRemote) + { + if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2) + { + world.setBlock(x, y, z, Blocks.dirt); + } + } } if(this == ModBlocks.waste_mycelium) diff --git a/com/hbm/entity/EntityMissileCluster.java b/com/hbm/entity/EntityMissileCluster.java index a31cc8064..ddf62b38b 100644 --- a/com/hbm/entity/EntityMissileCluster.java +++ b/com/hbm/entity/EntityMissileCluster.java @@ -127,7 +127,7 @@ public class EntityMissileCluster extends EntityMissileBase { if(target != null) { this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 5F, true); - ExplosionChaos.cluster(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 100, 100); + ExplosionChaos.cluster(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 25, 100); this.setDead(); } break; diff --git a/com/hbm/entity/EntityMissileClusterStrong.java b/com/hbm/entity/EntityMissileClusterStrong.java index ad9d73861..2959a67ab 100644 --- a/com/hbm/entity/EntityMissileClusterStrong.java +++ b/com/hbm/entity/EntityMissileClusterStrong.java @@ -128,7 +128,7 @@ public class EntityMissileClusterStrong extends EntityMissileBase { if(target != null) { this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 5F, true); - ExplosionChaos.cluster(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 100, 100); + ExplosionChaos.cluster(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 50, 100); this.setDead(); } break; diff --git a/com/hbm/gui/MachineRecipes.java b/com/hbm/gui/MachineRecipes.java index 20920e47e..ba2f76c24 100644 --- a/com/hbm/gui/MachineRecipes.java +++ b/com/hbm/gui/MachineRecipes.java @@ -3,6 +3,7 @@ package com.hbm.gui; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -47,6 +48,11 @@ public class MachineRecipes { return new ItemStack(ModItems.ingot_red_copper, 1); } + + if(item == ModItems.canister_empty && item2 == Item.getItemFromBlock(Blocks.coal_block) || item == Item.getItemFromBlock(Blocks.coal_block) && item2 == ModItems.canister_empty) { + return new ItemStack(ModItems.canister_fuel, 1); + } + return null; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index bb0c4d899..3fe6aa640 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -77,6 +77,7 @@ public class ModItems { public static Item plate_copper; public static Item nugget_beryllium; public static Item plate_gold; + public static Item hazmat_cloth; public static Item powder_lead; public static Item powder_neptunium; @@ -121,6 +122,32 @@ public class ModItems { public static Item pedestal_steel; public static Item dysfunctional_reactor; + public static Item warhead_generic_small; + public static Item warhead_generic_medium; + public static Item warhead_generic_large; + public static Item warhead_incendiary_small; + public static Item warhead_incendiary_medium; + public static Item warhead_incendiary_large; + public static Item warhead_cluster_small; + public static Item warhead_cluster_medium; + public static Item warhead_cluster_large; + public static Item warhead_buster_small; + public static Item warhead_buster_medium; + public static Item warhead_buster_large; + public static Item warhead_nuclear; + public static Item warhead_mirvlet; + public static Item warhead_mirv; + public static Item warhead_thermo_endo; + public static Item warhead_thermo_exo; + + public static Item fuel_tank_small; + public static Item fuel_tank_medium; + public static Item fuel_tank_large; + + public static Item thruster_small; + public static Item thruster_medium; + public static Item thruster_large; + public static Item pellet_rtg; public static Item cell_empty; @@ -130,6 +157,10 @@ public class ModItems { public static Item cell_deuterium; public static Item cell_sas3; + public static Item canister_empty; + public static Item canister_fuel; + public static Item canister_napalm; + public static Item syringe_empty; public static Item syringe_antidote; public static Item syringe_awesome; @@ -440,6 +471,7 @@ public class ModItems { nugget_lead = new Item().setUnlocalizedName("nugget_lead").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_lead"); nugget_schrabidium = new ItemCustomLore().setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_schrabidium"); nugget_beryllium = new Item().setUnlocalizedName("nugget_beryllium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_beryllium"); + hazmat_cloth = new Item().setUnlocalizedName("hazmat_cloth").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":hazmat_cloth"); powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lead"); powder_neptunium = new Item().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neptunium"); @@ -478,6 +510,32 @@ public class ModItems { pedestal_steel = new Item().setUnlocalizedName("pedestal_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":pedestal_steel"); dysfunctional_reactor = new Item().setUnlocalizedName("dysfunctional_reactor").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":dysfunctional_reactor"); + warhead_generic_small = new Item().setUnlocalizedName("warhead_generic_small").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_generic_small"); + warhead_generic_medium = new Item().setUnlocalizedName("warhead_generic_medium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_generic_medium"); + warhead_generic_large = new Item().setUnlocalizedName("warhead_generic_large").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_generic_large"); + warhead_incendiary_small = new Item().setUnlocalizedName("warhead_incendiary_small").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_incendiary_small"); + warhead_incendiary_medium = new Item().setUnlocalizedName("warhead_incendiary_medium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_incendiary_medium"); + warhead_incendiary_large = new Item().setUnlocalizedName("warhead_incendiary_large").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_incendiary_large"); + warhead_cluster_small = new Item().setUnlocalizedName("warhead_cluster_small").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_cluster_small"); + warhead_cluster_medium = new Item().setUnlocalizedName("warhead_cluster_medium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_cluster_medium"); + warhead_cluster_large = new Item().setUnlocalizedName("warhead_cluster_large").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_cluster_large"); + warhead_buster_small = new Item().setUnlocalizedName("warhead_buster_small").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_buster_small"); + warhead_buster_medium = new Item().setUnlocalizedName("warhead_buster_medium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_buster_medium"); + warhead_buster_large = new Item().setUnlocalizedName("warhead_buster_large").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_buster_large"); + warhead_nuclear = new Item().setUnlocalizedName("warhead_nuclear").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_nuclear"); + warhead_mirvlet = new Item().setUnlocalizedName("warhead_mirvlet").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_mirvlet"); + warhead_mirv = new Item().setUnlocalizedName("warhead_mirv").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_mirv"); + warhead_thermo_endo = new Item().setUnlocalizedName("warhead_thermo_endo").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_thermo_endo"); + warhead_thermo_exo = new Item().setUnlocalizedName("warhead_thermo_exo").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":warhead_thermo_exo"); + + fuel_tank_small = new Item().setUnlocalizedName("fuel_tank_small").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fuel_tank_small"); + fuel_tank_medium = new Item().setUnlocalizedName("fuel_tank_medium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fuel_tank_medium"); + fuel_tank_large = new Item().setUnlocalizedName("fuel_tank_large").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fuel_tank_large"); + + thruster_small = new Item().setUnlocalizedName("thruster_small").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":thruster_small"); + thruster_medium = new Item().setUnlocalizedName("thruster_medium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":thruster_medium"); + thruster_large = new Item().setUnlocalizedName("thruster_large").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":thruster_large"); + circuit_aluminium = new Item().setUnlocalizedName("circuit_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_aluminium"); circuit_copper = new Item().setUnlocalizedName("circuit_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_copper"); circuit_red_copper = new Item().setUnlocalizedName("circuit_red_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_red_copper"); @@ -493,6 +551,10 @@ public class ModItems { cell_deuterium = new Item().setUnlocalizedName("cell_deuterium").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_deuterium"); cell_sas3 = new ItemCustomLore().setUnlocalizedName("cell_sas3").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_sas3"); + canister_empty = new ItemCustomLore().setUnlocalizedName("canister_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":canister_empty"); + canister_fuel = new ItemCustomLore().setUnlocalizedName("canister_fuel").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_fuel"); + canister_napalm = new ItemCustomLore().setUnlocalizedName("canister_napalm").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_napalm"); + syringe_empty = new Item().setUnlocalizedName("syringe_empty").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_empty"); syringe_antidote = new ItemSyringe().setUnlocalizedName("syringe_antidote").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_antidote"); syringe_awesome = new ItemSyringe().setUnlocalizedName("syringe_awesome").setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":syringe_awesome"); @@ -804,6 +866,7 @@ public class ModItems { GameRegistry.registerItem(plate_schrabidium, plate_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(plate_copper, plate_copper.getUnlocalizedName()); GameRegistry.registerItem(plate_gold, plate_gold.getUnlocalizedName()); + GameRegistry.registerItem(hazmat_cloth, hazmat_cloth.getUnlocalizedName()); //Wires GameRegistry.registerItem(wire_aluminium, wire_aluminium.getUnlocalizedName()); @@ -843,6 +906,29 @@ public class ModItems { GameRegistry.registerItem(sphere_steel, sphere_steel.getUnlocalizedName()); GameRegistry.registerItem(pedestal_steel, pedestal_steel.getUnlocalizedName()); GameRegistry.registerItem(dysfunctional_reactor, dysfunctional_reactor.getUnlocalizedName()); + GameRegistry.registerItem(warhead_generic_small, warhead_generic_small.getUnlocalizedName()); + GameRegistry.registerItem(warhead_generic_medium, warhead_generic_medium.getUnlocalizedName()); + GameRegistry.registerItem(warhead_generic_large, warhead_generic_large.getUnlocalizedName()); + GameRegistry.registerItem(warhead_incendiary_small, warhead_incendiary_small.getUnlocalizedName()); + GameRegistry.registerItem(warhead_incendiary_medium, warhead_incendiary_medium.getUnlocalizedName()); + GameRegistry.registerItem(warhead_incendiary_large, warhead_incendiary_large.getUnlocalizedName()); + GameRegistry.registerItem(warhead_cluster_small, warhead_cluster_small.getUnlocalizedName()); + GameRegistry.registerItem(warhead_cluster_medium, warhead_cluster_medium.getUnlocalizedName()); + GameRegistry.registerItem(warhead_cluster_large, warhead_cluster_large.getUnlocalizedName()); + GameRegistry.registerItem(warhead_buster_small, warhead_buster_small.getUnlocalizedName()); + GameRegistry.registerItem(warhead_buster_medium, warhead_buster_medium.getUnlocalizedName()); + GameRegistry.registerItem(warhead_buster_large, warhead_buster_large.getUnlocalizedName()); + GameRegistry.registerItem(warhead_nuclear, warhead_nuclear.getUnlocalizedName()); + GameRegistry.registerItem(warhead_mirvlet, warhead_mirvlet.getUnlocalizedName()); + GameRegistry.registerItem(warhead_mirv, warhead_mirv.getUnlocalizedName()); + GameRegistry.registerItem(warhead_thermo_endo, warhead_thermo_endo.getUnlocalizedName()); + GameRegistry.registerItem(warhead_thermo_exo, warhead_thermo_exo.getUnlocalizedName()); + GameRegistry.registerItem(fuel_tank_small, fuel_tank_small.getUnlocalizedName()); + GameRegistry.registerItem(fuel_tank_medium, fuel_tank_medium.getUnlocalizedName()); + GameRegistry.registerItem(fuel_tank_large, fuel_tank_large.getUnlocalizedName()); + GameRegistry.registerItem(thruster_small, thruster_small.getUnlocalizedName()); + GameRegistry.registerItem(thruster_medium, thruster_medium.getUnlocalizedName()); + GameRegistry.registerItem(thruster_large, thruster_large.getUnlocalizedName()); //Circuits GameRegistry.registerItem(circuit_aluminium, circuit_aluminium.getUnlocalizedName()); @@ -869,6 +955,11 @@ public class ModItems { GameRegistry.registerItem(cell_deuterium, cell_deuterium.getUnlocalizedName()); GameRegistry.registerItem(cell_sas3, cell_sas3.getUnlocalizedName()); GameRegistry.registerItem(cell_antimatter, cell_antimatter.getUnlocalizedName()); + + //Canisters + GameRegistry.registerItem(canister_empty, canister_empty.getUnlocalizedName()); + GameRegistry.registerItem(canister_fuel, canister_fuel.getUnlocalizedName()); + GameRegistry.registerItem(canister_napalm, canister_napalm.getUnlocalizedName()); //Batteries GameRegistry.registerItem(battery_generic, battery_generic.getUnlocalizedName()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 18d487ed5..0dd264f28 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -36,6 +36,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.wire_copper, 6), new Object[] { "CCC", 'S', Items.string, 'C', ModItems.ingot_copper }); GameRegistry.addRecipe(new ItemStack(ModItems.wire_gold, 6), new Object[] { "CCC", 'S', Items.string, 'C', Items.gold_ingot }); GameRegistry.addRecipe(new ItemStack(ModItems.wire_schrabidium, 6), new Object[] { "CCC", 'S', Items.string, 'C', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 4), new Object[] { "LN", "LN", 'L', Items.leather, 'N', ModItems.nugget_lead }); GameRegistry.addRecipe(new ItemStack(ModItems.circuit_aluminium, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.plate_steel, 'R', Items.redstone, 'A', ModItems.wire_aluminium }); GameRegistry.addRecipe(new ItemStack(ModItems.circuit_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_aluminium, 'R', Items.glowstone_dust, 'A', ModItems.wire_copper }); @@ -52,6 +53,10 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cell_deuterium, 8), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.cell_empty, 'T', ModItems.mike_deut }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.cell_sas3, 1), new Object[] { ModItems.cell_empty, ModItems.powder_schrabidium, ModItems.sulfur, ModItems.sulfur }); + GameRegistry.addRecipe(new ItemStack(ModItems.canister_empty, 2), new Object[] { "S ", "AA", "AA", 'S', ModItems.plate_steel, 'A', ModItems.plate_aluminium }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.red_barrel), 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.canister_fuel, 'T', ModItems.tank_steel }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.yellow_barrel), 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.nuclear_waste, 'T', ModItems.tank_steel }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_aluminium), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_aluminium }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_copper), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_copper }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_fluorite), 1), new Object[] { "###", "###", "###", '#', ModItems.fluorite }); @@ -276,6 +281,46 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.sphere_steel, 1), new Object[] { "PIP", "I I", "PIP", 'P', ModItems.plate_steel, 'I', ModItems.ingot_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.pedestal_steel, 1), new Object[] { "P P", "P P", "III", 'P', ModItems.plate_steel, 'I', ModItems.ingot_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.dysfunctional_reactor, 1), new Object[] { "PPP", "CDC", "PPP", 'P', ModItems.plate_steel, 'C', ModItems.rod_quad_empty, 'D', new ItemStack(Items.dye, 1, 3) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_generic_small, 1), new Object[] { " P ", "PTP", "PTP", 'P', ModItems.plate_titanium, 'T', Item.getItemFromBlock(Blocks.tnt) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_small, 1), new Object[] { " P ", "PWP", " P ", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_small, 1), new Object[] { " P ", "PWP", " P ", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_small, 1), new Object[] { " P ", "PWP", " P ", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_generic_medium, 1), new Object[] { " P ", "PTP", "TTT", 'P', ModItems.plate_titanium, 'T', Item.getItemFromBlock(Blocks.tnt) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_medium, 1), new Object[] { "PPP", "PWP", "PPP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_generic_large, 1), new Object[] { "PTP", "PTP", "TTT", 'P', ModItems.plate_titanium, 'T', Item.getItemFromBlock(Blocks.tnt) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_incendiary_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.powder_fire, 'W', ModItems.warhead_generic_large, 'X', Items.lava_bucket }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_cluster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', ModItems.pellet_cluster, 'W', ModItems.warhead_generic_large, 'X', Item.getItemFromBlock(ModBlocks.det_cord) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_buster_large, 1), new Object[] { "PXP", "XWX", "PXP", 'P', Item.getItemFromBlock(ModBlocks.det_cord), 'W', ModItems.warhead_generic_large, 'X', Item.getItemFromBlock(Blocks.tnt) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_nuclear, 1), new Object[] { " N ", "TZT", "TBT", 'N', ModItems.boy_shielding, 'Z', ModItems.boy_target, 'B', ModItems.boy_bullet, 'T', ModItems.plate_titanium }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirvlet, 1), new Object[] { " S ", "SPS", "STS", 'S', ModItems.plate_steel, 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_mirv, 1), new Object[] { "MMM", "MWM", "MMM", 'M', ModItems.warhead_mirvlet, 'W', ModItems.warhead_generic_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_thermo_endo, 1), new Object[] { " T ", "TBT", "TBT", 'T', ModItems.plate_titanium, 'B', Item.getItemFromBlock(ModBlocks.therm_endo) }); + GameRegistry.addRecipe(new ItemStack(ModItems.warhead_thermo_exo, 1), new Object[] { " T ", "TBT", "TBT", 'T', ModItems.plate_titanium, 'B', Item.getItemFromBlock(ModBlocks.therm_exo) }); + GameRegistry.addRecipe(new ItemStack(ModItems.fuel_tank_small, 1), new Object[] { "PTP", "PTP", "PTP", 'P', ModItems.plate_titanium, 'T', Item.getItemFromBlock(ModBlocks.red_barrel) }); + GameRegistry.addRecipe(new ItemStack(ModItems.fuel_tank_medium, 1), new Object[] { "PTP", "PTP", "PTP", 'P', ModItems.plate_titanium, 'T', ModItems.fuel_tank_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.fuel_tank_large, 1), new Object[] { "PTP", "PTP", "PTP", 'P', ModItems.plate_titanium, 'T', ModItems.fuel_tank_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.thruster_small, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_aluminium, 'S', ModItems.plate_steel, 'H', ModItems.hull_small_steel, 'L', ModItems.hull_small_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.thruster_medium, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_copper, 'S', ModItems.thruster_small, 'H', ModItems.hull_small_steel, 'L', ModItems.hull_big_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.thruster_large, 1), new Object[] { "AS ", "AH ", " L ", 'A', ModItems.wire_red_copper, 'S', ModItems.thruster_medium, 'H', ModItems.hull_big_steel, 'L', ModItems.hull_big_steel }); + + GameRegistry.addRecipe(new ItemStack(ModItems.missile_generic, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_incendiary, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_cluster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_buster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_small, 'T', ModItems.fuel_tank_small, 'M', ModItems.thruster_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_incendiary_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_cluster_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_buster_strong, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_medium, 'T', ModItems.fuel_tank_medium, 'M', ModItems.thruster_medium }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_burst, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_generic_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_inferno, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_incendiary_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_rain, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_cluster_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_drill, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_buster_large, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_nuclear, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_nuclear, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_nuclear_cluster, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_mirv, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_endo, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_thermo_endo, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.missile_exo, 1), new Object[] { "W", "T", "M", 'W', ModItems.warhead_thermo_exo, 'T', ModItems.fuel_tank_large, 'M', ModItems.thruster_large }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 1), new Object[] { "AHA", "TCT", "TPT", 'T', ModItems.plate_titanium, 'A', ModItems.plate_aluminium, 'S', ModItems.plate_steel, 'C', ModItems.ingot_copper, 'P', Item.getItemFromBlock(Blocks.piston), 'H', Item.getItemFromBlock(Blocks.hopper) }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_centrifuge), 1), new Object[] { " T ", "RDR", "RSR", 'S', ModItems.plate_steel, 'T', ModItems.centrifuge_tower, 'W', ModItems.coil_tungsten, 'R', ModItems.coil_copper, 'D', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) }); @@ -306,6 +351,11 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_poles), 16), new Object[] { "S S", "SSS", "S S", 'S', ModItems.ingot_steel }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.pole_top), 1), new Object[] { "T T", "TRT", "BBB", 'T', ModItems.ingot_tungsten, 'B', ModItems.ingot_beryllium, 'R', ModItems.ingot_red_copper }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.pole_satellite_receiver), 1), new Object[] { "SS ", "SCR", "SS ", 'S', ModItems.ingot_steel, 'C', ModItems.circuit_red_copper, 'R', ModItems.wire_red_copper }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_beam), 8), new Object[] { "S", "S", "S", 'S', ModItems.ingot_steel }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_wall), 4), new Object[] { "SSS", "SSS", 'S', ModItems.ingot_steel }); + GameRegistry.addShapelessRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_corner)), new Object[] { Item.getItemFromBlock(ModBlocks.steel_wall), Item.getItemFromBlock(ModBlocks.steel_wall) }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_roof), 2), new Object[] { "SSS", 'S', ModItems.ingot_steel }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_scaffold), 8), new Object[] { "SSS", " S ", "SSS", 'S', ModItems.ingot_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " S ", 'S', ModItems.plate_steel, 'W', Item.getItemFromBlock(Blocks.log) }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_rpg_ammo, 8), new Object[] { "SI ", "ITI", " I ", 'S', ModItems.plate_steel, 'T', Item.getItemFromBlock(Blocks.tnt), 'I', ModItems.plate_iron }); @@ -345,6 +395,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.syringe_antidote, 6), new Object[] { "SPS", "SMS", "SPS", 'S', ModItems.syringe_empty, 'P', Items.pumpkin_seeds, 'M', Items.reeds }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SPS", "NCN", "SPS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 }); GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SNS", "PCP", "SNS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_empty, 6), new Object[] { "P", "C", "B", 'B', Item.getItemFromBlock(Blocks.iron_bars), 'C', ModItems.rod_empty, 'P', ModItems.plate_iron }); + GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.nether_wart, 'S', ModItems.syringe_empty }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_gadget), 1), new Object[] { "DGD", "FCF", "DPD", 'G', ModItems.wire_gold, 'F', ModItems.fins_flat, 'C', ModItems.sphere_steel, 'P', ModItems.pedestal_steel, 'D', new ItemStack(Items.dye, 1, 8) }); @@ -426,6 +478,14 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_helmet, 1), new Object[] { "EEE", "EIE", " P ", 'E', ModItems.hazmat_cloth, 'I', Item.getItemFromBlock(Blocks.glass_pane), 'P', ModItems.plate_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.hazmat_cloth }); + GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.hazmat_cloth }); + GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.hazmat_cloth }); + + GameRegistry.addRecipe(new ItemStack(ModItems.goggles, 1), new Object[] { "P P", "GPG", 'G', Item.getItemFromBlock(Blocks.glass_pane), 'P', ModItems.plate_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.gas_mask, 1), new Object[] { "PPP", "GPG", " P ", 'G', Item.getItemFromBlock(Blocks.glass_pane), 'P', ModItems.plate_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.igniter, 1), new Object[] { " W", "SC", "CE", 'S', ModItems.plate_steel, 'W', ModItems.wire_schrabidium, 'C', ModItems.circuit_schrabidium, 'E', ModItems.ingot_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_plate, 1), new Object[] { "E E", "EWE", "EEE", 'E', ModItems.ingot_euphemium, 'W', ModItems.watch }); diff --git a/com/hbm/render/RenderLaunchPadTier1.java b/com/hbm/render/RenderLaunchPadTier1.java index 3b7372d0c..07f0137b3 100644 --- a/com/hbm/render/RenderLaunchPadTier1.java +++ b/com/hbm/render/RenderLaunchPadTier1.java @@ -33,6 +33,9 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer { private ResourceLocation missileClusterTexture; private ResourceLocation missileBusterTexture; private ResourceLocation missileStrongTexture; + private ResourceLocation missileStrongIncenidaryTexture; + private ResourceLocation missileStrongClusterTexture; + private ResourceLocation missileStrongBusterTexture; private ResourceLocation missileHugeTexture; private ResourceLocation missileNuclearTexture; private ResourceLocation missileMirvTexture; @@ -53,6 +56,9 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer { missileClusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileCluster.png"); missileBusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileBuster.png"); missileStrongTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGeneric.png"); + missileStrongIncenidaryTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericIncendiary.png"); + missileStrongClusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericCluster.png"); + missileStrongBusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericBuster.png"); missileHugeTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHuge.png"); missileNuclearTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileNuke.png"); missileMirvTexture = new ResourceLocation(RefStrings.MODID, "textures/models/missileMirv.png"); @@ -123,19 +129,19 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer { if(((TileEntityLaunchPad)tileEntity).state == 7) { GL11.glScalef(1.5F, 1.5F, 1.5F); - bindTexture(missileStrongTexture); + bindTexture(missileStrongIncenidaryTexture); missileStrong.renderAll(); } if(((TileEntityLaunchPad)tileEntity).state == 8) { GL11.glScalef(1.5F, 1.5F, 1.5F); - bindTexture(missileStrongTexture); + bindTexture(missileStrongClusterTexture); missileStrong.renderAll(); } if(((TileEntityLaunchPad)tileEntity).state == 9) { GL11.glScalef(1.5F, 1.5F, 1.5F); - bindTexture(missileStrongTexture); + bindTexture(missileStrongBusterTexture); missileStrong.renderAll(); } if(((TileEntityLaunchPad)tileEntity).state == 10) @@ -164,19 +170,19 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer { } if(((TileEntityLaunchPad)tileEntity).state == 14) { - GL11.glScalef(1.0F, 1.0F, 1.0F); + GL11.glScalef(1.5F, 1.5F, 1.5F); bindTexture(missileThermoTexture); missileThermo.renderAll(); } if(((TileEntityLaunchPad)tileEntity).state == 15) { - GL11.glScalef(1.0F, 1.0F, 1.0F); + GL11.glScalef(1.5F, 1.5F, 1.5F); bindTexture(missileThermoTexture); missileThermo.renderAll(); } if(((TileEntityLaunchPad)tileEntity).state == 16) { - GL11.glScalef(1.0F, 1.0F, 1.0F); + GL11.glScalef(2F, 2F, 2F); bindTexture(missileMirvTexture); missileMirv.renderAll(); } diff --git a/com/hbm/render/RenderMissileMirv.java b/com/hbm/render/RenderMissileMirv.java index 509636cb4..2b19ba82b 100644 --- a/com/hbm/render/RenderMissileMirv.java +++ b/com/hbm/render/RenderMissileMirv.java @@ -28,6 +28,7 @@ public class RenderMissileMirv extends Render { GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F); + GL11.glScalef(2F, 2F, 2F); bindTexture(boyTexture); boyModel.renderAll(); diff --git a/com/hbm/render/RenderMissileStrong.java b/com/hbm/render/RenderMissileStrong.java index a5f260f52..4e092545e 100644 --- a/com/hbm/render/RenderMissileStrong.java +++ b/com/hbm/render/RenderMissileStrong.java @@ -2,6 +2,10 @@ package com.hbm.render; import org.lwjgl.opengl.GL11; +import com.hbm.entity.EntityMissileBusterStrong; +import com.hbm.entity.EntityMissileClusterStrong; +import com.hbm.entity.EntityMissileIncendiaryStrong; +import com.hbm.entity.EntityMissileStrong; import com.hbm.lib.RefStrings; import net.minecraft.client.renderer.entity.Render; @@ -15,10 +19,16 @@ public class RenderMissileStrong extends Render { private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/MissileGeneric.obj"); private IModelCustom boyModel; private ResourceLocation boyTexture; + private ResourceLocation missileStrongIncenidaryTexture; + private ResourceLocation missileStrongClusterTexture; + private ResourceLocation missileStrongBusterTexture; public RenderMissileStrong() { boyModel = AdvancedModelLoader.loadModel(objTesterModelRL); boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGeneric.png"); + missileStrongIncenidaryTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericIncendiary.png"); + missileStrongClusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericCluster.png"); + missileStrongBusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericBuster.png"); } @Override @@ -30,7 +40,14 @@ public class RenderMissileStrong extends Render { GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F); - bindTexture(boyTexture); + if(p_76986_1_ instanceof EntityMissileStrong) + bindTexture(boyTexture); + if(p_76986_1_ instanceof EntityMissileIncendiaryStrong) + bindTexture(missileStrongIncenidaryTexture); + if(p_76986_1_ instanceof EntityMissileClusterStrong) + bindTexture(missileStrongClusterTexture); + if(p_76986_1_ instanceof EntityMissileBusterStrong) + bindTexture(missileStrongBusterTexture); boyModel.renderAll(); GL11.glPopMatrix(); } diff --git a/com/hbm/render/RenderMissileThermo.java b/com/hbm/render/RenderMissileThermo.java index 675cabf05..8afd9b104 100644 --- a/com/hbm/render/RenderMissileThermo.java +++ b/com/hbm/render/RenderMissileThermo.java @@ -26,9 +26,9 @@ public class RenderMissileThermo extends Render { GL11.glPushMatrix(); GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glScalef(2F, 2F, 2F); GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F); + GL11.glScalef(1.5F, 1.5F, 1.5F); bindTexture(boyTexture); boyModel.renderAll();