diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index cda5726e4..344316d88 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -348,7 +348,12 @@ item.ammo_44_rocket.name=.44 Magnum Rakete item.ammo_44_silver.name=.44 Magnum Patrone (Gebäude) item.ammo_44_star.name=.44 Magnum Patrone (Sternenmetall) item.ammo_4gauge.name=Kaliber 20 Schrot +item.ammo_4gauge_balefire.name=23mm Balefire-Granate item.ammo_4gauge_explosive.name=23mm Granate +item.ammo_4gauge_flechette.name=Kaliber 4 Flechet +item.ammo_4gauge_flechette_phosphorus.name=Kaliber 4 Flechet (WP) +item.ammo_4gauge_kampf.name=23mm Rakete +item.ammo_4gauge_semtex.name=23mm Bergbauladung item.ammo_4gauge_sleek.name=Kaliber 4 Schrot (IF-F&E) item.ammo_4gauge_slug.name=Kaliber 4 Brenneke item.ammo_50ae.name=.50 AE Patrone diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index adc3cf2af..b7a728f91 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -348,7 +348,12 @@ item.ammo_44_rocket.name=.44 Magnum Rocket item.ammo_44_silver.name=.44 Magnum Bullet (Building) item.ammo_44_star.name=.44 Magnum Bullet (Starmetal) item.ammo_4gauge.name=4 Gauge Buckshot +item.ammo_4gauge_balefire.name=23mm Balefire Grenade item.ammo_4gauge_explosive.name=23mm Grenade +item.ammo_4gauge_flechette.name=4 Gauge Flechette Shell +item.ammo_4gauge_flechette_phosphorus.name=4 Gauge Flechette Shell (WP) +item.ammo_4gauge_kampf.name=23mm Rocket +item.ammo_4gauge_semtex.name=23mm Mining Charge item.ammo_4gauge_sleek.name=4 Gauge Buckshot (IF-R&D) item.ammo_4gauge_slug.name=4 Gauge Solid Steel Slug item.ammo_50ae.name=.50 AE Round diff --git a/src/main/java/assets/hbm/textures/gui/machine/gui_cyclotron.png b/src/main/java/assets/hbm/textures/gui/machine/gui_cyclotron.png index 5d1e9e4b1..76f167219 100644 Binary files a/src/main/java/assets/hbm/textures/gui/machine/gui_cyclotron.png and b/src/main/java/assets/hbm/textures/gui/machine/gui_cyclotron.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_balefire.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_balefire.png new file mode 100644 index 000000000..039f681cc Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_4gauge_balefire.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette.png new file mode 100644 index 000000000..f24e7e0b7 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette_phosphorus.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette_phosphorus.png new file mode 100644 index 000000000..457d799d9 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette_phosphorus.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_rocket.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_kampf.png similarity index 100% rename from src/main/java/assets/hbm/textures/items/ammo_4gauge_rocket.png rename to src/main/java/assets/hbm/textures/items/ammo_4gauge_kampf.png diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_semtex.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_semtex.png new file mode 100644 index 000000000..16c9c87a4 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_4gauge_semtex.png differ diff --git a/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java b/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java index b6375f0b1..5feff181b 100644 --- a/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java +++ b/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java @@ -111,7 +111,12 @@ public class BulletConfigSyncingUtil { public static int G4_NORMAL = i++; public static int G4_SLUG = i++; + public static int G4_FLECHETTE = i++; + public static int G4_FLECHETTE_PHOSPHORUS = i++; public static int G4_EXPLOSIVE = i++; + public static int G4_SEMTEX = i++; + public static int G4_BALEFIRE = i++; + public static int G4_KAMPF = i++; public static int G4_SLEEK = i++; public static int SPECIAL_OSIPR = i++; @@ -276,7 +281,12 @@ public class BulletConfigSyncingUtil { configSet.put(G4_NORMAL, Gun4GaugeFactory.get4GaugeConfig()); configSet.put(G4_SLUG, Gun4GaugeFactory.get4GaugeSlugConfig()); + configSet.put(G4_FLECHETTE, Gun4GaugeFactory.get4GaugeFlechetteConfig()); + configSet.put(G4_FLECHETTE_PHOSPHORUS, Gun4GaugeFactory.get4GaugeFlechettePhosphorusConfig()); configSet.put(G4_EXPLOSIVE, Gun4GaugeFactory.get4GaugeExplosiveConfig()); + configSet.put(G4_SEMTEX, Gun4GaugeFactory.get4GaugeMiningConfig()); + configSet.put(G4_BALEFIRE, Gun4GaugeFactory.get4GaugeBalefireConfig()); + configSet.put(G4_KAMPF, Gun4GaugeFactory.getGrenadeKampfConfig()); configSet.put(G4_SLEEK, Gun4GaugeFactory.get4GaugeSleekConfig()); configSet.put(SPECIAL_OSIPR, GunOSIPRFactory.getPulseConfig()); diff --git a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java index 34f6a174c..75b03ab5d 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java @@ -2,16 +2,28 @@ package com.hbm.handler.guncfg; import java.util.ArrayList; +import com.hbm.entity.projectile.EntityBulletBase; +import com.hbm.explosion.ExplosionLarge; +import com.hbm.explosion.ExplosionNT; +import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; +import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.items.ModItems; +import com.hbm.packet.AuxParticlePacketNT; +import com.hbm.packet.PacketDispatcher; +import com.hbm.potion.HbmPotion; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationKeyframe; import com.hbm.render.anim.BusAnimationSequence; import com.hbm.render.anim.HbmAnimations.AnimType; import com.hbm.render.util.RenderScreenOverlay.Crosshair; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; + public class Gun4GaugeFactory { private static GunConfiguration getShotgunConfig() { @@ -49,7 +61,12 @@ public class Gun4GaugeFactory { config.config = new ArrayList(); config.config.add(BulletConfigSyncingUtil.G4_NORMAL); config.config.add(BulletConfigSyncingUtil.G4_SLUG); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.G4_EXPLOSIVE); + config.config.add(BulletConfigSyncingUtil.G4_SEMTEX); + config.config.add(BulletConfigSyncingUtil.G4_BALEFIRE); + config.config.add(BulletConfigSyncingUtil.G4_KAMPF); config.config.add(BulletConfigSyncingUtil.G4_SLEEK); return config; @@ -98,7 +115,12 @@ public class Gun4GaugeFactory { config.config = new ArrayList(); config.config.add(BulletConfigSyncingUtil.G4_NORMAL); config.config.add(BulletConfigSyncingUtil.G4_SLUG); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.G4_EXPLOSIVE); + config.config.add(BulletConfigSyncingUtil.G4_SEMTEX); + config.config.add(BulletConfigSyncingUtil.G4_BALEFIRE); + config.config.add(BulletConfigSyncingUtil.G4_KAMPF); config.config.add(BulletConfigSyncingUtil.G4_SLEEK); return config; @@ -130,6 +152,63 @@ public class Gun4GaugeFactory { return bullet; } + public static BulletConfiguration get4GaugeFlechetteConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); + + bullet.ammo = ModItems.ammo_4gauge_flechette; + bullet.dmgMin = 5; + bullet.dmgMax = 8; + bullet.bulletsMin *= 2; + bullet.bulletsMax *= 2; + bullet.wear = 15; + bullet.style = BulletConfiguration.STYLE_FLECHETTE; + bullet.HBRC = 2; + bullet.LBRC = 95; + + return bullet; + } + + public static BulletConfiguration get4GaugeFlechettePhosphorusConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); + + bullet.ammo = ModItems.ammo_4gauge_flechette; + bullet.dmgMin = 5; + bullet.dmgMax = 8; + bullet.bulletsMin *= 2; + bullet.bulletsMax *= 2; + bullet.wear = 15; + bullet.style = BulletConfiguration.STYLE_FLECHETTE; + bullet.HBRC = 2; + bullet.LBRC = 95; + + bullet.ammo = ModItems.ammo_4gauge_flechette_phosphorus; + bullet.incendiary = 5; + + PotionEffect eff = new PotionEffect(HbmPotion.phosphorus.id, 20 * 20, 0, true); + eff.getCurativeItems().clear(); + bullet.effects = new ArrayList(); + bullet.effects.add(new PotionEffect(eff)); + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "vanillaburst"); + data.setString("mode", "flame"); + data.setInteger("count", 15); + data.setDouble("motion", 0.05D); + + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, bullet.posX, bullet.posY, bullet.posZ), new TargetPoint(bullet.dimension, bullet.posX, bullet.posY, bullet.posZ, 50)); + } + }; + + return bullet; + } + public static BulletConfiguration get4GaugeExplosiveConfig() { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); @@ -145,6 +224,83 @@ public class Gun4GaugeFactory { return bullet; } + public static BulletConfiguration get4GaugeMiningConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); + + bullet.ammo = ModItems.ammo_4gauge_semtex; + bullet.velocity *= 2; + bullet.gravity *= 2; + bullet.dmgMin = 10; + bullet.dmgMax = 15; + bullet.wear = 25; + bullet.trail = 1; + bullet.explosive = 0.0F; + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + ExplosionNT explosion = new ExplosionNT(bullet.worldObj, null, bullet.posX, bullet.posY, bullet.posZ, 4); + explosion.atttributes.add(ExAttrib.ALLDROP); + explosion.atttributes.add(ExAttrib.NOHURT); + explosion.doExplosionA(); + explosion.doExplosionB(false); + + ExplosionLarge.spawnParticles(bullet.worldObj, bullet.posX, bullet.posY, bullet.posZ, 5); + } + }; + + return bullet; + } + + public static BulletConfiguration get4GaugeBalefireConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); + + bullet.ammo = ModItems.ammo_4gauge_balefire; + bullet.velocity *= 2; + bullet.gravity *= 2; + bullet.dmgMin = 10; + bullet.dmgMax = 15; + bullet.wear = 25; + bullet.trail = 1; + bullet.explosive = 0.0F; + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + ExplosionNT explosion = new ExplosionNT(bullet.worldObj, null, bullet.posX, bullet.posY, bullet.posZ, 6); + explosion.atttributes.add(ExAttrib.BALEFIRE); + explosion.doExplosionA(); + explosion.doExplosionB(false); + + ExplosionLarge.spawnParticles(bullet.worldObj, bullet.posX, bullet.posY, bullet.posZ, 30); + } + }; + + return bullet; + } + + public static BulletConfiguration getGrenadeKampfConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); + + bullet.ammo = ModItems.ammo_4gauge_kampf; + bullet.spread = 0.0F; + bullet.gravity = 0.0D; + bullet.wear = 15; + bullet.explosive = 3.5F; + bullet.style = BulletConfiguration.STYLE_GRENADE; + bullet.trail = 4; + bullet.vPFX = "smoke"; + + return bullet; + } + public static BulletConfiguration get4GaugeSleekConfig() { BulletConfiguration bullet = BulletConfigFactory.standardAirstrikeConfig(); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index ccff8b18c..9b1852bc4 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1106,7 +1106,12 @@ public class ModItems { public static Item ammo_20gauge_sleek; public static Item ammo_4gauge; public static Item ammo_4gauge_slug; + public static Item ammo_4gauge_flechette; + public static Item ammo_4gauge_flechette_phosphorus; public static Item ammo_4gauge_explosive; + public static Item ammo_4gauge_semtex; + public static Item ammo_4gauge_balefire; + public static Item ammo_4gauge_kampf; public static Item ammo_4gauge_sleek; public static Item ammo_357_desh; public static Item ammo_44; @@ -2942,7 +2947,12 @@ public class ModItems { ammo_20gauge_sleek = new ItemAmmo().setUnlocalizedName("ammo_20gauge_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_sleek"); ammo_4gauge = new ItemAmmo().setUnlocalizedName("ammo_4gauge").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge"); ammo_4gauge_slug = new ItemAmmo().setUnlocalizedName("ammo_4gauge_slug").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_slug"); + ammo_4gauge_flechette = new ItemAmmo().setUnlocalizedName("ammo_4gauge_flechette").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_flechette"); + ammo_4gauge_flechette_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_4gauge_flechette_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_flechette_phosphorus"); ammo_4gauge_explosive = new ItemAmmo().setUnlocalizedName("ammo_4gauge_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_explosive"); + ammo_4gauge_semtex = new ItemAmmo().setUnlocalizedName("ammo_4gauge_semtex").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_semtex"); + ammo_4gauge_balefire = new ItemAmmo().setUnlocalizedName("ammo_4gauge_balefire").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_balefire"); + ammo_4gauge_kampf = new ItemAmmo().setUnlocalizedName("ammo_4gauge_kampf").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_kampf"); ammo_4gauge_sleek = new ItemAmmo().setUnlocalizedName("ammo_4gauge_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_sleek"); ammo_5mm = new ItemAmmo().setUnlocalizedName("ammo_5mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm"); ammo_5mm_explosive = new ItemAmmo().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive"); @@ -5204,7 +5214,12 @@ public class ModItems { GameRegistry.registerItem(ammo_20gauge_sleek, ammo_20gauge_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge, ammo_4gauge.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_slug, ammo_4gauge_slug.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_flechette, ammo_4gauge_flechette.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_flechette_phosphorus, ammo_4gauge_flechette_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_explosive, ammo_4gauge_explosive.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_semtex, ammo_4gauge_semtex.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_balefire, ammo_4gauge_balefire.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_kampf, ammo_4gauge_kampf.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_sleek, ammo_4gauge_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_44, ammo_44.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_ap, ammo_44_ap.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 2cf7ab2e9..c7b366013 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -834,10 +834,14 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_4gauge_slug, 12), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_4gauge_slug, 12), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer })); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_flechette, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_flechette, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_flechette, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_flechette, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 4), new Object[] { " I ", "GCL", " P ", 'I', Blocks.tnt, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 4), new Object[] { " I ", "GCL", " P ", 'I', Blocks.tnt, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 6), new Object[] { " I ", "GCL", " P ", 'I', ModItems.ingot_semtex, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 6), new Object[] { " I ", "GCL", " P ", 'I', ModItems.ingot_semtex, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_semtex, 4), new Object[] { " I ", "GCL", " P ", 'I', ModBlocks.det_miner, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_semtex, 4), new Object[] { " I ", "GCL", " P ", 'I', ModBlocks.det_miner, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_slug, 12), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); @@ -860,6 +864,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_shock, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_20gauge, 'A', "dustDiamond" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_wither, 4), new Object[] { "BCB", "CAC", "BCB", 'B', ModItems.ammo_20gauge, 'A', Blocks.soul_sand, 'C', "dustCoal" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_20gauge_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_20gauge, 'A', ModItems.coin_maskman }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_flechette_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_4gauge_flechette, 'A', ModItems.ingot_phosphorus }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_balefire, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_4gauge_explosive, 'A', ModItems.egg_balefire_shard }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_kampf, 2), new Object[] { "G", "R", 'G', ModItems.ammo_rocket, 'R', ModItems.ammo_4gauge_explosive }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_4gauge, 'A', ModItems.coin_maskman }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_u238 }); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 25ead1bc4..4fc43f1f9 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -477,6 +477,7 @@ public class ModEventHandler if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) { + /// FSB ARMOR START /// ItemStack helmet = player.inventory.armorInventory[3]; ItemStack plate = player.inventory.armorInventory[2]; ItemStack legs = player.inventory.armorInventory[1]; @@ -503,6 +504,20 @@ public class ModEventHandler } } } + /// FSB ARMOR END /// + + /// BETA HEALTH START /// + if(player.getUniqueID().toString().equals(Library.Dr_Nostalgia)) { + if(player.getFoodStats().getFoodLevel() < 10) { + player.getFoodStats().setFoodLevel(10); + } + + if(player.getFoodStats().getFoodLevel() > 10) { + player.heal(player.getFoodStats().getFoodLevel() - 10); + player.getFoodStats().setFoodLevel(10); + } + } + /// BETA HEALTH END /// } //TODO: rewrite this so it doesn't look like shit