Skip to content

Commit

Permalink
More clips, sky stinger, crafting recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
HbmMods committed Feb 24, 2018
1 parent 2101496 commit b0bc10a
Show file tree
Hide file tree
Showing 41 changed files with 287 additions and 41 deletions.
11 changes: 11 additions & 0 deletions assets/hbm/lang/de_DE.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
11 changes: 11 additions & 0 deletions assets/hbm/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions assets/hbm/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}]},
Expand Down
Binary file added assets/hbm/sounds/weapon/sawShoot.ogg
Binary file not shown.
Binary file added assets/hbm/sounds/weapon/stingerLockOn.ogg
Binary file not shown.
Binary file added assets/hbm/textures/items/chem_icon_DYN_DNT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chem_icon_DYN_EUPH.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/chem_icon_DYN_SCHRAB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/clip_defabricator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/clip_euthanasia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/clip_hp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/clip_jack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/clip_revolver_pip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/clip_spark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/clip_stinger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/gun_skystinger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/models/ModelSkyStinger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion com/hbm/blocks/bomb/TurretCWIS.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public boolean executeHoldAction(World world, int i, double yaw, double pitch, i
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;
}
Expand Down
7 changes: 7 additions & 0 deletions com/hbm/blocks/generic/BlockCrate.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ public void dropItems(World world, int x, int y, int z) {
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);
Expand Down
38 changes: 24 additions & 14 deletions com/hbm/entity/projectile/EntityRocketHoming.java
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,6 @@ public void onUpdate()
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();
}
Expand Down Expand Up @@ -509,28 +504,35 @@ public void onUpdate()
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<Entity> all = worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox(posX - homingRadius, posY - homingRadius, posZ - homingRadius, posX + homingRadius, posY + homingRadius, posZ + homingRadius));
HashMap<Entity, Double> targetable = new HashMap();
Vec3 path = Vec3.createVectorHelper(motionX, motionY, motionZ);
double startSpeed = path.lengthVector();
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();
Expand All @@ -543,7 +545,7 @@ private void steer() {
}

if(targetable.isEmpty())
return;
return false;

double smallest = Double.POSITIVE_INFINITY;
Entity nearestE = null;
Expand All @@ -557,7 +559,7 @@ private void steer() {
}

if(nearestE == null)
return;
return false;

Vec3 winVec = Vec3.createVectorHelper(nearestE.posX - posX, nearestE.posY - posY, nearestE.posZ - posZ);

Expand All @@ -577,6 +579,14 @@ private void steer() {
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;
}

/**
Expand Down Expand Up @@ -637,7 +647,7 @@ public void onCollideWithPlayer(EntityPlayer p_70100_1_)
{
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;
}
Expand Down
43 changes: 42 additions & 1 deletion com/hbm/inventory/MachineRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -2996,6 +2996,38 @@ public static List<ItemStack> getRecipeFromTempate(ItemStack stack) {
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;
Expand Down Expand Up @@ -3672,6 +3704,15 @@ public static ItemStack getOutputFromTempate(ItemStack stack) {
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;
Expand Down Expand Up @@ -4212,7 +4253,7 @@ public static FluidStack[] getFluidOutputFromTempate(ItemStack stack) {
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);
Expand Down
24 changes: 24 additions & 0 deletions com/hbm/items/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ public static void mainRegistry()
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;
Expand Down Expand Up @@ -1041,7 +1042,9 @@ public static void mainRegistry()
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;
Expand All @@ -1055,6 +1058,11 @@ public static void mainRegistry()
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;

Expand Down Expand Up @@ -1756,6 +1764,7 @@ public static void initializeItem()
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");
Expand Down Expand Up @@ -1997,7 +2006,9 @@ public static void initializeItem()
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");
Expand All @@ -2011,6 +2022,11 @@ public static void initializeItem()
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");

Expand Down Expand Up @@ -3046,6 +3062,7 @@ private static void registerItem() {
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());
Expand Down Expand Up @@ -3103,7 +3120,9 @@ private static void registerItem() {
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());
Expand All @@ -3117,6 +3136,11 @@ private static void registerItem() {
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());

Expand Down
11 changes: 10 additions & 1 deletion com/hbm/items/tool/ItemAssemblyTemplate.java
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,10 @@ public enum EnumAssemblyTemplate {
FLEIJA_PROPELLANT,
SCHRABIDIUM_HAMMER,
COMPONENT_LIMITER,
COMPONENT_EMITTER;
COMPONENT_EMITTER,
AMS_LIMITER,
AMS_EMITTER,
RADAR;

//private final int value;
//private EnumAssemblyTemplate(int value) {
Expand Down Expand Up @@ -724,6 +727,12 @@ public static int getProcessTime(ItemStack stack) {
return 2500;
case COMPONENT_EMITTER:
return 2500;
case AMS_LIMITER:
return 6000;
case AMS_EMITTER:
return 6000;
case RADAR:
return 300;
default:
return 100;
}
Expand Down
2 changes: 2 additions & 0 deletions com/hbm/items/weapon/GunB92.java
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ public void addInformation(ItemStack itemstack, EntityPlayer player, List list,
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
Expand Down
2 changes: 2 additions & 0 deletions com/hbm/items/weapon/GunBaleFlare.java
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,7 @@ public void addInformation(ItemStack itemstack, EntityPlayer player, List list,
list.add("Ammo: Mk.V AMAT Shell");
list.add("Damage: 1000");
list.add("Creates small nuclear explosion.");
list.add("");
list.add("[LEGENDARY WEAPON]");
}
}
2 changes: 2 additions & 0 deletions com/hbm/items/weapon/GunDampfmaschine.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ public void addInformation(ItemStack itemstack, EntityPlayer player, List list,
list.add("");
list.add("Ammo: orang");
list.add("Damage: aaaaaaaaa");
list.add("");
list.add("[LEGENDARY WEAPON]");
}

@Override
Expand Down
Loading

0 comments on commit b0bc10a

Please sign in to comment.