diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 1d758d829..740453c79 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -273,9 +273,9 @@ item.rod_schrabidium_fuel_depleted.name=Erschöpfte Schrabidiumkernbrennstoffzel item.rod_dual_schrabidium_fuel_depleted.name=Erschöpfte Schrabidiumdoppelkernbrennstoffzelle item.rod_quad_schrabidium_fuel_depleted.name=Erschöpfte Schrabidiumvierfachkernbrennstoffzelle -item.rod_waste.name=Nuclear Waste Rod -item.rod_dual_waste.name=Nuclear Waste Dual Rod -item.rod_quad_waste.name=Nuclear Waste Quad Rod +item.rod_waste.name=Atommüllstab +item.rod_dual_waste.name=Doppelter Atommüllstab +item.rod_quad_waste.name=Vierfacher Atommüllstab item.gun_rpg.name=RPG item.gun_rpg_ammo.name=Rakete @@ -480,4 +480,7 @@ item.gas_mask.name=Gasmaske item.t45_helmet.name=T45-Powerrüstungshelm item.t45_plate.name=T45-Powerrüstungsbrustpanzer item.t45_legs.name=T45-Powerrüstungsbeinschutz -item.t45_boots.name=T45-Powerrüstungsstiefel \ No newline at end of file +item.t45_boots.name=T45-Powerrüstungsstiefel + +tile.mush.name=Leuchtender Pilz +tile.waste_mycelium.name=Leuchtende Myzel \ No newline at end of file diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 8e01f5c57..4765488f5 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -480,4 +480,7 @@ item.gas_mask.name=Gas Mask item.t45_helmet.name=T45 Power Armor Helmet item.t45_plate.name=T45 Power Armor Chestplate item.t45_legs.name=T45 Power Armor Leggings -item.t45_boots.name=T45 Power Armor Boots \ No newline at end of file +item.t45_boots.name=T45 Power Armor Boots + +tile.mush.name=Glowing Mushroom +tile.waste_mycelium.name=Glowing Mycelium \ No newline at end of file diff --git a/assets/hbm/textures/items/canister_empty.png b/assets/hbm/textures/items/canister_empty.png new file mode 100644 index 000000000..a38a2821f Binary files /dev/null and b/assets/hbm/textures/items/canister_empty.png differ diff --git a/assets/hbm/textures/items/canister_fuel.png b/assets/hbm/textures/items/canister_fuel.png new file mode 100644 index 000000000..441b098c1 Binary files /dev/null and b/assets/hbm/textures/items/canister_fuel.png differ diff --git a/assets/hbm/textures/items/canister_napalm.png b/assets/hbm/textures/items/canister_napalm.png new file mode 100644 index 000000000..60849d1ac Binary files /dev/null and b/assets/hbm/textures/items/canister_napalm.png differ diff --git a/assets/hbm/textures/items/chainsaw.png b/assets/hbm/textures/items/chainsaw.png new file mode 100644 index 000000000..f9e6d8820 Binary files /dev/null and b/assets/hbm/textures/items/chainsaw.png differ diff --git a/assets/hbm/textures/items/chainsaw.png.mcmeta b/assets/hbm/textures/items/chainsaw.png.mcmeta new file mode 100644 index 000000000..4f0718ac9 --- /dev/null +++ b/assets/hbm/textures/items/chainsaw.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/assets/hbm/textures/items/missile_kit.png b/assets/hbm/textures/items/missile_kit.png new file mode 100644 index 000000000..d4d7957ef Binary files /dev/null and b/assets/hbm/textures/items/missile_kit.png differ diff --git a/assets/hbm/textures/items/t45_kit.png b/assets/hbm/textures/items/t45_kit.png new file mode 100644 index 000000000..e919e5529 Binary files /dev/null and b/assets/hbm/textures/items/t45_kit.png differ diff --git a/assets/hbm/textures/models/MissileGeneric.png b/assets/hbm/textures/models/MissileGeneric.png index 7357687fd..5b70601a2 100644 Binary files a/assets/hbm/textures/models/MissileGeneric.png and b/assets/hbm/textures/models/MissileGeneric.png differ diff --git a/assets/hbm/textures/models/MissileGenericLayout.png b/assets/hbm/textures/models/MissileGenericLayout.png new file mode 100644 index 000000000..7357687fd Binary files /dev/null and b/assets/hbm/textures/models/MissileGenericLayout.png differ diff --git a/com/hbm/blocks/BlockOre.java b/com/hbm/blocks/BlockOre.java index 0dea88ca4..7b1bb96c7 100644 --- a/com/hbm/blocks/BlockOre.java +++ b/com/hbm/blocks/BlockOre.java @@ -13,6 +13,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -97,10 +98,10 @@ public class BlockOre extends Block { { if(entity instanceof EntityPlayer && Library.checkForHazmat((EntityPlayer)entity)) { - Library.damageSuit(((EntityPlayer)entity), 0); + /*Library.damageSuit(((EntityPlayer)entity), 0); Library.damageSuit(((EntityPlayer)entity), 1); Library.damageSuit(((EntityPlayer)entity), 2); - Library.damageSuit(((EntityPlayer)entity), 3); + Library.damageSuit(((EntityPlayer)entity), 3);*/ } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); @@ -109,7 +110,7 @@ public class BlockOre extends Block { entity.setDead(); if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); - } else { + } else if(!(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 3 * 60 * 20, 2)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.wither.id, 30 * 20, 0)); } @@ -118,10 +119,10 @@ public class BlockOre extends Block { { if(entity instanceof EntityPlayer && Library.checkForHazmat((EntityPlayer)entity)) { - Library.damageSuit(((EntityPlayer)entity), 0); + /*Library.damageSuit(((EntityPlayer)entity), 0); Library.damageSuit(((EntityPlayer)entity), 1); Library.damageSuit(((EntityPlayer)entity), 2); - Library.damageSuit(((EntityPlayer)entity), 3); + Library.damageSuit(((EntityPlayer)entity), 3);*/ } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); @@ -131,7 +132,7 @@ public class BlockOre extends Block { if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); entity.setDead(); - } else if(!(entity instanceof EntityNuclearCreeper)) { + } else if(!(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 10 * 60 * 20, 4)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 4 * 60 * 20, 2)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.wither.id, 3 * 60 * 20, 2)); @@ -141,10 +142,10 @@ public class BlockOre extends Block { { if(entity instanceof EntityPlayer && Library.checkForHazmat((EntityPlayer)entity)) { - Library.damageSuit(((EntityPlayer)entity), 0); + /*Library.damageSuit(((EntityPlayer)entity), 0); Library.damageSuit(((EntityPlayer)entity), 1); Library.damageSuit(((EntityPlayer)entity), 2); - Library.damageSuit(((EntityPlayer)entity), 3); + Library.damageSuit(((EntityPlayer)entity), 3);*/ } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); @@ -154,7 +155,7 @@ public class BlockOre extends Block { if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); entity.setDead(); - } else if(!(entity instanceof EntityNuclearCreeper)) { + } else if(!(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 30 * 20, 1)); } } diff --git a/com/hbm/blocks/TileEntityYellowBarrel.java b/com/hbm/blocks/TileEntityYellowBarrel.java index 15141a688..b4eab8e16 100644 --- a/com/hbm/blocks/TileEntityYellowBarrel.java +++ b/com/hbm/blocks/TileEntityYellowBarrel.java @@ -9,6 +9,7 @@ import com.hbm.lib.Library; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -59,10 +60,10 @@ public class TileEntityYellowBarrel extends TileEntity { { if(entity instanceof EntityPlayer && Library.checkForHazmat((EntityPlayer)entity)) { - Library.damageSuit(((EntityPlayer)entity), 0); + /*Library.damageSuit(((EntityPlayer)entity), 0); Library.damageSuit(((EntityPlayer)entity), 1); Library.damageSuit(((EntityPlayer)entity), 2); - Library.damageSuit(((EntityPlayer)entity), 3); + Library.damageSuit(((EntityPlayer)entity), 3);*/ } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(this.worldObj); @@ -72,7 +73,7 @@ public class TileEntityYellowBarrel extends TileEntity { if(!worldObj.isRemote) worldObj.spawnEntityInWorld(creep); entity.setDead(); - } else if(entity instanceof EntityLivingBase && !(entity instanceof EntityNuclearCreeper)) + } else if(entity instanceof EntityLivingBase && !(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.getId(), 2 * 60 * 20, 2)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.wither.getId(), 5, 4)); diff --git a/com/hbm/blocks/WasteEarth.java b/com/hbm/blocks/WasteEarth.java index ee88381be..6135b5e88 100644 --- a/com/hbm/blocks/WasteEarth.java +++ b/com/hbm/blocks/WasteEarth.java @@ -15,6 +15,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.passive.EntityCow; +import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -78,10 +80,10 @@ public class WasteEarth extends Block { { if(entity instanceof EntityPlayer && Library.checkForHazmat((EntityPlayer)entity)) { - Library.damageSuit(((EntityPlayer)entity), 0); + /*Library.damageSuit(((EntityPlayer)entity), 0); Library.damageSuit(((EntityPlayer)entity), 1); Library.damageSuit(((EntityPlayer)entity), 2); - Library.damageSuit(((EntityPlayer)entity), 3); + Library.damageSuit(((EntityPlayer)entity), 3);*/ } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); @@ -91,7 +93,7 @@ public class WasteEarth extends Block { if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); entity.setDead(); - } else if(!(entity instanceof EntityNuclearCreeper)) { + } else if(!(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 2 * 60 * 20, 2)); } } @@ -104,20 +106,28 @@ public class WasteEarth extends Block { { if(entity instanceof EntityPlayer && Library.checkForHazmat((EntityPlayer)entity)) { - Library.damageSuit(((EntityPlayer)entity), 0); + /*Library.damageSuit(((EntityPlayer)entity), 0); Library.damageSuit(((EntityPlayer)entity), 1); Library.damageSuit(((EntityPlayer)entity), 2); - Library.damageSuit(((EntityPlayer)entity), 3); + Library.damageSuit(((EntityPlayer)entity), 3);*/ } else if(entity instanceof EntityCreeper) { EntityNuclearCreeper creep = new EntityNuclearCreeper(p_149724_1_); creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); + //creep.setRotationYawHead(((EntityCreeper)entity).rotationYawHead); if(!entity.isDead) if(!p_149724_1_.isRemote) p_149724_1_.spawnEntityInWorld(creep); entity.setDead(); - } else if(!(entity instanceof EntityNuclearCreeper)) { + } else if(entity instanceof EntityCow) { + EntityMooshroom creep = new EntityMooshroom(p_149724_1_); + creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + //creep.setRotationYawHead(((EntityCow)entity).rotationYawHead); + if(!entity.isDead) + if(!p_149724_1_.isRemote) + p_149724_1_.spawnEntityInWorld(creep); + entity.setDead(); + } else if(!(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom)) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 3 * 60 * 20, 4)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.wither.id, 1 * 60 * 20, 2)); ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 2 * 60 * 20, 2)); diff --git a/com/hbm/items/ItemStarterKit.java b/com/hbm/items/ItemStarterKit.java index 124e1d8c7..391420db4 100644 --- a/com/hbm/items/ItemStarterKit.java +++ b/com/hbm/items/ItemStarterKit.java @@ -269,6 +269,53 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_quad_uranium, 1)); } + if(this == ModItems.missile_kit) + { + player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.launch_pad), 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.designator, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.battery_schrabidium, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_generic, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_strong, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_burst, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_incendiary, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_incendiary_strong, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_inferno, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_cluster, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_cluster_strong, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_rain, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_buster, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_buster_strong, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_drill, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_nuclear, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_nuclear_cluster, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_endo, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_exo, 1)); + } + + if(this == ModItems.t45_kit) + { + player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_helmet, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_plate, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_legs, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.t45_boots, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fusion_core, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fusion_core, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fusion_core, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fusion_core, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.fusion_core, 1)); + } + return stack; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index f61fce997..bb0c4d899 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -363,6 +363,8 @@ public class ModItems { public static Item grenade_kit; public static Item fleija_kit; public static Item prototype_kit; + public static Item missile_kit; + public static Item t45_kit; public static Item igniter; @@ -677,6 +679,8 @@ public class ModItems { grenade_kit = new ItemStarterKit().setUnlocalizedName("grenade_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_kit"); fleija_kit = new ItemStarterKit().setUnlocalizedName("fleija_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":fleija_kit"); prototype_kit = new ItemStarterKit().setUnlocalizedName("prototype_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":prototype_kit"); + missile_kit = new ItemStarterKit().setUnlocalizedName("missile_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_kit"); + t45_kit = new ItemStarterKit().setUnlocalizedName("t45_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":t45_kit"); igniter = new ItemCustomLore().setUnlocalizedName("igniter").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":trigger"); ingot_euphemium = new ItemCustomLore().setUnlocalizedName("ingot_euphemium").setTextureName(RefStrings.MODID + ":ingot_euphemium"); @@ -1109,6 +1113,8 @@ public class ModItems { GameRegistry.registerItem(prototype_kit, prototype_kit.getUnlocalizedName()); GameRegistry.registerItem(fleija_kit, fleija_kit.getUnlocalizedName()); GameRegistry.registerItem(multi_kit, multi_kit.getUnlocalizedName()); + GameRegistry.registerItem(missile_kit, missile_kit.getUnlocalizedName()); GameRegistry.registerItem(grenade_kit, grenade_kit.getUnlocalizedName()); + GameRegistry.registerItem(t45_kit, t45_kit.getUnlocalizedName()); } } diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 00c6dfa96..d128e4974 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "HBM's Nuclear Tech Mod"; - public static final String VERSION = "1.0.16 ALPHA"; + public static final String VERSION = "1.0.16"; public static final String CLIENTSIDE = "com.hbm.main.ClientProxy"; public static final String SERVERSIDE = "com.hbm.main.ServerProxy"; }