diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 8010ce062..b2cf17131 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -975,7 +975,7 @@ item.gun_lever_action.name=Mare's Leg (Original) item.gun_bolt_action.name=Dream-Repetiergewehr (Original) item.gun_lever_action_dark.name=Mare's Leg (Dunkel) item.gun_bolt_action_green.name=Dream-Repetiergewehr (Grün) -item.gun_b92.name=B92 Energiepistole +item.gun_b92.name=§9B92 Energiepistole§r item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte item.gun_immolator.name=Der Immolator diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index cc321e613..3f85f4a44 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -978,7 +978,7 @@ item.gun_lever_action.name=Mare's Leg (Original) item.gun_bolt_action.name=Dream Bolt-Action Rifle (Original) item.gun_lever_action_dark.name=Mare's Leg (Dark) item.gun_bolt_action_green.name=Dream Bolt-Action Rifle (Green) -item.gun_b92.name=B92 Energy Pistol +item.gun_b92.name=§9B92 Energy Pistol§r item.gun_xvl1456.name=XVL1456 Tau Cannon Prototype item.gun_osipr.name=Overwatch Standard Issue Pulse Rifle item.gun_immolator.name=The Immolator diff --git a/assets/hbm/textures/items/catgem.png b/assets/hbm/textures/items/catgem.png new file mode 100644 index 000000000..1454b14d0 Binary files /dev/null and b/assets/hbm/textures/items/catgem.png differ diff --git a/assets/hbm/textures/models/ModelB92.png b/assets/hbm/textures/models/ModelB92.png new file mode 100644 index 000000000..eeefc567e Binary files /dev/null and b/assets/hbm/textures/models/ModelB92.png differ diff --git a/assets/hbm/textures/models/ModelB92SM.png b/assets/hbm/textures/models/ModelB92SM.png new file mode 100644 index 000000000..94ede1f6c Binary files /dev/null and b/assets/hbm/textures/models/ModelB92SM.png differ diff --git a/com/hbm/entity/grenade/EntityGrenadeASchrab.java b/com/hbm/entity/grenade/EntityGrenadeASchrab.java index ef3d666db..e6a3cf960 100644 --- a/com/hbm/entity/grenade/EntityGrenadeASchrab.java +++ b/com/hbm/entity/grenade/EntityGrenadeASchrab.java @@ -22,6 +22,11 @@ public class EntityGrenadeASchrab extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeASchrab(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java index a602b3c89..11dd1e269 100644 --- a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java +++ b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java @@ -19,6 +19,11 @@ public class EntityGrenadeBlackHole extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeBlackHole(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeCluster.java b/com/hbm/entity/grenade/EntityGrenadeCluster.java index 83a4be97e..f1424bf8c 100644 --- a/com/hbm/entity/grenade/EntityGrenadeCluster.java +++ b/com/hbm/entity/grenade/EntityGrenadeCluster.java @@ -19,6 +19,11 @@ public class EntityGrenadeCluster extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeCluster(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeElectric.java b/com/hbm/entity/grenade/EntityGrenadeElectric.java index 09096a2b8..1dcd279cb 100644 --- a/com/hbm/entity/grenade/EntityGrenadeElectric.java +++ b/com/hbm/entity/grenade/EntityGrenadeElectric.java @@ -18,6 +18,11 @@ public class EntityGrenadeElectric extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeElectric(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeFire.java b/com/hbm/entity/grenade/EntityGrenadeFire.java index b8b6c7681..12a6ad6b0 100644 --- a/com/hbm/entity/grenade/EntityGrenadeFire.java +++ b/com/hbm/entity/grenade/EntityGrenadeFire.java @@ -21,6 +21,11 @@ public class EntityGrenadeFire extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeFire(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeFrag.java b/com/hbm/entity/grenade/EntityGrenadeFrag.java index ff38b5bd2..e3720f4f0 100644 --- a/com/hbm/entity/grenade/EntityGrenadeFrag.java +++ b/com/hbm/entity/grenade/EntityGrenadeFrag.java @@ -21,6 +21,11 @@ public class EntityGrenadeFrag extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeFrag(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeGas.java b/com/hbm/entity/grenade/EntityGrenadeGas.java index 6a179aeb8..bf232b1fd 100644 --- a/com/hbm/entity/grenade/EntityGrenadeGas.java +++ b/com/hbm/entity/grenade/EntityGrenadeGas.java @@ -23,6 +23,11 @@ public class EntityGrenadeGas extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeGas(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeGascan.java b/com/hbm/entity/grenade/EntityGrenadeGascan.java index 6ae8165a9..6f5d27ec1 100644 --- a/com/hbm/entity/grenade/EntityGrenadeGascan.java +++ b/com/hbm/entity/grenade/EntityGrenadeGascan.java @@ -19,6 +19,11 @@ public class EntityGrenadeGascan extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeGascan(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeGeneric.java b/com/hbm/entity/grenade/EntityGrenadeGeneric.java index fd55fa956..0f20ee556 100644 --- a/com/hbm/entity/grenade/EntityGrenadeGeneric.java +++ b/com/hbm/entity/grenade/EntityGrenadeGeneric.java @@ -17,6 +17,11 @@ public class EntityGrenadeGeneric extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeGeneric(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeLemon.java b/com/hbm/entity/grenade/EntityGrenadeLemon.java index 7f7ba0b6e..2e72dc136 100644 --- a/com/hbm/entity/grenade/EntityGrenadeLemon.java +++ b/com/hbm/entity/grenade/EntityGrenadeLemon.java @@ -18,6 +18,11 @@ public class EntityGrenadeLemon extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeLemon(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeMk2.java b/com/hbm/entity/grenade/EntityGrenadeMk2.java index 9f2f32f73..3575d2b25 100644 --- a/com/hbm/entity/grenade/EntityGrenadeMk2.java +++ b/com/hbm/entity/grenade/EntityGrenadeMk2.java @@ -18,6 +18,11 @@ public class EntityGrenadeMk2 extends EntityGrenadeBase { super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeMk2(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeNuclear.java b/com/hbm/entity/grenade/EntityGrenadeNuclear.java index de50f8b8e..a9394a5bd 100644 --- a/com/hbm/entity/grenade/EntityGrenadeNuclear.java +++ b/com/hbm/entity/grenade/EntityGrenadeNuclear.java @@ -24,6 +24,11 @@ public class EntityGrenadeNuclear extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeNuclear(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeNuke.java b/com/hbm/entity/grenade/EntityGrenadeNuke.java index d0b33b1b0..6d673ad64 100644 --- a/com/hbm/entity/grenade/EntityGrenadeNuke.java +++ b/com/hbm/entity/grenade/EntityGrenadeNuke.java @@ -18,6 +18,11 @@ public class EntityGrenadeNuke extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeNuke(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadePlasma.java b/com/hbm/entity/grenade/EntityGrenadePlasma.java index fbdc995d4..932d4628d 100644 --- a/com/hbm/entity/grenade/EntityGrenadePlasma.java +++ b/com/hbm/entity/grenade/EntityGrenadePlasma.java @@ -18,6 +18,11 @@ public class EntityGrenadePlasma extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadePlasma(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadePoison.java b/com/hbm/entity/grenade/EntityGrenadePoison.java index dc169ae4d..88a1cdfbd 100644 --- a/com/hbm/entity/grenade/EntityGrenadePoison.java +++ b/com/hbm/entity/grenade/EntityGrenadePoison.java @@ -19,6 +19,11 @@ public class EntityGrenadePoison extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadePoison(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadePulse.java b/com/hbm/entity/grenade/EntityGrenadePulse.java index 7475cdaff..0b4beef7c 100644 --- a/com/hbm/entity/grenade/EntityGrenadePulse.java +++ b/com/hbm/entity/grenade/EntityGrenadePulse.java @@ -19,6 +19,11 @@ public class EntityGrenadePulse extends EntityGrenadeBase { super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadePulse(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java b/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java index f0aa46ec3..24e8b75fe 100644 --- a/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java +++ b/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java @@ -19,6 +19,11 @@ public class EntityGrenadeSchrabidium extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeSchrabidium(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeShrapnel.java b/com/hbm/entity/grenade/EntityGrenadeShrapnel.java index b362ba526..2c5d73dcc 100644 --- a/com/hbm/entity/grenade/EntityGrenadeShrapnel.java +++ b/com/hbm/entity/grenade/EntityGrenadeShrapnel.java @@ -21,6 +21,11 @@ public class EntityGrenadeShrapnel extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeShrapnel(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeStrong.java b/com/hbm/entity/grenade/EntityGrenadeStrong.java index aa0d84c54..efe420842 100644 --- a/com/hbm/entity/grenade/EntityGrenadeStrong.java +++ b/com/hbm/entity/grenade/EntityGrenadeStrong.java @@ -19,6 +19,11 @@ public class EntityGrenadeStrong extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeStrong(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeTau.java b/com/hbm/entity/grenade/EntityGrenadeTau.java index 75b1ebbef..9de3eaeb7 100644 --- a/com/hbm/entity/grenade/EntityGrenadeTau.java +++ b/com/hbm/entity/grenade/EntityGrenadeTau.java @@ -19,6 +19,11 @@ public class EntityGrenadeTau extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeTau(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/entity/grenade/EntityGrenadeZOMG.java b/com/hbm/entity/grenade/EntityGrenadeZOMG.java index edb195bf8..5dcc151ed 100644 --- a/com/hbm/entity/grenade/EntityGrenadeZOMG.java +++ b/com/hbm/entity/grenade/EntityGrenadeZOMG.java @@ -19,6 +19,11 @@ public class EntityGrenadeZOMG extends EntityGrenadeBase super(p_i1774_1_, p_i1774_2_); } + public EntityGrenadeZOMG(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + @Override public void explode() { diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 1f5a44c9f..38d3172c9 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -2992,6 +2992,7 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_nightmare, gun_revolver_nightmare.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_nightmare2, gun_revolver_nightmare2.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_pip, gun_revolver_pip.getUnlocalizedName()); + GameRegistry.registerItem(gun_b92, gun_b92.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName()); GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName()); GameRegistry.registerItem(gun_mirv, gun_mirv.getUnlocalizedName()); @@ -3002,7 +3003,6 @@ public class ModItems { GameRegistry.registerItem(gun_lever_action_dark, gun_lever_action_dark.getUnlocalizedName()); GameRegistry.registerItem(gun_bolt_action, gun_bolt_action.getUnlocalizedName()); GameRegistry.registerItem(gun_bolt_action_green, gun_bolt_action_green.getUnlocalizedName()); - GameRegistry.registerItem(gun_b92, gun_b92.getUnlocalizedName()); GameRegistry.registerItem(gun_xvl1456, gun_xvl1456.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr, gun_osipr.getUnlocalizedName()); GameRegistry.registerItem(gun_immolator, gun_immolator.getUnlocalizedName()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index a2ea1e0ba..a20f15f20 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -708,6 +708,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action, 1), new Object[] { "PPI", "SWD", 'P', "plateSteel", 'I', "ingotSteel", 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_green, 1), new Object[] { "PPI", "SWD", 'P', "plateIron", 'I', "ingotIron", 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_ammo, 2), new Object[] { "P", "S", "G", 'P', "nuggetLead", 'S', ModItems.plate_polymer, 'G', Items.gunpowder })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_b92, 1), new Object[] { "SSS", " EP", 'P', "ingotPolymer", 'S', ModItems.ingot_starmetal, 'E', ModItems.powder_spark_mix })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_light_ammo, 1), new Object[] { " L ", "IGI", "ICI", 'L', "plateLead", 'I', "plateIron", 'C', "plateCopper", 'G', Items.gunpowder })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_heavy_ammo, 1), new Object[] { "LGC", "LGC", "LGC", 'L', "plateLead", 'C', "plateCopper", 'G', Items.gunpowder })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 925fea253..649fe4efc 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1,7 +1,14 @@ package com.hbm.main; +import net.minecraft.block.BlockDispenser; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.dispenser.BehaviorProjectileDispense; +import net.minecraft.dispenser.IBehaviorDispenseItem; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.dispenser.IPosition; import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.IProjectile; +import net.minecraft.entity.projectile.EntityEgg; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -10,6 +17,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.stats.Achievement; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.AchievementPage; @@ -670,6 +678,161 @@ public class MainRegistry } } }); + + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_generic, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeGeneric(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_strong, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeStrong(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_frag, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeFrag(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_fire, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeFire(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_cluster, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeCluster(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_flare, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeFlare(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_electric, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeElectric(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_poison, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadePoison(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_gas, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeGas(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_schrabidium, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeSchrabidium(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_nuke, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeNuke(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_nuclear, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeNuclear(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_pulse, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadePulse(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_plasma, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadePlasma(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_tau, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeTau(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_lemon, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeLemon(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_mk2, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeMk2(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_aschrab, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeASchrab(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_zomg, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeZOMG(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_shrapnel, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeShrapnel(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_black_hole, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeBlackHole(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_gascan, new BehaviorProjectileDispense() { + + protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) + { + return new EntityGrenadeGascan(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); + } + }); } @EventHandler diff --git a/com/hbm/render/entity/RenderBeam5.java b/com/hbm/render/entity/RenderBeam5.java index b70bc6c19..0c2a3bd81 100644 --- a/com/hbm/render/entity/RenderBeam5.java +++ b/com/hbm/render/entity/RenderBeam5.java @@ -33,9 +33,9 @@ public class RenderBeam5 extends Render { GL11.glRotatef(rocket.rotationYaw, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-rocket.rotationPitch, 1.0F, 0.0F, 0.0F); - boolean red = true; + boolean red = false; boolean green = false; - boolean blue = false; + boolean blue = true; for (float o = 0; o <= radius; o += radius / 8) { float color = 1f - (o * 8.333f); diff --git a/com/hbm/render/item/ItemRenderGunAnim.java b/com/hbm/render/item/ItemRenderGunAnim.java index 6ed3212de..c022fbe86 100644 --- a/com/hbm/render/item/ItemRenderGunAnim.java +++ b/com/hbm/render/item/ItemRenderGunAnim.java @@ -74,7 +74,7 @@ public class ItemRenderGunAnim implements IItemRenderer { if(item.getItem() == ModItems.gun_bolt_action_green) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionGreen.png")); if(item.getItem() == ModItems.gun_b92) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92Dark.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92SM.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-0.5F, 0.0F, -0.2F); @@ -120,7 +120,7 @@ public class ItemRenderGunAnim implements IItemRenderer { if(item.getItem() == ModItems.gun_bolt_action_green) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionGreen.png")); if(item.getItem() == ModItems.gun_b92) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92Dark.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92SM.png")); GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); diff --git a/com/hbm/world/Meteorite.java b/com/hbm/world/Meteorite.java index ceb79c06d..4a281f06f 100644 --- a/com/hbm/world/Meteorite.java +++ b/com/hbm/world/Meteorite.java @@ -9,13 +9,16 @@ import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; +import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import net.minecraft.block.Block; import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -137,6 +140,14 @@ public class Meteorite { ExplosionParticle.spawnMush(world, x, y - 3, z); } return; + case 12: + //Star Blaster + world.createExplosion(null, x + 0.5, y + 0.5, z + 0.5, 10F, true); + ItemStack stack = new ItemStack(ModItems.gun_b92); + stack.setStackDisplayName("§9Star Blaster§r"); + EntityItem blaster = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, stack); + world.spawnEntityInWorld(blaster); + return; } switch(rand.nextInt(3)) {