diff --git a/assets/hbm/sounds/weapon/bellChime.ogg b/assets/hbm/sounds/weapon/bellChime.ogg new file mode 100644 index 000000000..52e6ecab7 Binary files /dev/null and b/assets/hbm/sounds/weapon/bellChime.ogg differ diff --git a/assets/hbm/textures/blocks/block_asbestos.png b/assets/hbm/textures/blocks/block_asbestos.png new file mode 100644 index 000000000..87fa1c97d Binary files /dev/null and b/assets/hbm/textures/blocks/block_asbestos.png differ diff --git a/assets/hbm/textures/blocks/block_fiberglass_side.png b/assets/hbm/textures/blocks/block_fiberglass_side.png new file mode 100644 index 000000000..21fbbfb04 Binary files /dev/null and b/assets/hbm/textures/blocks/block_fiberglass_side.png differ diff --git a/assets/hbm/textures/blocks/block_fiberglass_top.png b/assets/hbm/textures/blocks/block_fiberglass_top.png new file mode 100644 index 000000000..a6d760866 Binary files /dev/null and b/assets/hbm/textures/blocks/block_fiberglass_top.png differ diff --git a/assets/hbm/textures/blocks/deco_asbestos.png b/assets/hbm/textures/blocks/deco_asbestos.png new file mode 100644 index 000000000..d9b5873ba Binary files /dev/null and b/assets/hbm/textures/blocks/deco_asbestos.png differ diff --git a/assets/hbm/textures/blocks/ore_asbestos.png b/assets/hbm/textures/blocks/ore_asbestos.png new file mode 100644 index 000000000..445a66657 Binary files /dev/null and b/assets/hbm/textures/blocks/ore_asbestos.png differ diff --git a/assets/hbm/textures/blocks/owo.png b/assets/hbm/textures/blocks/owo.png new file mode 100644 index 000000000..6602e0a8a Binary files /dev/null and b/assets/hbm/textures/blocks/owo.png differ diff --git a/assets/hbm/textures/gui/gui_soyuz.png b/assets/hbm/textures/gui/gui_soyuz.png new file mode 100644 index 000000000..eab1dc3cb Binary files /dev/null and b/assets/hbm/textures/gui/gui_soyuz.png differ diff --git a/assets/hbm/textures/items/ingot_asbestos.png b/assets/hbm/textures/items/ingot_asbestos.png new file mode 100644 index 000000000..c1b42c82f Binary files /dev/null and b/assets/hbm/textures/items/ingot_asbestos.png differ diff --git a/assets/hbm/textures/items/ingot_fiberglass.png b/assets/hbm/textures/items/ingot_fiberglass.png new file mode 100644 index 000000000..b186d0b1e Binary files /dev/null and b/assets/hbm/textures/items/ingot_fiberglass.png differ diff --git a/assets/hbm/textures/items/static_sandwich.png b/assets/hbm/textures/items/static_sandwich.png new file mode 100644 index 000000000..966ac734e Binary files /dev/null and b/assets/hbm/textures/items/static_sandwich.png differ diff --git a/assets/hbm/textures/items/static_sandwich.png.mcmeta b/assets/hbm/textures/items/static_sandwich.png.mcmeta new file mode 100644 index 000000000..02b390a2a --- /dev/null +++ b/assets/hbm/textures/items/static_sandwich.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + + } +} diff --git a/assets/hbm/textures/models/truck_busted.png b/assets/hbm/textures/models/truck_busted.png new file mode 100644 index 000000000..e19710622 Binary files /dev/null and b/assets/hbm/textures/models/truck_busted.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 373f034c3..c0d25380a 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -90,6 +90,7 @@ public class ModBlocks { public static Block ore_oil_empty; public static Block ore_oil_sand; public static Block ore_lignite; + public static Block ore_asbestos; public static Block ore_tikite; @@ -117,6 +118,8 @@ public class ModBlocks { public static Block block_desh; public static Block block_starmetal; public static Block block_yellowcake; + public static Block block_fiberglass; + public static Block block_asbestos; public static Block block_australium; public static Block block_weidanium; @@ -132,6 +135,7 @@ public class ModBlocks { public static Block deco_steel; public static Block deco_lead; public static Block deco_beryllium; + public static Block deco_asbestos; public static Block hazmat; @@ -730,6 +734,7 @@ public class ModBlocks { ore_schrabidium = new BlockOre(Material.rock, 0.1F, 0.5F).setBlockName("ore_schrabidium").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":ore_schrabidium"); ore_beryllium = new BlockGeneric(Material.rock).setBlockName("ore_beryllium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_beryllium"); ore_lignite = new BlockOre(Material.rock).setBlockName("ore_lignite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_lignite"); + ore_asbestos = new BlockOre(Material.rock).setBlockName("ore_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_asbestos"); ore_nether_uranium = new BlockOre(Material.rock).setBlockName("ore_nether_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_uranium"); ore_nether_plutonium = new BlockGeneric(Material.rock).setBlockName("ore_nether_plutonium").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_plutonium"); @@ -787,6 +792,8 @@ public class ModBlocks { block_desh = new BlockGeneric(Material.iron).setBlockName("block_desh").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_desh"); block_starmetal = new BlockGeneric(Material.iron).setBlockName("block_starmetal").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_starmetal"); block_yellowcake = new BlockFallingRad(Material.sand, 0.5F, 3F).setBlockName("block_yellowcake").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeSand).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_yellowcake"); + block_fiberglass = new BlockReactor(Material.cloth).setBlockName("block_fiberglass").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeCloth).setHardness(5.0F).setResistance(10.0F); + block_asbestos = new BlockGeneric(Material.cloth).setBlockName("block_asbestos").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeCloth).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_asbestos"); block_australium = new BlockGeneric(Material.iron).setBlockName("block_australium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_australium"); block_weidanium = new BlockGeneric(Material.iron).setBlockName("block_weidanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_weidanium"); @@ -802,6 +809,7 @@ public class ModBlocks { deco_steel = new BlockOre(Material.iron).setBlockName("deco_steel").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel"); deco_lead = new BlockOre(Material.iron).setBlockName("deco_lead").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_lead"); deco_beryllium = new BlockOre(Material.iron).setBlockName("deco_beryllium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_beryllium"); + deco_asbestos = new BlockOre(Material.iron).setBlockName("deco_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_asbestos"); hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":hazmat"); @@ -1274,6 +1282,7 @@ public class ModBlocks { GameRegistry.registerBlock(ore_oil_empty, ore_oil_empty.getUnlocalizedName()); GameRegistry.registerBlock(ore_oil_sand, ore_oil_sand.getUnlocalizedName()); GameRegistry.registerBlock(ore_lignite, ore_lignite.getUnlocalizedName()); + GameRegistry.registerBlock(ore_asbestos, ore_asbestos.getUnlocalizedName()); GameRegistry.registerBlock(ore_schrabidium, ItemSchrabidiumBlock.class, ore_schrabidium.getUnlocalizedName()); //Rare Minerals @@ -1326,6 +1335,8 @@ public class ModBlocks { GameRegistry.registerBlock(block_yellowcake, block_yellowcake.getUnlocalizedName()); GameRegistry.registerBlock(block_scrap, block_scrap.getUnlocalizedName()); GameRegistry.registerBlock(block_electrical_scrap, block_electrical_scrap.getUnlocalizedName()); + GameRegistry.registerBlock(block_fiberglass, block_fiberglass.getUnlocalizedName()); + GameRegistry.registerBlock(block_asbestos, block_asbestos.getUnlocalizedName()); GameRegistry.registerBlock(block_trinitite, block_trinitite.getUnlocalizedName()); GameRegistry.registerBlock(block_waste, block_waste.getUnlocalizedName()); GameRegistry.registerBlock(block_schrabidium, ItemSchrabidiumBlock.class, block_schrabidium.getUnlocalizedName()); @@ -1348,6 +1359,7 @@ public class ModBlocks { GameRegistry.registerBlock(deco_steel, deco_steel.getUnlocalizedName()); GameRegistry.registerBlock(deco_lead, deco_lead.getUnlocalizedName()); GameRegistry.registerBlock(deco_beryllium, deco_beryllium.getUnlocalizedName()); + GameRegistry.registerBlock(deco_asbestos, deco_asbestos.getUnlocalizedName()); GameRegistry.registerBlock(hazmat, hazmat.getUnlocalizedName()); //Gravel diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index aadf0243c..17d816990 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -178,6 +178,10 @@ public class BlockOre extends Block { { return ModItems.ingot_tungsten; } + if(this == ModBlocks.deco_asbestos) + { + return ModItems.ingot_asbestos; + } if(this == ModBlocks.ore_lignite) { return ModItems.lignite; diff --git a/com/hbm/blocks/machine/BlockReactor.java b/com/hbm/blocks/machine/BlockReactor.java index c12640d28..c3e39ae9b 100644 --- a/com/hbm/blocks/machine/BlockReactor.java +++ b/com/hbm/blocks/machine/BlockReactor.java @@ -100,6 +100,11 @@ public class BlockReactor extends Block { this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":fwatz_cooler_top"); this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":fwatz_cooler"); } + if(this == ModBlocks.block_fiberglass) + { + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":block_fiberglass_top"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":block_fiberglass_side"); + } } @Override diff --git a/com/hbm/entity/projectile/EntityTom.java b/com/hbm/entity/projectile/EntityTom.java index 1a401680f..82f03b36f 100644 --- a/com/hbm/entity/projectile/EntityTom.java +++ b/com/hbm/entity/projectile/EntityTom.java @@ -45,7 +45,7 @@ public class EntityTom extends EntityThrowable { tom.posX = posX; tom.posY = posY; tom.posZ = posZ; - tom.destructionRange = 250; + tom.destructionRange = 500; worldObj.spawnEntityInWorld(tom); } this.setDead(); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index f6ab4f7ed..8a3bffc82 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -180,6 +180,9 @@ public class ModItems { public static Item ingot_dura_steel; public static Item ingot_polymer; + + public static Item ingot_fiberglass; + public static Item ingot_asbestos; public static Item ingot_lanthanium; public static Item ingot_actinium; @@ -1212,6 +1215,7 @@ public class ModItems { public static Item loop_stew; public static Item fooditem; public static Item twinkie; + public static Item static_sandwich; public static Item med_ipecac; public static Item med_ptsd; @@ -1847,6 +1851,8 @@ public class ModItems { ingot_starmetal = new ItemCustomLore().setUnlocalizedName("ingot_starmetal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_starmetal"); ingot_saturnite = new ItemCustomLore().setUnlocalizedName("ingot_saturnite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_saturnite"); plate_saturnite = new ItemCustomLore().setUnlocalizedName("plate_saturnite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_saturnite"); + ingot_fiberglass = new ItemCustomLore().setUnlocalizedName("ingot_fiberglass").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_fiberglass"); + ingot_asbestos = new ItemCustomLore().setUnlocalizedName("ingot_asbestos").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_asbestos"); ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lanthanium"); ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_actinium"); @@ -2863,6 +2869,7 @@ public class ModItems { loop_stew = new ItemLemon(10, 10, false).setUnlocalizedName("loop_stew").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":loop_stew"); fooditem = new ItemLemon(2, 5, false).setUnlocalizedName("fooditem").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":fooditem"); twinkie = new ItemLemon(3, 5, false).setUnlocalizedName("twinkie").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":twinkie"); + static_sandwich = new ItemLemon(6, 5, false).setUnlocalizedName("static_sandwich").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":static_sandwich"); canteen_13 = new ItemCanteen(1 * 60 * 20).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13"); canteen_vodka = new ItemCanteen(3 * 60 * 20).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka"); @@ -3502,6 +3509,8 @@ public class ModItems { GameRegistry.registerItem(lithium, lithium.getUnlocalizedName()); GameRegistry.registerItem(solid_fuel, solid_fuel.getUnlocalizedName()); GameRegistry.registerItem(rocket_fuel, rocket_fuel.getUnlocalizedName()); + GameRegistry.registerItem(ingot_fiberglass, ingot_fiberglass.getUnlocalizedName()); + GameRegistry.registerItem(ingot_asbestos, ingot_asbestos.getUnlocalizedName()); GameRegistry.registerItem(coke, coke.getUnlocalizedName()); GameRegistry.registerItem(lignite, lignite.getUnlocalizedName()); GameRegistry.registerItem(briquette_lignite, briquette_lignite.getUnlocalizedName()); @@ -4841,6 +4850,7 @@ public class ModItems { GameRegistry.registerItem(loop_stew, loop_stew.getUnlocalizedName()); GameRegistry.registerItem(fooditem, fooditem.getUnlocalizedName()); GameRegistry.registerItem(twinkie, twinkie.getUnlocalizedName()); + GameRegistry.registerItem(static_sandwich, static_sandwich.getUnlocalizedName()); GameRegistry.registerItem(med_ipecac, med_ipecac.getUnlocalizedName()); GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName()); //GameRegistry.registerItem(med_schizophrenia, med_schizophrenia.getUnlocalizedName()); diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index f2a272488..fdf0ba9fa 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -732,6 +732,16 @@ public class ItemCustomLore extends Item { { list.add("Metal sheets and metal bolts, reinforced with metal."); } + + if(this == ModItems.ingot_asbestos) + { + list.add(EnumChatFormatting.ITALIC + "\"Filled with life, self-doubt and asbestos. That comes with the air.\""); + } + + if(this == ModItems.ingot_fiberglass) + { + list.add("High in fiber, high in glass. Everything the body needs."); + } } @Override