diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index d8534a518..5c1a4e79c 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -94,6 +94,9 @@ chem.BP_BIOGAS=Biogasherstellung chem.BP_BIOFUEL=Biodieselumesterung chem.SAS3=Schrabidiumtrisulfatherstellung chem.NITAN=NITAN-Supertreibstoff mischen +chem.DYN_SCHRAB=Schrabidium-Dynosynthese +chem.DYN_EUPH=Euphemium-Dynosynthese +chem.DYN_DNT=Dineutronium-Dynosynthese item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -839,6 +842,7 @@ item.rod_quad_waste.name=Vierfacher Atommüllstab item.gun_rpg.name=Raketenwerfer item.gun_rpg_ammo.name=Rakete item.gun_stinger.name=FIM-92 Stinger +item.gun_skystinger.name=The One Sky Stinger item.gun_stinger_ammo.name=Stinger-Rakete item.flame_pony.name=Bild eines Cartoon Ponys @@ -1073,6 +1077,13 @@ item.clip_bolt_action.name=12x74 Brenneke-Patronenbox item.clip_emp.name=Magnetsteifen mit Energiezellen item.clip_revolver_nightmare.name=Sack voll Kugeln item.clip_revolver_nightmare2.name=Munitionsgürtel mit Laserschrot +item.clip_revolver_pip.name=Speedloader mit verdorbenen Patronen +item.clip_stinger.name=Dreierpack Stinger-Raketen +item.clip_jack.name=12x70 Vierfache Schrotpatronenbox +item.clip_spark.name=Große Elektromagnetische Katusche +item.clip_hp.name=Tintentanks +item.clip_euthanasia.name=Letzte-Hilfe Koffer +item.clip_defabricator.name=Gürtel mit Defabrikator-Energiezellen item.ammo_container.name=Munitionsbehälter diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 85ae65283..4579ac7b6 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -94,6 +94,9 @@ chem.BP_BIOGAS=Biogas Production chem.BP_BIOFUEL=Biofuel Transesterification chem.SAS3=Schrabidium Trisulfide Production chem.NITAN=NITAN Super Fuel Mixing +chem.DYN_SCHRAB=Schrabidium Dynosynthesis +chem.DYN_EUPH=Euphemium Dynosynthesis +chem.DYN_DNT=Dineutronium Dynosynthesis item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -842,6 +845,7 @@ item.rod_quad_waste.name=Nuclear Waste Quad Rod item.gun_rpg.name=Rocket Launcher item.gun_rpg_ammo.name=Rocket item.gun_stinger.name=FIM-92 Stinger +item.gun_skystinger.name=The One Sky Stinger item.gun_stinger_ammo.name=Stinger Rocket item.flame_pony.name=Painting of a Cartoon Pony @@ -1076,6 +1080,13 @@ item.clip_bolt_action.name=Box of 12x74 Slugs item.clip_emp.name=Small Pack of Energy Cells item.clip_revolver_nightmare.name=Bag of Bullets item.clip_revolver_nightmare2.name=Belt with Laser Buckshot +item.clip_revolver_pip.name=Speedloader with Tainted Bullets +item.clip_stinger.name=Pack of Stinger Rockets +item.clip_jack.name=Box of Quadruple 12x70 Buckshot Rounds +item.clip_spark.name=Large Electromagnetic Cartridge +item.clip_hp.name=Ink Tanks +item.clip_euthanasia.name=Last Aid Kit +item.clip_defabricator.name=Belt with Defabricator Energy Cells item.ammo_container.name=Ammo Container diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 1f6996088..8386202df 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -54,6 +54,8 @@ "weapon.bang": {"category": "player", "sounds": [{"name": "weapon/bang", "stream": false}]}, "weapon.leverActionReload": {"category": "player", "sounds": [{"name": "weapon/leverActionReload", "stream": false}]}, "weapon.b92Reload": {"category": "player", "sounds": [{"name": "weapon/b92Reload", "stream": false}]}, + "weapon.stingerLockOn": {"category": "player", "sounds": [{"name": "weapon/stingerLockOn", "stream": false}]}, + "weapon.sawShoot": {"category": "player", "sounds": [{"name": "weapon/sawShoot", "stream": false}]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, diff --git a/assets/hbm/sounds/weapon/sawShoot.ogg b/assets/hbm/sounds/weapon/sawShoot.ogg new file mode 100644 index 000000000..703113358 Binary files /dev/null and b/assets/hbm/sounds/weapon/sawShoot.ogg differ diff --git a/assets/hbm/sounds/weapon/stingerLockOn.ogg b/assets/hbm/sounds/weapon/stingerLockOn.ogg new file mode 100644 index 000000000..88d954ec5 Binary files /dev/null and b/assets/hbm/sounds/weapon/stingerLockOn.ogg differ diff --git a/assets/hbm/textures/items/chem_icon_DYN_DNT.png b/assets/hbm/textures/items/chem_icon_DYN_DNT.png new file mode 100644 index 000000000..7a9e726fd Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_DYN_DNT.png differ diff --git a/assets/hbm/textures/items/chem_icon_DYN_EUPH.png b/assets/hbm/textures/items/chem_icon_DYN_EUPH.png new file mode 100644 index 000000000..4b560ba5b Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_DYN_EUPH.png differ diff --git a/assets/hbm/textures/items/chem_icon_DYN_SCHRAB.png b/assets/hbm/textures/items/chem_icon_DYN_SCHRAB.png new file mode 100644 index 000000000..23b8328b5 Binary files /dev/null and b/assets/hbm/textures/items/chem_icon_DYN_SCHRAB.png differ diff --git a/assets/hbm/textures/items/clip_defabricator.png b/assets/hbm/textures/items/clip_defabricator.png new file mode 100644 index 000000000..18ed33b08 Binary files /dev/null and b/assets/hbm/textures/items/clip_defabricator.png differ diff --git a/assets/hbm/textures/items/clip_euthanasia.png b/assets/hbm/textures/items/clip_euthanasia.png new file mode 100644 index 000000000..ec46c7165 Binary files /dev/null and b/assets/hbm/textures/items/clip_euthanasia.png differ diff --git a/assets/hbm/textures/items/clip_hp.png b/assets/hbm/textures/items/clip_hp.png new file mode 100644 index 000000000..86fed909a Binary files /dev/null and b/assets/hbm/textures/items/clip_hp.png differ diff --git a/assets/hbm/textures/items/clip_jack.png b/assets/hbm/textures/items/clip_jack.png new file mode 100644 index 000000000..18a0c616b Binary files /dev/null and b/assets/hbm/textures/items/clip_jack.png differ diff --git a/assets/hbm/textures/items/clip_revolver_pip.png b/assets/hbm/textures/items/clip_revolver_pip.png new file mode 100644 index 000000000..b4e48ca51 Binary files /dev/null and b/assets/hbm/textures/items/clip_revolver_pip.png differ diff --git a/assets/hbm/textures/items/clip_spark.png b/assets/hbm/textures/items/clip_spark.png new file mode 100644 index 000000000..898388628 Binary files /dev/null and b/assets/hbm/textures/items/clip_spark.png differ diff --git a/assets/hbm/textures/items/clip_stinger.png b/assets/hbm/textures/items/clip_stinger.png new file mode 100644 index 000000000..321673eac Binary files /dev/null and b/assets/hbm/textures/items/clip_stinger.png differ diff --git a/assets/hbm/textures/items/gun_skystinger.png b/assets/hbm/textures/items/gun_skystinger.png new file mode 100644 index 000000000..9c07773ef Binary files /dev/null and b/assets/hbm/textures/items/gun_skystinger.png differ diff --git a/assets/hbm/textures/models/ModelSkyStinger.png b/assets/hbm/textures/models/ModelSkyStinger.png new file mode 100644 index 000000000..6b0f85daa Binary files /dev/null and b/assets/hbm/textures/models/ModelSkyStinger.png differ diff --git a/com/hbm/blocks/bomb/TurretCWIS.java b/com/hbm/blocks/bomb/TurretCWIS.java index 76dc392ed..a2563d122 100644 --- a/com/hbm/blocks/bomb/TurretCWIS.java +++ b/com/hbm/blocks/bomb/TurretCWIS.java @@ -64,7 +64,7 @@ public class TurretCWIS extends TurretBase { world.spawnEntityInWorld(smoke); } - world.playSoundEffect(x, y, z, "hbm:entity.oldExplosion", 1.0F, 0.5F); + world.playSoundEffect(x, y, z, "hbm:weapon.sawShoot", 1.0F, 1.25F); flag = true; } diff --git a/com/hbm/blocks/generic/BlockCrate.java b/com/hbm/blocks/generic/BlockCrate.java index ee3264be8..67ae1b99c 100644 --- a/com/hbm/blocks/generic/BlockCrate.java +++ b/com/hbm/blocks/generic/BlockCrate.java @@ -74,6 +74,13 @@ public class BlockCrate extends BlockFalling { list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_mp, 3); list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_xvl1456, 5); list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_emp, 3); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_defabricator, 3); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_euthanasia, 2); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_hp, 2); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_jack, 2); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_pip, 3); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_spark, 2); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_stinger, 5); list1 = BlockCrate.addToListWithWeight(list1, ModItems.grenade_generic, 8); list1 = BlockCrate.addToListWithWeight(list1, ModItems.grenade_strong, 6); list1 = BlockCrate.addToListWithWeight(list1, ModItems.grenade_mk2, 4); diff --git a/com/hbm/entity/projectile/EntityRocketHoming.java b/com/hbm/entity/projectile/EntityRocketHoming.java index f4bdb787f..dc55d659b 100644 --- a/com/hbm/entity/projectile/EntityRocketHoming.java +++ b/com/hbm/entity/projectile/EntityRocketHoming.java @@ -274,11 +274,6 @@ public class EntityRocketHoming extends Entity implements IProjectile explosion.posY = this.posY; explosion.posZ = this.posZ; this.worldObj.spawnEntityInWorld(explosion);*/ - } - if (!this.worldObj.isRemote) - { - //this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5, true, false, true); } this.setDead(); } @@ -509,17 +504,20 @@ public class EntityRocketHoming extends Entity implements IProjectile this.func_145775_I(); } - steer(); + if(!steer()) + lockonTicks = 0; if (this.ticksExisted > 250) this.setDead(); } - int homingRadius = 35; - int homingMod = 15; - float acceptance = 120; + public int homingRadius = 35; + public int homingMod = 15; + public float acceptance = 120; + int lockonTicks = 0; + boolean hasBeeped = false; - private void steer() { + private boolean steer() { List all = worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox(posX - homingRadius, posY - homingRadius, posZ - homingRadius, posX + homingRadius, posY + homingRadius, posZ + homingRadius)); HashMap targetable = new HashMap(); Vec3 path = Vec3.createVectorHelper(motionX, motionY, motionZ); @@ -527,10 +525,14 @@ public class EntityRocketHoming extends Entity implements IProjectile path.normalize(); if(all.isEmpty()) - return; + return false; //Iterate through all entities and only allocate ones that can be targeted for(Entity e : all) { + + if(e == this.shootingEntity) + continue; + Vec3 rel = Vec3.createVectorHelper(e.posX - posX, e.posY + e.getEyeHeight() - posY, e.posZ - posZ); double vecProd = rel.xCoord * path.xCoord + rel.yCoord * path.yCoord + rel.zCoord * path.zCoord; double bot = rel.lengthVector() * path.lengthVector(); @@ -543,7 +545,7 @@ public class EntityRocketHoming extends Entity implements IProjectile } if(targetable.isEmpty()) - return; + return false; double smallest = Double.POSITIVE_INFINITY; Entity nearestE = null; @@ -557,7 +559,7 @@ public class EntityRocketHoming extends Entity implements IProjectile } if(nearestE == null) - return; + return false; Vec3 winVec = Vec3.createVectorHelper(nearestE.posX - posX, nearestE.posY - posY, nearestE.posZ - posZ); @@ -577,6 +579,14 @@ public class EntityRocketHoming extends Entity implements IProjectile motionY = newPath.yCoord; motionZ = newPath.zCoord; this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, (float)startSpeed, 0.0F); + + lockonTicks++; + if(lockonTicks == 5 && !hasBeeped) { + worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 1F); + hasBeeped = true; + } + + return true; } /** @@ -637,7 +647,7 @@ public class EntityRocketHoming extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) + if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 1))) { flag = false; } diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 201910c38..cb6322b7a 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -2996,6 +2996,38 @@ public class MachineRecipes { list.add(new ItemStack(ModBlocks.fwatz_computer, 2)); list.add(new ItemStack(ModItems.crystal_xen, 1)); break; + case AMS_LIMITER: + list.add(new ItemStack(ModItems.component_limiter, 5)); + list.add(new ItemStack(ModItems.plate_steel, 64)); + list.add(new ItemStack(ModItems.plate_titanium, 128)); + list.add(new ItemStack(ModItems.plate_dineutronium, 16)); + list.add(new ItemStack(ModItems.circuit_schrabidium, 6)); + list.add(new ItemStack(ModItems.pipes_steel, 16)); + list.add(new ItemStack(ModItems.motor, 12)); + list.add(new ItemStack(ModItems.coil_advanced_torus, 12)); + list.add(new ItemStack(ModItems.entanglement_kit, 1)); + break; + case AMS_EMITTER: + list.add(new ItemStack(ModItems.component_emitter, 16)); + list.add(new ItemStack(ModItems.plate_steel, 128)); + list.add(new ItemStack(ModItems.plate_titanium, 192)); + list.add(new ItemStack(ModItems.plate_dineutronium, 32)); + list.add(new ItemStack(ModItems.circuit_schrabidium, 12)); + list.add(new ItemStack(ModItems.coil_advanced_torus, 24)); + list.add(new ItemStack(ModItems.entanglement_kit, 3)); + list.add(new ItemStack(ModItems.crystal_horn, 1)); + list.add(new ItemStack(ModBlocks.fwatz_core, 1)); + break; + case RADAR: + list.add(new ItemStack(ModItems.ingot_steel, 8)); + list.add(new ItemStack(ModItems.plate_steel, 16)); + list.add(new ItemStack(ModItems.ingot_polymer, 4)); + list.add(new ItemStack(ModItems.plate_polymer, 24)); + list.add(new ItemStack(ModItems.magnetron, 10)); + list.add(new ItemStack(ModItems.motor, 3)); + list.add(new ItemStack(ModItems.circuit_gold, 4)); + list.add(new ItemStack(ModItems.coil_copper, 12)); + break; default: list.add(new ItemStack(Items.stick)); break; @@ -3672,6 +3704,15 @@ public class MachineRecipes { case COMPONENT_EMITTER: output = new ItemStack(ModItems.component_emitter, 1); break; + case AMS_LIMITER: + output = new ItemStack(ModBlocks.ams_limiter, 1); + break; + case AMS_EMITTER: + output = new ItemStack(ModBlocks.ams_emitter, 1); + break; + case RADAR: + output = new ItemStack(ModBlocks.machine_radar, 1); + break; default: output = new ItemStack(Items.stick, 1); break; @@ -4212,7 +4253,7 @@ public class MachineRecipes { input[0] = new FluidStack(800, FluidType.SMEAR); break; case CC_HEATING: - input[0] = new FluidStack(800, FluidType.HEATINGOIL); + input[0] = new FluidStack(1800, FluidType.HEATINGOIL); break; case CC_HEAVY: input[0] = new FluidStack(1800, FluidType.HEAVYOIL); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 2fc2af3e0..912539c76 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -660,6 +660,7 @@ public class ModItems { public static Item gun_rpg; public static Item gun_rpg_ammo; public static Item gun_stinger; + public static Item gun_skystinger; public static Item gun_stinger_ammo; public static Item gun_revolver; public static Item gun_revolver_ammo; @@ -1041,7 +1042,9 @@ public class ModItems { public static Item clip_revolver_cursed; public static Item clip_revolver_nightmare; public static Item clip_revolver_nightmare2; + public static Item clip_revolver_pip; public static Item clip_rpg; + public static Item clip_stinger; public static Item clip_fatman; public static Item clip_mirv; public static Item clip_bf; @@ -1055,6 +1058,11 @@ public class ModItems { public static Item clip_mp; public static Item clip_xvl1456; public static Item clip_emp; + public static Item clip_jack; + public static Item clip_spark; + public static Item clip_hp; + public static Item clip_euthanasia; + public static Item clip_defabricator; public static Item ammo_container; @@ -1756,6 +1764,7 @@ public class ModItems { gun_rpg = new GunRpg().setUnlocalizedName("gun_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg_new"); gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_new"); gun_stinger = new GunStinger().setUnlocalizedName("gun_stinger").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_stinger"); + gun_skystinger = new GunStinger().setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_skystinger"); gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_stinger_ammo"); gun_revolver_ammo = new Item().setUnlocalizedName("gun_revolver_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_ammo"); gun_revolver = new GunRevolver(gun_revolver_ammo, 10, 25, false, false).setMaxDamage(500).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver"); @@ -1997,7 +2006,9 @@ public class ModItems { clip_revolver_cursed = new ItemClip().setUnlocalizedName("clip_revolver_cursed").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_cursed"); clip_revolver_nightmare = new ItemClip().setUnlocalizedName("clip_revolver_nightmare").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_nightmare"); clip_revolver_nightmare2 = new ItemClip().setUnlocalizedName("clip_revolver_nightmare2").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_nightmare2"); + clip_revolver_pip = new ItemClip().setUnlocalizedName("clip_revolver_pip").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_pip"); clip_rpg = new ItemClip().setUnlocalizedName("clip_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_rpg"); + clip_stinger = new ItemClip().setUnlocalizedName("clip_stinger").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_stinger"); clip_fatman = new ItemClip().setUnlocalizedName("clip_fatman").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_fatman"); clip_mirv = new ItemClip().setUnlocalizedName("clip_mirv").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_mirv"); clip_bf = new ItemClip().setUnlocalizedName("clip_bf").setCreativeTab(null).setTextureName(RefStrings.MODID + ":clip_bf"); @@ -2011,6 +2022,11 @@ public class ModItems { clip_mp = new ItemClip().setUnlocalizedName("clip_mp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_mp"); clip_xvl1456 = new ItemClip().setUnlocalizedName("clip_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_xvl1456"); clip_emp = new ItemClip().setUnlocalizedName("clip_emp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_emp"); + clip_jack = new ItemClip().setUnlocalizedName("clip_jack").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_jack"); + clip_spark = new ItemClip().setUnlocalizedName("clip_spark").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_spark"); + clip_hp = new ItemClip().setUnlocalizedName("clip_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_hp"); + clip_euthanasia = new ItemClip().setUnlocalizedName("clip_euthanasia").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_euthanasia"); + clip_defabricator = new ItemClip().setUnlocalizedName("clip_defabricator").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_defabricator"); ammo_container = new ItemClip().setUnlocalizedName("ammo_container").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":ammo_container"); @@ -3046,6 +3062,7 @@ public class ModItems { GameRegistry.registerItem(gun_spark, gun_spark.getUnlocalizedName()); GameRegistry.registerItem(gun_hp, gun_hp.getUnlocalizedName()); GameRegistry.registerItem(gun_euthanasia, gun_euthanasia.getUnlocalizedName()); + GameRegistry.registerItem(gun_skystinger, gun_skystinger.getUnlocalizedName()); //GameRegistry.registerItem(gun_dash, gun_dash.getUnlocalizedName()); //GameRegistry.registerItem(gun_twigun, gun_twigun.getUnlocalizedName()); GameRegistry.registerItem(gun_defabricator, gun_defabricator.getUnlocalizedName()); @@ -3103,7 +3120,9 @@ public class ModItems { GameRegistry.registerItem(clip_revolver_cursed, clip_revolver_cursed.getUnlocalizedName()); GameRegistry.registerItem(clip_revolver_nightmare, clip_revolver_nightmare.getUnlocalizedName()); GameRegistry.registerItem(clip_revolver_nightmare2, clip_revolver_nightmare2.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver_pip, clip_revolver_pip.getUnlocalizedName()); GameRegistry.registerItem(clip_rpg, clip_rpg.getUnlocalizedName()); + GameRegistry.registerItem(clip_stinger, clip_stinger.getUnlocalizedName()); GameRegistry.registerItem(clip_fatman, clip_fatman.getUnlocalizedName()); GameRegistry.registerItem(clip_mirv, clip_mirv.getUnlocalizedName()); GameRegistry.registerItem(clip_bf, clip_bf.getUnlocalizedName()); @@ -3117,6 +3136,11 @@ public class ModItems { GameRegistry.registerItem(clip_cryolator, clip_cryolator.getUnlocalizedName()); GameRegistry.registerItem(clip_mp, clip_mp.getUnlocalizedName()); GameRegistry.registerItem(clip_emp, clip_emp.getUnlocalizedName()); + GameRegistry.registerItem(clip_jack, clip_jack.getUnlocalizedName()); + GameRegistry.registerItem(clip_spark, clip_spark.getUnlocalizedName()); + GameRegistry.registerItem(clip_hp, clip_hp.getUnlocalizedName()); + GameRegistry.registerItem(clip_euthanasia, clip_euthanasia.getUnlocalizedName()); + GameRegistry.registerItem(clip_defabricator, clip_defabricator.getUnlocalizedName()); GameRegistry.registerItem(ammo_container, ammo_container.getUnlocalizedName()); diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index bc81df6c2..f391984bb 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -231,7 +231,10 @@ public class ItemAssemblyTemplate extends Item { FLEIJA_PROPELLANT, SCHRABIDIUM_HAMMER, COMPONENT_LIMITER, - COMPONENT_EMITTER; + COMPONENT_EMITTER, + AMS_LIMITER, + AMS_EMITTER, + RADAR; //private final int value; //private EnumAssemblyTemplate(int value) { @@ -724,6 +727,12 @@ public class ItemAssemblyTemplate extends Item { return 2500; case COMPONENT_EMITTER: return 2500; + case AMS_LIMITER: + return 6000; + case AMS_EMITTER: + return 6000; + case RADAR: + return 300; default: return 100; } diff --git a/com/hbm/items/weapon/GunB92.java b/com/hbm/items/weapon/GunB92.java index 42309c2a4..27562cd3e 100644 --- a/com/hbm/items/weapon/GunB92.java +++ b/com/hbm/items/weapon/GunB92.java @@ -210,6 +210,8 @@ public class GunB92 extends Item { list.add("Only up to ten charges may be stored."); list.add(""); list.add("\"It's nerf or nothing!\""); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunBaleFlare.java b/com/hbm/items/weapon/GunBaleFlare.java index ebaca01d4..d9b26c1df 100644 --- a/com/hbm/items/weapon/GunBaleFlare.java +++ b/com/hbm/items/weapon/GunBaleFlare.java @@ -153,5 +153,7 @@ public class GunBaleFlare extends Item { list.add("Ammo: Mk.V AMAT Shell"); list.add("Damage: 1000"); list.add("Creates small nuclear explosion."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } } diff --git a/com/hbm/items/weapon/GunDampfmaschine.java b/com/hbm/items/weapon/GunDampfmaschine.java index d57e41c6c..d675bbdea 100644 --- a/com/hbm/items/weapon/GunDampfmaschine.java +++ b/com/hbm/items/weapon/GunDampfmaschine.java @@ -106,6 +106,8 @@ public class GunDampfmaschine extends Item { list.add(""); list.add("Ammo: orang"); list.add("Damage: aaaaaaaaa"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunDash.java b/com/hbm/items/weapon/GunDash.java index 42dd8c83e..2c3f534c8 100644 --- a/com/hbm/items/weapon/GunDash.java +++ b/com/hbm/items/weapon/GunDash.java @@ -90,6 +90,8 @@ public class GunDash extends Item { list.add(""); list.add("Ammo: SMG Round"); list.add("Damage: 2 - 8"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunDefabricator.java b/com/hbm/items/weapon/GunDefabricator.java index 37299fd2e..50a4bfbfa 100644 --- a/com/hbm/items/weapon/GunDefabricator.java +++ b/com/hbm/items/weapon/GunDefabricator.java @@ -85,6 +85,8 @@ public class GunDefabricator extends Item { list.add(""); list.add("Ammo: Defabricator Energy Cell"); list.add("Damage: 40 - 120"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunEuthanasia.java b/com/hbm/items/weapon/GunEuthanasia.java index d6532efe6..13a7b9bdc 100644 --- a/com/hbm/items/weapon/GunEuthanasia.java +++ b/com/hbm/items/weapon/GunEuthanasia.java @@ -91,6 +91,8 @@ public class GunEuthanasia extends Item { list.add("Ammo: Syringe"); list.add("Damage: 1 - 4"); list.add("Syringes have a 20% chance to instakill the enemy."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunHP.java b/com/hbm/items/weapon/GunHP.java index f6e13f808..170ad0d99 100644 --- a/com/hbm/items/weapon/GunHP.java +++ b/com/hbm/items/weapon/GunHP.java @@ -105,6 +105,8 @@ public class GunHP extends Item { list.add(""); list.add("Ammo: Ink Cartridge"); list.add("Damage: 25 - 45"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunJack.java b/com/hbm/items/weapon/GunJack.java index b92bf677d..efb6e453e 100644 --- a/com/hbm/items/weapon/GunJack.java +++ b/com/hbm/items/weapon/GunJack.java @@ -136,6 +136,8 @@ public class GunJack extends Item { list.add("Ammo: Quadruple Shotgun Shells"); list.add("Damage: 12 - 24"); list.add("Projectiles: 24 - 48"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunLeverActionS.java b/com/hbm/items/weapon/GunLeverActionS.java index ca0be3801..3fb6b2601 100644 --- a/com/hbm/items/weapon/GunLeverActionS.java +++ b/com/hbm/items/weapon/GunLeverActionS.java @@ -173,6 +173,8 @@ public class GunLeverActionS extends Item { list.add(""); list.add("Ammo: 12x74 Buckshot"); list.add("Damage: Infinite"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunMP.java b/com/hbm/items/weapon/GunMP.java index a0f84d47f..67c4bba62 100644 --- a/com/hbm/items/weapon/GunMP.java +++ b/com/hbm/items/weapon/GunMP.java @@ -88,6 +88,8 @@ public class GunMP extends Item { list.add(""); list.add("Ammo: Small Propellantless Machine Gun Round"); list.add("Damage: 100 - 150"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunRevolver.java b/com/hbm/items/weapon/GunRevolver.java index e8e016016..da43082c4 100644 --- a/com/hbm/items/weapon/GunRevolver.java +++ b/com/hbm/items/weapon/GunRevolver.java @@ -232,6 +232,8 @@ public class GunRevolver extends Item { list.add("Ammo: Schrabidium Bullets"); list.add("Damage: 10000 - 100000"); list.add("Sets enemy's health to zero."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } if (this == ModItems.gun_revolver_cursed) { list.add("You're dead."); @@ -249,6 +251,8 @@ public class GunRevolver extends Item { list.add("Damage: 25 - 35"); list.add("Secondary Damage: 1"); list.add("Enemy is hit by boxcar."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } } diff --git a/com/hbm/items/weapon/GunSpark.java b/com/hbm/items/weapon/GunSpark.java index 9dd434065..b2bcc2bfc 100644 --- a/com/hbm/items/weapon/GunSpark.java +++ b/com/hbm/items/weapon/GunSpark.java @@ -129,6 +129,8 @@ public class GunSpark extends Item { list.add(""); list.add("Ammo: Electromagnetic Cartridge"); list.add("Projectiles explode on impact."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunStinger.java b/com/hbm/items/weapon/GunStinger.java index 1d5d40e2f..24a140a81 100644 --- a/com/hbm/items/weapon/GunStinger.java +++ b/com/hbm/items/weapon/GunStinger.java @@ -28,7 +28,10 @@ public class GunStinger extends Item { public GunStinger() { this.maxStackSize = 1; - this.setMaxDamage(500); + if(this == ModItems.gun_stinger) + this.setMaxDamage(500); + if(this == ModItems.gun_skystinger) + this.setMaxDamage(1000); } @Override @@ -57,24 +60,41 @@ public class GunStinger extends Item { f = 25.0F; } - EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.0F); - - if (f == 1.0F) { - entityarrow.setIsCritical(true); - } - p_77615_1_.damageItem(1, p_77615_3_); p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 0.25F); - if (flag) { - entityarrow.canBePickedUp = 2; - } else { - p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_stinger_ammo); - } + p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_stinger_ammo); if (!p_77615_2_.isRemote) { - entityarrow.canBePickedUp = 2; - p_77615_2_.spawnEntityInWorld(entityarrow); + if(this == ModItems.gun_stinger) { + EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.0F); + if(p_77615_3_.isSneaking()) + entityarrow.homingRadius = 0; + p_77615_2_.spawnEntityInWorld(entityarrow); + } + + if(this == ModItems.gun_skystinger) { + + if(p_77615_3_.isSneaking()) { + EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.5F); + EntityRocketHoming entityarrow1 = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.5F); + entityarrow.homingMod = 12; + entityarrow1.homingMod = 12; + entityarrow.motionX += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow.motionY += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow.motionZ += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow1.motionX += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow1.motionY += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow1.motionZ += p_77615_2_.rand.nextGaussian() * 0.2; + p_77615_2_.spawnEntityInWorld(entityarrow); + p_77615_2_.spawnEntityInWorld(entityarrow1); + } else { + EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 2.0F); + entityarrow.homingMod = 8; + entityarrow.homingRadius *= 50; + p_77615_2_.spawnEntityInWorld(entityarrow); + } + } } } } @@ -117,10 +137,25 @@ public class GunStinger extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add("Kaboom!"); - list.add(""); - list.add("Ammo: Rockets"); - list.add("Projectiles explode on impact."); + if(this == ModItems.gun_stinger) { + list.add("Woosh, beep-beep-beep!"); + list.add(""); + list.add("Ammo: Stinger Rockets"); + list.add("Projectiles target entities."); + list.add("Projectiles explode on impact."); + list.add("Alt-fire disables homing effect."); + } + if(this == ModItems.gun_skystinger) { + list.add("Oh, I get it, because of the...nyeees!"); + list.add("It all makes sense now!"); + list.add(""); + list.add("Ammo: Stinger Rockets"); + list.add("Projectiles target entities."); + list.add("Projectiles explode on impact."); + list.add("Alt-fire fires a second rocket for free."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); + } } @Override diff --git a/com/hbm/items/weapon/GunZOMG.java b/com/hbm/items/weapon/GunZOMG.java index d542ae056..2854a69fb 100644 --- a/com/hbm/items/weapon/GunZOMG.java +++ b/com/hbm/items/weapon/GunZOMG.java @@ -213,6 +213,8 @@ public class GunZOMG extends Item { list.add("Damage: 35 - 45"); list.add("Energy Damage: 10000 - 100000"); list.add("Energy projectiles destroy blocks."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); //for(int i = 0; i < 25; i++) // list.add("How do I use the ZOMG? How do I use the ZOMG? How do I use the ZOMG?"); } diff --git a/com/hbm/items/weapon/ItemClip.java b/com/hbm/items/weapon/ItemClip.java index d88659e2c..299555745 100644 --- a/com/hbm/items/weapon/ItemClip.java +++ b/com/hbm/items/weapon/ItemClip.java @@ -202,6 +202,62 @@ public class ItemClip extends Item { } } + if(this == ModItems.clip_revolver_pip) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip_ammo, 6))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_stinger) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 3))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_jack) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_jack_ammo, 6))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_spark) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_spark_ammo, 4))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_hp) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_hp_ammo, 8))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_euthanasia) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_euthanasia_ammo, 16))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_defabricator) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_defabricator_ammo, 12))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + if(this == ModItems.ammo_container) { if(player.inventory.hasItem(ModItems.gun_revolver_iron)) @@ -224,6 +280,8 @@ public class ItemClip extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip_ammo, 12)); if(player.inventory.hasItem(ModItems.gun_rpg)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3)); + if(player.inventory.hasItem(ModItems.gun_stinger)) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2)); if(player.inventory.hasItem(ModItems.gun_fatman)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_fatman_ammo, 2)); if(player.inventory.hasItem(ModItems.gun_mirv)) diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index afd16eaef..1756c228a 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -85,6 +85,7 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_skystinger, new ItemRenderStinger()); //MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg_ammo, new ItemRenderRocket()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBombMulti.class, new RenderBombMulti()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 5ca790db0..5f2efe8fe 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -525,7 +525,7 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_diesel), 1), new Object[] { "HTH", "PRP", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'R', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) })); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_shredder), 1), new Object[] { "SHS", "MBM", "CFC", 'H', ModItems.hull_big_steel, 'S', ModBlocks.steel_beam, 'M', ModItems.motor, 'B', Blocks.iron_bars, 'C', ModBlocks.red_wire_coated, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_combine_factory), 1), new Object[] { "HCH", "STS", "RFR", 'H', ModItems.tank_steel, 'C', ModItems.coil_advanced_torus, 'S', "plateSteel", 'T', ModBlocks.block_magnetized_tungsten, 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "PTP", "FKF", "BBB", 'P', "plateTitanium", 'T', ModItems.telepad, 'F', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'K', ModItems.entanglement_kit, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "PTP", "FKF", "BBB", 'P', "plateTitanium", 'T', ModItems.telepad, 'F', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'K', ModItems.entanglement_kit, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 1), new Object[] { "UPU", "UWU", "UPU", 'P', "plateSteel", 'U', ModItems.rtg_unit, 'W', ModBlocks.red_wire_coated })); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_cyclotron), 1), new Object[] { "PTP", "PCP", "WBW", 'P', ModItems.board_copper, 'T', ModItems.cyclotron_tower, 'C', ModBlocks.fusion_core, 'W', ModBlocks.red_wire_coated, 'B', ModBlocks.machine_battery }); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_well), 1), new Object[] { "TPM", "GPG", "GDG", 'T', ModItems.tank_steel, 'P', ModItems.pipes_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium }); @@ -702,6 +702,7 @@ public class CraftingManager { GameRegistry.addShapedRecipe(new ItemStack(ModItems.gun_euthanasia_ammo, 12), new Object[] { "P", "S", "N", 'P', ModItems.powder_poison, 'N', ModItems.niter, 'S', ModItems.syringe_metal_empty }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_spark, 1), new Object[] { "TTD", "AAS", " T", 'A', "ingotDaffergon", 'T', ModItems.toothpicks, 'S', ModItems.gun_rpg, 'D', ModItems.ducttape })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_spark_ammo, 4), new Object[] { "PCP", "DDD", "PCP", 'P', "plateLead", 'C', ModItems.coil_gold, 'D', ModItems.powder_power })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_skystinger, 1), new Object[] { "TTT", "AAS", " D ", 'A', "ingotUnobtainium", 'T', ModItems.toothpicks, 'S', ModItems.gun_stinger, 'D', ModItems.ducttape })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp, 1), new Object[] { "TDT", "ASA", " T ", 'A', "ingotReiium", 'T', ModItems.toothpicks, 'S', ModItems.gun_xvl1456, 'D', ModItems.ducttape })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp_ammo, 8), new Object[] { " R ", "BSK", " Y ", 'S', "plateSteel", 'K', new ItemStack(Items.dye, 1, 0), 'R', new ItemStack(Items.dye, 1, 1), 'B', new ItemStack(Items.dye, 1, 4), 'Y', new ItemStack(Items.dye, 1, 11) })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator, 1), new Object[] { " SS", "DDD", "TCB", 'S', "plateSteel", 'D', ModItems.plate_dalekanium, 'T', "plateTitanium", 'C', ModItems.circuit_gold, 'B', ModItems.battery_lithium })); @@ -1003,6 +1004,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mask_of_infamy, 1), new Object[] { "III", "III", " I ", 'I', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator, 1), new Object[] { " A", "#B#", "#B#", '#', "plateIron", 'A', "plateSteel", 'B', ModItems.circuit_red_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator_range, 1), new Object[] { "RRD", "PIC", " P", 'P', "plateSteel", 'R', Items.redstone, 'C', ModItems.circuit_gold, 'D', ModItems.designator, 'I', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator_manual, 1), new Object[] { " A", "#C#", "#B#", '#', "ingotPolymer", 'A', "plateLead", 'B', ModItems.circuit_gold, 'C', ModItems.designator })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.linker, 1), new Object[] { "I I", "ICI", "GGG", 'I', "plateIron", 'G', "plateGold", 'C', ModItems.circuit_gold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.oil_detector, 1), new Object[] { "W I", "WCI", "PPP", 'W', ModItems.wire_gold, 'I', "ingotCopper", 'C', ModItems.circuit_red_copper, 'P', "plateSteel" })); GameRegistry.addRecipe(new ItemStack(ModItems.turret_chip, 1), new Object[] { "WWW", "CPC", "WWW", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_gold, }); @@ -1028,9 +1030,9 @@ public class CraftingManager { //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium }); //} - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 1), new Object[] { "dustNeptunium", "dustIodine", "dustThorium", "dustAstatine", "dustNeodymium", "dustCaesium" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 1), new Object[] { "dustStrontium", "dustCobalt", "dustBromine", "dustTennessine", "dustNiobium", "dustCerium" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_spark_mix, 1), new Object[] { "dustDesh", "dustEuphemium", ModItems.powder_meteorite, ModItems.powder_power, ModItems.powder_nitan_mix })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 6), new Object[] { "dustNeptunium", "dustIodine", "dustThorium", "dustAstatine", "dustNeodymium", "dustCaesium" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 6), new Object[] { "dustStrontium", "dustCobalt", "dustBromine", "dustTennessine", "dustNiobium", "dustCerium" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_spark_mix, 5), new Object[] { "dustDesh", "dustEuphemium", ModItems.powder_meteorite, ModItems.powder_power, ModItems.powder_nitan_mix })); GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola }); diff --git a/com/hbm/render/item/ItemRenderStinger.java b/com/hbm/render/item/ItemRenderStinger.java index a2b2ee71f..3eb1b9623 100644 --- a/com/hbm/render/item/ItemRenderStinger.java +++ b/com/hbm/render/item/ItemRenderStinger.java @@ -2,6 +2,7 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; +import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelAt4; import com.hbm.render.model.ModelStinger; @@ -43,7 +44,10 @@ public class ItemRenderStinger implements IItemRenderer { switch(type) { case EQUIPPED_FIRST_PERSON: GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_stinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_skystinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSkyStinger.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-0.3F, 0.0F, -0.1F); GL11.glScalef(2.0F, 2.0F, 2.0F); @@ -55,7 +59,10 @@ public class ItemRenderStinger implements IItemRenderer { case EQUIPPED: case ENTITY: GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_stinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_skystinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSkyStinger.png")); GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F);