diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 92bd5f173..f8ed5b796 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -1000,6 +1000,7 @@ item.gun_revolver_schrabidium_ammo.name=Schrabidiumpatrone item.gun_revolver_silver.name=Geliehene Kanone item.gun_rpg.name=Carl Gustav Reaktive Panzerbüchse item.gun_rpg_ammo.name=Rakete +item.gun_sauer.name=Stan Sauers Schrotflinte item.gun_skystinger.name=The One Sky Stinger item.gun_spark.name=Die Zündkerze item.gun_spark_ammo.name=Elektromagnetische Katusche @@ -1433,6 +1434,7 @@ item.powder_actinium.name=Actiniumstaub item.powder_actinium_tiny.name=Kleiner Haufen Actiniumstaub item.powder_advanced_alloy.name=Fortgeschrittener Legierungsstaub item.powder_aluminium.name=Aluminiumstaub +item.powder_asbestos.name=Asbeststaub item.powder_astatine.name=Astatstaub item.powder_australium.name=Australiumstaub item.powder_beryllium.name=Berylliumstaub @@ -2010,6 +2012,7 @@ tile.cmb_brick.name=CMB-Stahlfliese tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel tile.compact_launcher.name=Kompakt-Startrampe tile.concrete.name=Betonfliese +tile.concrete_pillar.name=Stahlbetonsäule tile.concrete_smooth.name=Beton tile.crashed_bomb.name=Blindgänger tile.crate.name=Vorratskiste @@ -2314,6 +2317,9 @@ tile.tesla.name=Teslaspule tile.test_nuke.name=Test Atombombe tile.therm_endo.name=Endothermische Bombe tile.therm_exo.name=Exothermische Bombe +tile.tile_lab.name=Laborfliesen +tile.tile_lab_broken.name=Gebrochene Labotfliesen +tile.tile_lab_cracked.name=Gesprungene Laborfliesen tile.toxic_block.name=Stereotypischer grüner Schleim tile.turret_cheapo.name=Billigsdorfer Gatling-Geschütz tile.turret_cwis.name=Phalanx Mk-15 CIWS diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index a05dd5aa5..aef543518 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -1000,6 +1000,7 @@ item.gun_revolver_schrabidium_ammo.name=Schrabidium Bullet item.gun_revolver_silver.name=Lent Gun item.gun_rpg.name=Carl Gustav Recoilless Rifle item.gun_rpg_ammo.name=Rocket (LEGACY) +item.gun_sauer.name=Stan Sauer's Shotgun item.gun_skystinger.name=The One Sky Stinger item.gun_spark.name=Spark Plug item.gun_spark_ammo.name=Electromagnetic Cartridge @@ -1433,6 +1434,7 @@ item.powder_actinium.name=Actinium Powder item.powder_actinium_tiny.name=Tiny Pile of Actinium Powder item.powder_advanced_alloy.name=Advanced Alloy Powder item.powder_aluminium.name=Aluminium Powder +item.powder_asbestos.name=Asbestos Powder item.powder_astatine.name=Astatine Powder item.powder_australium.name=Australium Powder item.powder_beryllium.name=Beryllium Powder @@ -2010,6 +2012,7 @@ tile.cmb_brick.name=CMB Steel Tile tile.cmb_brick_reinforced.name=Reinforced CMB Bricks tile.compact_launcher.name=Compact Launch Pad tile.concrete.name=Concrete Tile +tile.concrete_pillar.name=Rebar Reinforced Concrete Pillar tile.concrete_smooth.name=Concrete tile.crashed_bomb.name=Dud tile.crate.name=Supply Crate @@ -2314,6 +2317,9 @@ tile.tesla.name=Tesla Coil tile.test_nuke.name=Test Nuke tile.therm_endo.name=Endothermic Bomb tile.therm_exo.name=Exothermic Bomb +tile.tile_lab.name=Laboratory Tiles +tile.tile_lab_broken.name=Broken Laboratory Tiles +tile.tile_lab_cracked.name=Cracked Laboratory Tiles tile.toxic_block.name=Stereotypical Green Ooze tile.turret_cheapo.name=Cheapo Gatling Sentry tile.turret_cwis.name=Phalanx Mk-15 CIWS diff --git a/src/main/java/assets/hbm/textures/blocks/meteor_cobble_molten.png b/src/main/java/assets/hbm/textures/blocks/meteor_cobble_molten.png new file mode 100644 index 000000000..4214413e8 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/meteor_cobble_molten.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/meteor_cobble_molten.png.mcmeta b/src/main/java/assets/hbm/textures/blocks/meteor_cobble_molten.png.mcmeta new file mode 100644 index 000000000..fc4bc9855 --- /dev/null +++ b/src/main/java/assets/hbm/textures/blocks/meteor_cobble_molten.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 4 + } +} diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_aluminium.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_aluminium.png index f1215f2b0..bfb90c4aa 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_aluminium.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_aluminium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_copper.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_copper.png index c587921ab..b23ebd344 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_copper.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_copper.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_lead.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_lead.png index b7a5c3e14..564498b24 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_lead.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_lead.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_lithium.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_lithium.png index 616aafc8a..2b95bca51 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_lithium.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_lithium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_starmetal.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_starmetal.png index 27e7e04a0..1e90330ce 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_starmetal.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_starmetal.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_sulfur.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_sulfur.png index 8bd146f99..af0f7850f 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_sulfur.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_sulfur.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_thorium.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_thorium.png index 887dd2aa6..20c8f70e1 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_thorium.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_thorium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_titanium.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_titanium.png index f7313c777..cec81444f 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_titanium.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_titanium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_tungsten.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_tungsten.png index b65cfa735..5a6d3fcaf 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_tungsten.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_tungsten.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/ore_meteor_uranium.png b/src/main/java/assets/hbm/textures/blocks/ore_meteor_uranium.png index 458462f85..e9780ab50 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/ore_meteor_uranium.png and b/src/main/java/assets/hbm/textures/blocks/ore_meteor_uranium.png differ diff --git a/src/main/java/assets/hbm/textures/blocks/tile_lab b/src/main/java/assets/hbm/textures/blocks/tile_lab.png similarity index 100% rename from src/main/java/assets/hbm/textures/blocks/tile_lab rename to src/main/java/assets/hbm/textures/blocks/tile_lab.png diff --git a/src/main/java/assets/hbm/textures/blocks/tile_lab_cracked.png b/src/main/java/assets/hbm/textures/blocks/tile_lab_cracked.png new file mode 100644 index 000000000..16b4a4623 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/tile_lab_cracked.png differ diff --git a/src/main/java/assets/hbm/textures/gui/processing/gui_nuke_furnace.png b/src/main/java/assets/hbm/textures/gui/processing/gui_nuke_furnace.png new file mode 100644 index 000000000..d689cf741 Binary files /dev/null and b/src/main/java/assets/hbm/textures/gui/processing/gui_nuke_furnace.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_rocket.png new file mode 100644 index 000000000..0226ead91 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_4gauge_rocket.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_shrapnel.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_shrapnel.png new file mode 100644 index 000000000..f64b4271d Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_4gauge_shrapnel.png differ diff --git a/src/main/java/assets/hbm/textures/items/fragment_cobalt.png b/src/main/java/assets/hbm/textures/items/fragment_cobalt.png index bca9299a1..611d5b98b 100644 Binary files a/src/main/java/assets/hbm/textures/items/fragment_cobalt.png and b/src/main/java/assets/hbm/textures/items/fragment_cobalt.png differ diff --git a/src/main/java/assets/hbm/textures/items/powder_asbestos.png b/src/main/java/assets/hbm/textures/items/powder_asbestos.png new file mode 100644 index 000000000..5bf23629c Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/powder_asbestos.png differ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 1d9a9d1cd..a586158e3 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -178,6 +178,7 @@ public class ModBlocks { public static Block reinforced_stone; public static Block concrete_smooth; public static Block concrete; + public static Block concrete_pillar; public static Block brick_concrete; public static Block brick_concrete_mossy; public static Block brick_concrete_cracked; @@ -189,6 +190,10 @@ public class ModBlocks { public static Block cmb_brick; public static Block cmb_brick_reinforced; + public static Block tile_lab; + public static Block tile_lab_cracked; + public static Block tile_lab_broken; + public static Block block_meteor; public static Block block_meteor_cobble; public static Block block_meteor_broken; @@ -932,23 +937,28 @@ public class ModBlocks { reinforced_lamp_off = new ReinforcedLamp(Material.rock, false).setBlockName("reinforced_lamp_off").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(300.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_lamp_off"); reinforced_lamp_on = new ReinforcedLamp(Material.rock, true).setBlockName("reinforced_lamp_on").setHardness(15.0F).setResistance(300.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_lamp_on"); - reinforced_stone = new BlockGeneric(Material.rock).setBlockName("reinforced_stone").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(3000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_stone"); - concrete_smooth = new BlockGeneric(Material.rock).setBlockName("concrete_smooth").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete"); - concrete = new BlockGeneric(Material.rock).setBlockName("concrete").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_tile"); - brick_concrete = new BlockGeneric(Material.rock).setBlockName("brick_concrete").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete"); - brick_concrete_mossy = new BlockGeneric(Material.rock).setBlockName("brick_concrete_mossy").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_mossy"); - brick_concrete_cracked = new BlockGeneric(Material.rock).setBlockName("brick_concrete_cracked").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(2000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_cracked"); - brick_concrete_broken = new BlockGeneric(Material.rock).setBlockName("brick_concrete_broken").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(1500.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_broken"); + reinforced_stone = new BlockGeneric(Material.rock).setBlockName("reinforced_stone").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(3000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_stone"); + concrete_smooth = new BlockGeneric(Material.rock).setBlockName("concrete_smooth").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete"); + concrete = new BlockGeneric(Material.rock).setBlockName("concrete").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_tile"); + concrete_pillar = new BlockRotatablePillar(Material.rock, RefStrings.MODID + ":concrete_pillar_top").setBlockName("concrete_pillar").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_pillar_side"); + brick_concrete = new BlockGeneric(Material.rock).setBlockName("brick_concrete").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete"); + brick_concrete_mossy = new BlockGeneric(Material.rock).setBlockName("brick_concrete_mossy").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_mossy"); + brick_concrete_cracked = new BlockGeneric(Material.rock).setBlockName("brick_concrete_cracked").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(2000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_cracked"); + brick_concrete_broken = new BlockGeneric(Material.rock).setBlockName("brick_concrete_broken").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(1500.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_broken"); brick_obsidian = new BlockGeneric(Material.rock).setBlockName("brick_obsidian").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(8000.0F).setBlockTextureName(RefStrings.MODID + ":brick_obsidian"); - brick_light = new BlockGeneric(Material.rock).setBlockName("brick_light").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_light"); - brick_compound = new BlockGeneric(Material.rock).setBlockName("brick_compound").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(10000.0F).setBlockTextureName(RefStrings.MODID + ":brick_compound"); + brick_light = new BlockGeneric(Material.rock).setBlockName("brick_light").setCreativeTab(MainRegistry.blockTab).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_light"); + brick_compound = new BlockGeneric(Material.rock).setBlockName("brick_compound").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(10000.0F).setBlockTextureName(RefStrings.MODID + ":brick_compound"); cmb_brick = new BlockGeneric(Material.rock).setBlockName("cmb_brick").setCreativeTab(MainRegistry.blockTab).setHardness(25.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick"); cmb_brick_reinforced = new BlockGeneric(Material.rock).setBlockName("cmb_brick_reinforced").setCreativeTab(MainRegistry.blockTab).setHardness(25.0F).setResistance(60000.0F).setBlockTextureName(RefStrings.MODID + ":cmb_brick_reinforced"); + + tile_lab = new BlockGeneric(Material.rock).setBlockName("tile_lab").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(1.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":tile_lab"); + tile_lab_cracked = new BlockGeneric(Material.rock).setBlockName("tile_lab_cracked").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(1.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":tile_lab_cracked"); + tile_lab_broken = new BlockGeneric(Material.rock).setBlockName("tile_lab_broken").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(1.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":tile_lab_broken"); block_meteor = new BlockOre(Material.rock).setBlockName("block_meteor").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":meteor"); block_meteor_cobble = new BlockOre(Material.rock).setBlockName("block_meteor_cobble").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":meteor_cobble"); block_meteor_broken = new BlockOre(Material.rock).setBlockName("block_meteor_broken").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":meteor_crushed"); - block_meteor_molten = new BlockOre(Material.rock, true).setBlockName("block_meteor_molten").setLightLevel(0.75F).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":block_meteor_molten"); + block_meteor_molten = new BlockOre(Material.rock, true).setBlockName("block_meteor_molten").setLightLevel(0.75F).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":meteor_cobble_molten"); block_meteor_treasure = new BlockOre(Material.rock).setBlockName("block_meteor_treasure").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":meteor_treasure"); meteor_polished = new BlockGeneric(Material.rock).setBlockName("meteor_polished").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":meteor_polished"); meteor_brick = new BlockGeneric(Material.rock).setBlockName("meteor_brick").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":meteor_brick"); @@ -1561,6 +1571,7 @@ public class ModBlocks { GameRegistry.registerBlock(reinforced_stone, reinforced_stone.getUnlocalizedName()); GameRegistry.registerBlock(concrete_smooth, concrete_smooth.getUnlocalizedName()); GameRegistry.registerBlock(concrete, concrete.getUnlocalizedName()); + GameRegistry.registerBlock(concrete_pillar, concrete_pillar.getUnlocalizedName()); GameRegistry.registerBlock(brick_concrete, brick_concrete.getUnlocalizedName()); GameRegistry.registerBlock(brick_concrete_mossy, brick_concrete_mossy.getUnlocalizedName()); GameRegistry.registerBlock(brick_concrete_cracked, brick_concrete_cracked.getUnlocalizedName()); @@ -1573,6 +1584,11 @@ public class ModBlocks { GameRegistry.registerBlock(cmb_brick, cmb_brick.getUnlocalizedName()); GameRegistry.registerBlock(cmb_brick_reinforced, cmb_brick_reinforced.getUnlocalizedName()); + //Tiles + GameRegistry.registerBlock(tile_lab, tile_lab.getUnlocalizedName()); + GameRegistry.registerBlock(tile_lab_cracked, tile_lab_cracked.getUnlocalizedName()); + GameRegistry.registerBlock(tile_lab_broken, tile_lab_broken.getUnlocalizedName()); + //Other defensive stuff GameRegistry.registerBlock(barbed_wire, barbed_wire.getUnlocalizedName()); GameRegistry.registerBlock(barbed_wire_fire, barbed_wire_fire.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockOre.java b/src/main/java/com/hbm/blocks/generic/BlockOre.java index 5a4346d31..938e191d6 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOre.java @@ -172,6 +172,10 @@ public class BlockOre extends Block { { return ModItems.ingot_asbestos; } + if(this == ModBlocks.ore_asbestos) + { + return ModItems.ingot_asbestos; + } if(this == ModBlocks.ore_lignite) { return ModItems.lignite; diff --git a/src/main/java/com/hbm/entity/mob/EntityMaskMan.java b/src/main/java/com/hbm/entity/mob/EntityMaskMan.java index 6266ce8e1..f76603482 100644 --- a/src/main/java/com/hbm/entity/mob/EntityMaskMan.java +++ b/src/main/java/com/hbm/entity/mob/EntityMaskMan.java @@ -1,12 +1,6 @@ package com.hbm.entity.mob; -import com.hbm.entity.projectile.EntityBulletBase; -import com.hbm.handler.BulletConfigSyncingUtil; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IRangedAttackMob; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.EntityAIArrowAttack; import net.minecraft.entity.ai.EntityAIHurtByTarget; import net.minecraft.entity.ai.EntityAILookIdle; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; @@ -15,10 +9,9 @@ import net.minecraft.entity.ai.EntityAIWander; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.Vec3; import net.minecraft.world.World; -public class EntityMaskMan extends EntityMob implements IRangedAttackMob, IBossDisplayData { +public class EntityMaskMan extends EntityMob implements IBossDisplayData { public EntityMaskMan(World world) { super(world); @@ -26,7 +19,6 @@ public class EntityMaskMan extends EntityMob implements IRangedAttackMob, IBossD this.tasks.addTask(1, new EntityAISwimming(this)); this.tasks.addTask(2, new EntityAIWander(this, 1.0D)); this.tasks.addTask(3, new EntityAILookIdle(this)); - this.tasks.addTask(4, new EntityAIArrowAttack(this, 1.0D, 20, 60, 15.0F)); this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, false)); this.targetTasks.addTask(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, 0, true)); @@ -46,19 +38,4 @@ public class EntityMaskMan extends EntityMob implements IRangedAttackMob, IBossD protected boolean canDespawn() { return false; } - - @Override - public void attackEntityWithRangedAttack(EntityLivingBase target, float dist) { - - Vec3 vec = Vec3.createVectorHelper(target.posX - posX, (target.posY + target.getEyeHeight()) - (posY + 3), target.posZ - posZ).normalize(); - - EntityBulletBase rawkett = new EntityBulletBase(worldObj, BulletConfigSyncingUtil.ROCKET_SHRAPNEL); - rawkett.setVelocity(vec.xCoord, vec.yCoord, vec.zCoord); - rawkett.setLocationAndAngles(posX + vec.xCoord * 2, posY, posZ + vec.zCoord * 2, 0.0F, 0.0F); - - rawkett.lastTickPosY = rawkett.prevPosY = rawkett.posY = rawkett.posY + 3; - - worldObj.spawnEntityInWorld(rawkett); - } - } diff --git a/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java b/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java index e804db39c..4574e72d1 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java @@ -147,6 +147,25 @@ public class GunEnergyFactory { data.setInteger("count", 15); data.setDouble("motion", 0.1D); + /* + * java.lang.NullPointerException + * at cpw.mods.fml.common.network.FMLOutboundHandler$OutboundTarget$7.selectNetworks(FMLOutboundHandler.java:193) + * at cpw.mods.fml.common.network.FMLOutboundHandler.write(FMLOutboundHandler.java:273) + * at io.netty.channel.DefaultChannelHandlerContext.invokeWrite(DefaultChannelHandlerContext.java:644) + * at io.netty.channel.DefaultChannelHandlerContext.write(DefaultChannelHandlerContext.java:698) + * at io.netty.channel.DefaultChannelHandlerContext.write(DefaultChannelHandlerContext.java:637) + * at io.netty.handler.codec.MessageToMessageEncoder.write(MessageToMessageEncoder.java:115) + * at io.netty.handler.codec.MessageToMessageCodec.write(MessageToMessageCodec.java:116) + * at io.netty.channel.DefaultChannelHandlerContext.invokeWrite(DefaultChannelHandlerContext.java:644) + * at io.netty.channel.DefaultChannelHandlerContext.write(DefaultChannelHandlerContext.java:698) + * at io.netty.channel.DefaultChannelHandlerContext.writeAndFlush(DefaultChannelHandlerContext.java:688) + * at io.netty.channel.DefaultChannelHandlerContext.writeAndFlush(DefaultChannelHandlerContext.java:717) + * at io.netty.channel.DefaultChannelPipeline.writeAndFlush(DefaultChannelPipeline.java:893) + * at io.netty.channel.AbstractChannel.writeAndFlush(AbstractChannel.java:239) + * at cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper.sendToAllAround(SimpleNetworkWrapper.java:210) + * at com.hbm.handler.guncfg.GunEnergyFactory$1.behaveBlockHit(GunEnergyFactory.java:150) + */ + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, bullet.posX, bullet.posY, bullet.posZ), new TargetPoint(bullet.dimension, bullet.posX, bullet.posY, bullet.posZ, 50)); } }; diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/MachineRecipes.java index b8ab3b371..aeeab2d1a 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/MachineRecipes.java @@ -1601,7 +1601,7 @@ public class MachineRecipes { list.add(new ItemStack(Items.string, 8)); break; case ASBESTOS_CLOTH: - list.add(new ItemStack(ModItems.powder_quartz, 4)); + list.add(new ItemStack(ModItems.ingot_asbestos, 2)); list.add(new ItemStack(Items.string, 6)); list.add(new ItemStack(Blocks.wool, 1)); break; diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 07001de88..7249eb87e 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -59,6 +59,7 @@ public class OreDictManager { OreDictionary.registerOre("ingotEuphemium", ModItems.ingot_euphemium); OreDictionary.registerOre("ingotDineutronium", ModItems.ingot_dineutronium); OreDictionary.registerOre("ingotStarmetal", ModItems.ingot_starmetal); + OreDictionary.registerOre("ingotAsbestos", ModItems.ingot_asbestos); OreDictionary.registerOre("nuggetLead", ModItems.nugget_lead); OreDictionary.registerOre("nuggetUranium", ModItems.nugget_uranium); @@ -135,10 +136,11 @@ public class OreDictManager { OreDictionary.registerOre("dustSchrabidium", ModItems.powder_schrabidium); OreDictionary.registerOre("dustSulfur", ModItems.sulfur); OreDictionary.registerOre("dustNiter", ModItems.niter); - OreDictionary.registerOre("dustSalpeter", ModItems.niter); + OreDictionary.registerOre("dustSaltpeter", ModItems.niter); OreDictionary.registerOre("dustLead", ModItems.powder_lead); OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium); OreDictionary.registerOre("dustPolonium", ModItems.powder_polonium); + OreDictionary.registerOre("dustAsbestos", ModItems.powder_asbestos); OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium); OreDictionary.registerOre("dustIodine", ModItems.powder_iodine); @@ -176,7 +178,7 @@ public class OreDictManager { OreDictionary.registerOre("oreSchrabidium", ModBlocks.ore_schrabidium); OreDictionary.registerOre("oreSulfur", ModBlocks.ore_sulfur); OreDictionary.registerOre("oreNiter", ModBlocks.ore_niter); - OreDictionary.registerOre("oreSalpeter", ModBlocks.ore_niter); + OreDictionary.registerOre("oreSaltpeter", ModBlocks.ore_niter); OreDictionary.registerOre("oreCopper", ModBlocks.ore_copper); OreDictionary.registerOre("oreTungsten", ModBlocks.ore_tungsten); OreDictionary.registerOre("oreAluminum", ModBlocks.ore_aluminium); @@ -208,13 +210,14 @@ public class OreDictManager { OreDictionary.registerOre("oreLead", ModBlocks.ore_meteor_lead); OreDictionary.registerOre("oreLithium", ModBlocks.ore_meteor_lithium); OreDictionary.registerOre("oreStarmetal", ModBlocks.ore_meteor_starmetal); + OreDictionary.registerOre("oreAsbestos", ModBlocks.ore_asbestos); OreDictionary.registerOre("blockThorium", ModBlocks.block_thorium); OreDictionary.registerOre("blockUranium", ModBlocks.block_uranium); OreDictionary.registerOre("blockTitanium", ModBlocks.block_titanium); OreDictionary.registerOre("blockSulfur", ModBlocks.block_sulfur); OreDictionary.registerOre("blockNiter", ModBlocks.block_niter); - OreDictionary.registerOre("blockSalpeter", ModBlocks.block_niter); + OreDictionary.registerOre("blockSaltpeter", ModBlocks.block_niter); OreDictionary.registerOre("blockCopper", ModBlocks.block_copper); OreDictionary.registerOre("blockRedCopperAlloy", ModBlocks.block_red_copper); OreDictionary.registerOre("blockAdvanced", ModBlocks.block_advanced_alloy); @@ -234,6 +237,7 @@ public class OreDictManager { OreDictionary.registerOre("blockDaffergon", ModBlocks.block_daffergon); OreDictionary.registerOre("blockVerticium", ModBlocks.block_verticium); OreDictionary.registerOre("blockDesh", ModBlocks.block_desh); + OreDictionary.registerOre("blockAsbestos", ModBlocks.block_asbestos); OreDictionary.registerOre("blockThorium", ModBlocks.block_thorium); OreDictionary.registerOre("blockThorium232", ModBlocks.block_thorium); diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeFurnace.java b/src/main/java/com/hbm/inventory/gui/GUINukeFurnace.java index e40e26233..70187b8de 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeFurnace.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeFurnace.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -12,22 +11,29 @@ import com.hbm.inventory.container.ContainerNukeFurnace; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityNukeFurnace; -public class GUINukeFurnace extends GuiContainer { +public class GUINukeFurnace extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/GUIReactor.png"); - private TileEntityNukeFurnace diFurnace; + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_nuke_furnace.png"); + private TileEntityNukeFurnace furnace; public GUINukeFurnace(InventoryPlayer invPlayer, TileEntityNukeFurnace tedf) { super(new ContainerNukeFurnace(invPlayer, tedf)); - diFurnace = tedf; + furnace = tedf; this.xSize = 176; this.ySize = 166; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 55, guiTop + 34, 18, 18, mouseX, mouseY, new String[] { furnace.dualPower + " operation(s) left" }); + } + @Override protected void drawGuiContainerForegroundLayer(int i, int j) { - String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName()); + String name = this.furnace.hasCustomInventoryName() ? this.furnace.getInventoryName() : I18n.format(this.furnace.getInventoryName()); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); @@ -39,12 +45,10 @@ public class GUINukeFurnace extends GuiContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - if(diFurnace.hasPower()) - { + if(furnace.hasPower()) drawTexturedModalRect(guiLeft + 55, guiTop + 35, 176, 0, 18, 16); - } - int j1 = diFurnace.getDiFurnaceProgressScaled(24); - drawTexturedModalRect(guiLeft + 79, guiTop + 34, 176, 16, j1 + 1, 17); + int i = furnace.getDiFurnaceProgressScaled(24); + drawTexturedModalRect(guiLeft + 80, guiTop + 34, 176, 16, i, 17); } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index e7f06e4a1..58014ed7b 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -224,6 +224,7 @@ public class ModItems { public static Item ingot_fiberglass; public static Item ingot_asbestos; + public static Item powder_asbestos; public static Item ingot_lanthanium; public static Item ingot_actinium; @@ -2050,6 +2051,7 @@ public class ModItems { 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"); + powder_asbestos = new ItemCustomLore().setUnlocalizedName("powder_asbestos").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_asbestos"); ingot_electronium = new ItemCustomLore().setUnlocalizedName("ingot_electronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_electronium"); nugget_mercury = new ItemCustomLore().setUnlocalizedName("nugget_mercury").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mercury"); bottle_mercury = new ItemCustomLore().setUnlocalizedName("bottle_mercury").setContainerItem(Items.glass_bottle).setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bottle_mercury"); @@ -4045,6 +4047,7 @@ public class ModItems { GameRegistry.registerItem(powder_cerium, powder_cerium.getUnlocalizedName()); GameRegistry.registerItem(powder_lanthanium, powder_lanthanium.getUnlocalizedName()); GameRegistry.registerItem(powder_actinium, powder_actinium.getUnlocalizedName()); + GameRegistry.registerItem(powder_asbestos, powder_asbestos.getUnlocalizedName()); GameRegistry.registerItem(powder_magic, powder_magic.getUnlocalizedName()); GameRegistry.registerItem(powder_cloud, powder_cloud.getUnlocalizedName()); GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index 8bbe2efd3..7d7e173e0 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -368,6 +368,11 @@ public class ItemCustomLore extends Item { list.add(EnumChatFormatting.ITALIC + "\"Filled with life, self-doubt and asbestos. That comes with the air.\""); } + if(this == ModItems.powder_asbestos) + { + list.add(EnumChatFormatting.ITALIC + "\"Sniffffffff- MHHHHHHMHHHHHHHHH\""); + } + if(this == ModItems.ingot_fiberglass) { list.add("High in fiber, high in glass. Everything the body needs."); diff --git a/src/main/java/com/hbm/items/special/ItemRadioactive.java b/src/main/java/com/hbm/items/special/ItemRadioactive.java index 91962ec9c..0a596e8cb 100644 --- a/src/main/java/com/hbm/items/special/ItemRadioactive.java +++ b/src/main/java/com/hbm/items/special/ItemRadioactive.java @@ -79,6 +79,7 @@ public class ItemRadioactive extends ItemCustomLore { if(breeder != null) { list.add(BreederRecipes.getHEATString("[Provides " + breeder[0] + " HEAT]", breeder[0])); list.add(EnumChatFormatting.YELLOW + "Worth " + breeder[1] + " operations in breeding reactor"); + list.add(EnumChatFormatting.YELLOW + "Worth " + (breeder[0] * breeder[1] * 5) + " operations in nuclear furnace"); } } } diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index 23363eaf0..3a3a21c12 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -222,6 +222,14 @@ public class HbmWorldGen implements IWorldGenerator { (new WorldGenMinable(ModBlocks.ore_lignite, 24)).generate(world, rand, randPosX, randPosY, randPosZ); } + for (int k = 0; k < MainRegistry.asbestosSpawn; k++) { + int randPosX = i + rand.nextInt(16); + int randPosY = rand.nextInt(16) + 16; + int randPosZ = j + rand.nextInt(16); + + (new WorldGenMinable(ModBlocks.ore_asbestos, 3)).generate(world, rand, randPosX, randPosY, randPosZ); + } + /*if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) { for (int k = 0; k < 1; k++) { int randPosX = i + rand.nextInt(16); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 8317fc8a0..bed0708f0 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -31,7 +31,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.board_copper, 1), new Object[] { "TTT", "TTT", 'T', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth_red, 1), new Object[] { "C", "R", "C", 'C', ModItems.hazmat_cloth, 'R', "dustRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth_grey, 1), new Object[] { " P ", "ICI", " L ", 'C', ModItems.hazmat_cloth_red, 'P', "plateIron", 'L', "plateLead", 'I', ModItems.plate_polymer })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_cloth, 16), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', ModItems.powder_bromine, 'C', Blocks.wool })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.asbestos_cloth, 8), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', ModItems.powder_bromine, 'C', Blocks.wool })); GameRegistry.addRecipe(new ItemStack(ModItems.bolt_dura_steel, 4), new Object[] { "D", "D", 'D', ModItems.ingot_dura_steel}); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pipes_steel, 1), new Object[] { "B", "B", "B", 'B', "blockSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bolt_tungsten, 4), new Object[] { "D", "D", 'D', "ingotTungsten" })); @@ -53,10 +53,10 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier5, 1), new Object[] { "CPC", 'C', ModItems.circuit_schrabidium, 'P', "dustDiamond" })); GameRegistry.addRecipe(new ItemStack(ModItems.circuit_targeting_tier6, 1), new Object[] { "P", "D", "C", 'C', ModItems.circuit_targeting_tier5, 'D', ModItems.battery_potatos, 'P', ModItems.powder_spark_mix }); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "salpeter", Items.coal })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "salpeter", new ItemStack(Items.coal, 1, 1) })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "dustSulfur", "dustSalpeter", Items.coal })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "dustSulfur", "dustSalpeter", new ItemStack(Items.coal, 1, 1) })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "saltpeter", Items.coal })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "saltpeter", new ItemStack(Items.coal, 1, 1) })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "dustSulfur", "dustSaltpeter", Items.coal })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "dustSulfur", "dustSaltpeter", new ItemStack(Items.coal, 1, 1) })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cell_empty, 6), new Object[] { "SSS", "G G", "SSS", 'S', "plateSteel", 'G', "paneGlass" })); GameRegistry.addRecipe(new ItemStack(ModItems.cell_deuterium, 8), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.cell_empty, 'T', ModItems.mike_deut }); @@ -122,6 +122,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModBlocks.block_insulator, 1), new Object[] { "###", "###", "###", '#', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModBlocks.block_asbestos, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_asbestos }); GameRegistry.addRecipe(new ItemStack(ModBlocks.block_fiberglass, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_fiberglass }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_cobalt, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_cobalt }); GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth }); GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat }); @@ -188,6 +189,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.plate_polymer, 9), new Object[] { "#", '#', ModBlocks.block_insulator }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_asbestos, 9), new Object[] { "#", '#', ModBlocks.block_asbestos }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_fiberglass, 9), new Object[] { "#", '#', ModBlocks.block_fiberglass }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_cobalt, 9), new Object[] { "#", '#', ModBlocks.block_cobalt }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_plutonium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_plutonium }); GameRegistry.addRecipe(new ItemStack(ModItems.nugget_plutonium, 9), new Object[] { "#", '#', ModItems.ingot_plutonium }); @@ -654,20 +656,24 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_scaffold), 1), new Object[] { "IPI", "P P", "IPI", 'I', "ingotTungsten", 'P', "plateDenseLead" })); GameRegistry.addRecipe(new ItemStack(ModBlocks.reinforced_stone, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.cobblestone, 'B', Blocks.stone }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.concrete), 4), new Object[] { "CC", "CC", 'C', ModBlocks.concrete_smooth }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 4), new Object[] { " C ", "CBC", " C ", 'C', ModBlocks.concrete_smooth, 'B', Items.clay_ball }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 4), new Object[] { " C ", "CBC", " C ", 'C', ModBlocks.concrete, 'B', Items.clay_ball }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete_mossy), 8), new Object[] { "CCC", "CVC", "CCC", 'C', ModBlocks.brick_concrete, 'V', Blocks.vine }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete_cracked), 6), new Object[] { " C " , "C C", " C ", 'C', ModBlocks.brick_concrete }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete_broken), 6), new Object[] { " C " , "C C", " C ", 'C', ModBlocks.brick_concrete_cracked }); - GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.brick_light, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.concrete, 4), new Object[] { "CC", "CC", 'C', ModBlocks.concrete_smooth }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.concrete_pillar, 8), new Object[] { "CBC", "CBC", "CBC", 'C', ModBlocks.concrete_smooth, 'B', Blocks.iron_bars }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.brick_concrete, 4), new Object[] { " C ", "CBC", " C ", 'C', ModBlocks.concrete_smooth, 'B', Items.clay_ball }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.brick_concrete, 4), new Object[] { " C ", "CBC", " C ", 'C', ModBlocks.concrete, 'B', Items.clay_ball }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.brick_concrete_mossy, 8), new Object[] { "CCC", "CVC", "CCC", 'C', ModBlocks.brick_concrete, 'V', Blocks.vine }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.brick_concrete_cracked, 6), new Object[] { " C " , "C C", " C ", 'C', ModBlocks.brick_concrete }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.brick_concrete_broken, 6), new Object[] { " C " , "C C", " C ", 'C', ModBlocks.brick_concrete_cracked }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.brick_obsidian, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian }); GameRegistry.addRecipe(new ItemStack(ModBlocks.meteor_polished, 4), new Object[] { "CC", "CC", 'C', ModBlocks.block_meteor_broken }); GameRegistry.addRecipe(new ItemStack(ModBlocks.meteor_pillar, 2), new Object[] { "C", "C", 'C', ModBlocks.meteor_polished }); GameRegistry.addRecipe(new ItemStack(ModBlocks.meteor_brick, 4), new Object[] { "CC", "CC", 'C', ModBlocks.meteor_polished }); GameRegistry.addRecipe(new ItemStack(ModBlocks.meteor_brick_mossy, 8), new Object[] { "CCC", "CVC", "CCC", 'C', ModBlocks.meteor_brick, 'V', Blocks.vine }); GameRegistry.addRecipe(new ItemStack(ModBlocks.meteor_brick_cracked, 6), new Object[] { " C " , "C C", " C ", 'C', ModBlocks.meteor_brick }); GameRegistry.addRecipe(new ItemStack(ModBlocks.meteor_battery, 1), new Object[] { "MSM", "MWM", "MSM", 'M', ModBlocks.meteor_polished, 'S', ModBlocks.block_starmetal, 'W', ModItems.wire_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.tile_lab, 4), new Object[] { "CBC", "CBC", "CBC", 'C', Items.brick, 'B', ModItems.ingot_asbestos }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.tile_lab_cracked, 6), new Object[] { " C " , "C C", " C ", 'C', ModBlocks.tile_lab }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.tile_lab_broken, 6), new Object[] { " C " , "C C", " C ", 'C', ModBlocks.tile_lab_cracked }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_brick), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', ModBlocks.brick_concrete }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_compound), 8), new Object[] { "FBF", "BFB", "FBF", 'F', ModItems.bolt_tungsten, 'B', ModBlocks.reinforced_brick }); @@ -724,6 +730,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_flechette, 1), new Object[] { "PPM", "TIS", "G ", 'P', "plateSteel", 'M', ModItems.mechanism_rifle_2, 'T', ModItems.hull_small_steel, 'I', "ingotSteel", 'S', ModItems.ingot_polymer, 'G', ModItems.mechanism_launcher_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uboinik, 1), new Object[] { "IIM", "SPW", 'P', "plateSteel", 'I', "ingotSteel", 'W', "plankWood", 'S', Items.stick, 'M', ModItems.mechanism_revolver_2 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_ks23, 1), new Object[] { "PPM", "SWL", 'P', "plateSteel", 'M', ModItems.mechanism_rifle_1, 'S', Items.stick, 'W', ModItems.wire_tungsten, 'L', "logWood" })); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.gun_sauer, 1), new Object[] { ModItems.ducttape, ModItems.gun_ks23, Blocks.lever, ModItems.gun_ks23 }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456, 1), new Object[] { "PBB", "ACC", "PRY", 'P', "plateSteel", 'R', ModItems.redcoil_capacitor, 'A', ModItems.coil_advanced_alloy, 'B', ModItems.battery_generic, 'C', ModItems.coil_advanced_torus, 'Y', ModItems.mechanism_special })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456_ammo, 64), new Object[] { "SSS", "SRS", "SSS", 'S', "plateSteel", 'R', ModItems.rod_quad_uranium_fuel_depleted })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_xvl1456_ammo, 32), new Object[] { " S ", "SRS", " S ", 'S', "plateSteel", 'R', ModItems.rod_dual_uranium_fuel_depleted })); @@ -738,7 +745,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_immolator_ammo, 24), new Object[] { " F ", "SFS", " F ", 'S', "plateSteel", 'F', ModItems.canister_napalm })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_flamer, 1), new Object[] { "WPP", "SCT", "WMI", 'W', ModItems.wire_gold, 'P', ModItems.pipes_steel, 'S', ModItems.hull_small_steel, 'C', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'M', ModItems.mechanism_launcher_1, 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator, 1), new Object[] { "SSS", "IWL", "LMI", 'S', "plateSteel", 'I', "plateIron", 'L', Items.leather, 'M', ModItems.mechanism_launcher_1, 'W', ModItems.wire_aluminium })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { "SPS", "PCP", "SPS", 'S', "plateSteel", 'C', "dustSalpeter", 'P', Items.snowball })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { "SPS", "PCP", "SPS", 'S', "plateSteel", 'C', "dustSaltpeter", 'P', Items.snowball })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_cryolator_ammo, 16), new Object[] { " F ", "SFS", " F ", 'S', "plateSteel", 'F', ModItems.powder_ice })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_zomg, 1), new Object[] { "PRR", "CCS", "PXX", 'P', ModItems.plate_paa, 'R', "plateDenseLead", 'S', ModItems.singularity_counter_resonant, 'X', ModItems.crystal_xen, 'C', ModItems.coil_magnetized_tungsten})); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp, 1), new Object[] { "EEE", "SSM", "III", 'E', ModItems.ingot_euphemium, 'S', "plateSteel", 'I', "ingotSteel", 'M', ModItems.mechanism_rifle_2 })); @@ -869,8 +876,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_folly_nuclear, 1), new Object[] { " B ", "EEE", " S ", 'B', ModItems.folly_bullet_nuclear, 'E', ModBlocks.det_charge, 'S', ModItems.folly_shell }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_folly_du, 1), new Object[] { " B ", "EEE", " S ", 'B', ModItems.folly_bullet_du, 'E', ModBlocks.det_charge, 'S', ModItems.folly_shell }); - GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket, 2), new Object[] { " T ", "GCG", " P ", 'T', Blocks.tnt, 'G', Items.gunpowder, 'C', ModItems.casing_50, 'P', ModItems.primer_50 }); - GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket, 2), new Object[] { " T ", "GCG", " P ", 'T', Blocks.tnt, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket, 2), new Object[] { " T ", "GCG", " P ", 'T', Blocks.tnt, 'G', ModItems.rocket_fuel, 'C', ModItems.casing_50, 'P', ModItems.primer_50 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_he, 1), new Object[] { "G", "R", "G", 'G', Items.gunpowder, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_incendiary, 1), new Object[] { "G", "R", 'G', ModItems.powder_fire, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_phosphorus, 1), new Object[] { "G", "R", 'G', ModItems.ingot_phosphorus, 'R', ModItems.ammo_rocket }); @@ -1083,8 +1089,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PNP", "PSP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PSP", "PNP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium })); GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.battery_spark), new Object[] { " A ", "PSP", "PSP", 'A', ModItems.wire_magnetized_tungsten, 'P', ModItems.plate_dineutronium, 'S', ModItems.powder_spark_mix }); - GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.battery_trixite), new Object[] { " A ", "PSP", "PTP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite })); - GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.battery_trixite), new Object[] { " A ", "PTP", "PSP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite })); + GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_trixite), new Object[] { " A ", "PSP", "PTP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite })); + GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_trixite), new Object[] { " A ", "PTP", "PSP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.energy_core), new Object[] { "PCW", "TRD", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.energy_core), new Object[] { "PCW", "TDR", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" })); @@ -1279,7 +1285,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.crowbar, 1), new Object[] { "II", " I", " I", 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_power, 5), new Object[] { "dustRedstone", "dustGlowstone", "dustDiamond", "dustNeptunium", "dustMagnetizedTungsten" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ballistite, 3), new Object[] { Items.gunpowder, "dustSalpeter", Items.sugar })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ballistite, 3), new Object[] { Items.gunpowder, "dustSaltpeter", Items.sugar })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 6), new Object[] { "dustNeptunium", "dustIodine", "dustThorium", "dustAstatine", "dustNeodymium", "dustCaesium" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 6), new Object[] { "dustStrontium", "dustCobalt", "dustBromine", "dustTennessine", "dustNiobium", "dustCerium" })); @@ -1633,6 +1639,7 @@ public class CraftingManager { GameRegistry.addSmelting(ModItems.powder_actinium, new ItemStack(ModItems.ingot_actinium), 1.0F); GameRegistry.addSmelting(ModItems.powder_desh, new ItemStack(ModItems.ingot_desh), 1.0F); GameRegistry.addSmelting(ModItems.powder_dineutronium, new ItemStack(ModItems.ingot_dineutronium), 5.0F); + GameRegistry.addSmelting(ModItems.powder_asbestos, new ItemStack(ModItems.ingot_asbestos), 1.0F); GameRegistry.addSmelting(ModItems.powder_coal, new ItemStack(ModItems.coke), 1.0F); GameRegistry.addSmelting(ModItems.briquette_lignite, new ItemStack(ModItems.coke), 1.0F); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 2d683b41f..e86353e3d 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -258,6 +258,7 @@ public class MainRegistry public static int leadSpawn = 6; public static int berylliumSpawn = 6; public static int ligniteSpawn = 2; + public static int asbestosSpawn = 2; public static int gadgetRadius = 150; public static int boyRadius = 120; @@ -1358,42 +1359,19 @@ public class MainRegistry enableCrosshairs = config.get(CATEGORY_GENERAL, "1.22_enableCrosshairs", true).getBoolean(true); final String CATEGORY_OREGEN = "02_ores"; - Property PuraniumSpawn = config.get(CATEGORY_OREGEN, "2.00_uraniumSpawnrate", 6); - PuraniumSpawn.comment = "Ammount of uranium ore veins per chunk"; - uraniumSpawn = PuraniumSpawn.getInt(); - Property PtitaniumSpawn = config.get(CATEGORY_OREGEN, "2.01_titaniumSpawnrate", 8); - PtitaniumSpawn.comment = "Ammount of titanium ore veins per chunk"; - titaniumSpawn = PtitaniumSpawn.getInt(); - Property PsulfurSpawn = config.get(CATEGORY_OREGEN, "2.02_sulfurSpawnrate", 5); - PsulfurSpawn.comment = "Ammount of sulfur ore veins per chunk"; - sulfurSpawn = PsulfurSpawn.getInt(); - Property PaluminiumSpawn = config.get(CATEGORY_OREGEN, "2.03_aluminiumSpawnrate", 7); - PaluminiumSpawn.comment = "Ammount of aluminium ore veins per chunk"; - aluminiumSpawn = PaluminiumSpawn.getInt(); - Property PcopperSpawn = config.get(CATEGORY_OREGEN, "2.04_copperSpawnrate", 12); - PcopperSpawn.comment = "Ammount of copper ore veins per chunk"; - copperSpawn = PcopperSpawn.getInt(); - Property PFluoriteSpawn = config.get(CATEGORY_OREGEN, "2.05_fluoriteSpawnrate", 6); - PFluoriteSpawn.comment = "Ammount of fluorite ore veins per chunk"; - fluoriteSpawn = PFluoriteSpawn.getInt(); - Property PNiterSpawn = config.get(CATEGORY_OREGEN, "2.06_niterSpawnrate", 6); - PNiterSpawn.comment = "Ammount of niter ore veins per chunk"; - niterSpawn = PNiterSpawn.getInt(); - Property PtungstenSpawn = config.get(CATEGORY_OREGEN, "2.07_tungstenSpawnrate", 10); - PtungstenSpawn.comment = "Ammount of tungsten ore veins per chunk"; - tungstenSpawn = PtungstenSpawn.getInt(); - Property PleadSpawn = config.get(CATEGORY_OREGEN, "2.08_leadSpawnrate", 6); - PleadSpawn.comment = "Ammount of lead ore veins per chunk"; - leadSpawn = PleadSpawn.getInt(); - Property PberylliumSpawn = config.get(CATEGORY_OREGEN, "2.09_berylliumSpawnrate", 6); - PberylliumSpawn.comment = "Ammount of beryllium ore veins per chunk"; - berylliumSpawn = PberylliumSpawn.getInt(); - Property PthoriumSpawn = config.get(CATEGORY_OREGEN, "2.10_thoriumSpawnrate", 7); - PthoriumSpawn.comment = "Ammount of thorium ore veins per chunk"; - thoriumSpawn = PthoriumSpawn.getInt(); - Property ligniteSpawnP = config.get(CATEGORY_OREGEN, "2.11_ligniteSpawnrate", 2); - ligniteSpawnP.comment = "Ammount of lignite ore veins per chunk"; - ligniteSpawn = ligniteSpawnP.getInt(); + uraniumSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.00_uraniumSpawnrate", "Ammount of uranium ore veins per chunk", 7); + titaniumSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.01_titaniumSpawnrate", "Ammount of titanium ore veins per chunk", 8); + sulfurSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.02_sulfurSpawnrate", "Ammount of sulfur ore veins per chunk", 5); + aluminiumSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.03_aluminiumSpawnrate", "Ammount of aluminium ore veins per chunk", 7); + copperSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.04_copperSpawnrate", "Ammount of copper ore veins per chunk", 12); + fluoriteSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.05_fluoriteSpawnrate", "Ammount of fluorite ore veins per chunk", 6); + niterSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.06_niterSpawnrate", "Ammount of niter ore veins per chunk", 6); + tungstenSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.07_tungstenSpawnrate", "Ammount of tungsten ore veins per chunk", 10); + leadSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.08_leadSpawnrate", "Ammount of lead ore veins per chunk", 6); + berylliumSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.09_berylliumSpawnrate", "Ammount of beryllium ore veins per chunk", 6); + thoriumSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.10_thoriumSpawnrate", "Ammount of thorium ore veins per chunk", 7); + ligniteSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.11_ligniteSpawnrate", "Ammount of lignite ore veins per chunk", 2); + asbestosSpawn = createConfigInt(config, CATEGORY_OREGEN, "2.12_asbestosSpawnRate", "Ammount of asbestos ore veins per chunk", 2); final String CATEGORY_NUKES = "03_nukes"; Property propGadget = config.get(CATEGORY_NUKES, "3.00_gadgetRadius", 150); diff --git a/src/main/java/com/hbm/particle/ParticleDefinition.java b/src/main/java/com/hbm/particle/ParticleDefinition.java new file mode 100644 index 000000000..b6b4e603f --- /dev/null +++ b/src/main/java/com/hbm/particle/ParticleDefinition.java @@ -0,0 +1,51 @@ +package com.hbm.particle; + +public class ParticleDefinition { + + //the amount of particle sprites along the height and width of the sheet + public int sheetWidth = 1; + public int sheetHeight = 1; + //the tint of the particle which will be interpolated + public int startTint = 0xffffff; + public int endTint = 0xffffff; + //the scale of the particle which will be interpolated + public double startScale = 1.0D; + public double endScale = 1.0D; + //uniformly distributed random lifetime + public int minAge = 100; + public int maxAge = 120; + + //whether GL11 blend should be turned on + public boolean doesBlend = false; + + public ParticleDefinition setSize(int width, int height) { + + this.sheetWidth = width; + this.sheetHeight = height; + return this; + } + + public ParticleDefinition setTint(int tint) { + + return this.setTint(tint, tint); + } + + public ParticleDefinition setTint(int start, int end) { + + this.startTint = start; + this.endTint = end; + return this; + } + + public ParticleDefinition setScale(double tint) { + + return this.setScale(tint, tint); + } + + public ParticleDefinition setScale(double start, double end) { + + this.startScale = start; + this.endScale = end; + return this; + } +} diff --git a/src/main/java/com/hbm/particle/ParticleNT.java b/src/main/java/com/hbm/particle/ParticleNT.java new file mode 100644 index 000000000..6e380eeea --- /dev/null +++ b/src/main/java/com/hbm/particle/ParticleNT.java @@ -0,0 +1,23 @@ +package com.hbm.particle; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.world.World; + +@SideOnly(Side.CLIENT) +public class ParticleNT extends EntityFX { + + private ParticleDefinition definition; + + public ParticleNT(World world, double x, double y, double z, ParticleDefinition definition) { + super(world, x, y, z); + this.definition = definition; + } + + public ParticleNT(World world, double x, double y, double z, double moX, double moY, double moZ, ParticleDefinition definition) { + this(world, x, y, z, definition); + this.setVelocity(moX, moY, moZ); + } + +} diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderMeteor.java b/src/main/java/com/hbm/render/entity/projectile/RenderMeteor.java index c4fd83fae..ea2865fc5 100644 --- a/src/main/java/com/hbm/render/entity/projectile/RenderMeteor.java +++ b/src/main/java/com/hbm/render/entity/projectile/RenderMeteor.java @@ -23,8 +23,10 @@ public class RenderMeteor extends Render { GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); GL11.glScalef(5.0F, 5.0F, 5.0F); renderBlock(getEntityTexture(rocket), 0, 0, 0); + GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); diff --git a/src/main/java/com/hbm/render/item/ItemRenderWeaponSauer.java b/src/main/java/com/hbm/render/item/ItemRenderWeaponSauer.java index a79ebe8af..6870f7710 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderWeaponSauer.java +++ b/src/main/java/com/hbm/render/item/ItemRenderWeaponSauer.java @@ -75,9 +75,9 @@ public class ItemRenderWeaponSauer implements IItemRenderer { GL11.glTranslated(0, 5, 0); GL11.glRotated(tilt[0], 0, 0, 1); - GL11.glTranslated(0, 0, cock[0]); + GL11.glTranslated(0, 0, cock[0] * 2); ResourceManager.sauergun.renderPart("Lever"); - GL11.glTranslated(0, 0, -cock[0]); + GL11.glTranslated(0, 0, -cock[0] * 2); GL11.glTranslated(eject[2] * 10, -eject[2], 0); GL11.glRotated(eject[2] * 90, -1, 0, 0); @@ -105,8 +105,9 @@ public class ItemRenderWeaponSauer implements IItemRenderer { case ENTITY: - double s1 = 0.5D; - GL11.glTranslatef(0.0F, 0.0F, 1.0F); + double s1 = 0.25D; + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, 0.5F); GL11.glScaled(s1, s1, s1); ResourceManager.sauergun.renderPart("Lever"); break; diff --git a/src/main/java/com/hbm/saveddata/RadiationSavedData.java b/src/main/java/com/hbm/saveddata/RadiationSavedData.java index fe3a36297..abd024f40 100644 --- a/src/main/java/com/hbm/saveddata/RadiationSavedData.java +++ b/src/main/java/com/hbm/saveddata/RadiationSavedData.java @@ -16,9 +16,9 @@ import net.minecraft.world.chunk.Chunk; public class RadiationSavedData extends WorldSavedData { - //public List contamination = new ArrayList(); public HashMap contamination = new HashMap(); + //in order to reduce read operations private static RadiationSavedData openInstance; public World worldObj; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java index d83d09dd9..41130f205 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java @@ -1,11 +1,11 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineNukeFurnace; +import com.hbm.inventory.BreederRecipes; import com.hbm.items.ModItems; import com.hbm.items.special.ItemCustomLore; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -106,39 +106,17 @@ public class TileEntityNukeFurnace extends TileEntity implements ISidedInventory return getItemPower(itemStack) > 0; } - private static int getItemPower(ItemStack itemStack) { - if(itemStack == null) - { + private static int getItemPower(ItemStack stack) { + if(stack == null) { return 0; - }else{ - Item item = itemStack.getItem(); + } else { - if(item == ModItems.rod_u238) return 1 * 5; - if(item == ModItems.rod_dual_u238) return 2 * 5; - if(item == ModItems.rod_quad_u238) return 4 * 5; - if(item == ModItems.rod_u235) return 3 * 5; - if(item == ModItems.rod_dual_u235) return 6 * 5; - if(item == ModItems.rod_quad_u235) return 12 * 5; - if(item == ModItems.rod_pu238) return 5 * 5; - if(item == ModItems.rod_dual_pu238) return 10 * 5; - if(item == ModItems.rod_quad_pu238) return 20 * 5; - if(item == ModItems.rod_pu239) return 3 * 5; - if(item == ModItems.rod_dual_pu239) return 6 * 5; - if(item == ModItems.rod_quad_pu239) return 12 * 5; - if(item == ModItems.rod_pu240) return 1 * 5; - if(item == ModItems.rod_dual_pu240) return 2 * 5; - if(item == ModItems.rod_quad_pu240) return 4 * 5; - if(item == ModItems.rod_neptunium) return 3 * 5; - if(item == ModItems.rod_dual_neptunium) return 6 * 5; - if(item == ModItems.rod_quad_neptunium) return 12 * 5; - if(item == ModItems.rod_schrabidium) return 15 * 5; - if(item == ModItems.rod_dual_schrabidium) return 30 * 5; - if(item == ModItems.rod_quad_schrabidium) return 60 * 5; - if(item == ModItems.rod_solinium) return 20 * 5; - if(item == ModItems.rod_dual_solinium) return 40 * 5; - if(item == ModItems.rod_quad_solinium) return 80 * 5; - - return 0; + int[] power = BreederRecipes.getFuelValue(stack); + + if(power == null) + return 0; + + return power[0] * power[1] * 5; } }