Added Tier 3 missile textures, new dungeons, rebelanced chest loot

com/hbm/lib/HbmChestContents.java

@@ -41,25 +41,22 @@ public class HbmChestContents {
 	private static WeightedRandomChestContent[] expensive = new WeightedRandomChestContent[]
 			{new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 1, 1, 1),
 				new WeightedRandomChestContent(ModItems.neutron_reflector, 0, 2, 3, 3),
-				new WeightedRandomChestContent(ModItems.ingot_tungsten, 0, 5, 15, 5),
-				new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 3, 4, 5),
 				new WeightedRandomChestContent(ModItems.circuit_gold, 0, 1, 2, 3),
 				new WeightedRandomChestContent(ModItems.circuit_schrabidium, 0, 1, 1, 1),
 				new WeightedRandomChestContent(ModItems.nuke_starter_kit, 0, 1, 1, 2),
 				new WeightedRandomChestContent(ModItems.nuke_commercially_kit, 0, 1, 1, 1),
-				new WeightedRandomChestContent(ModItems.gun_revolver, 0, 1, 1, 4),
-				new WeightedRandomChestContent(ModItems.gun_revolver_ammo, 0, 1, 32, 5),
-				new WeightedRandomChestContent(ModItems.gun_revolver_gold, 0, 1, 1, 1),
-				new WeightedRandomChestContent(ModItems.gun_revolver_gold_ammo, 0, 1, 6, 2),
-				new WeightedRandomChestContent(ModItems.gun_rpg, 0, 1, 1, 2),
-				new WeightedRandomChestContent(ModItems.gun_rpg_ammo, 0, 1, 32, 3),
+				new WeightedRandomChestContent(ModItems.nuke_electric_kit, 0, 1, 1, 1),
+				new WeightedRandomChestContent(ModItems.gun_revolver_gold, 0, 1, 1, 4),
+				new WeightedRandomChestContent(ModItems.gun_revolver_gold_ammo, 0, 1, 6, 5),
+				new WeightedRandomChestContent(ModItems.gun_rpg, 0, 1, 1, 4),
+				new WeightedRandomChestContent(ModItems.gun_rpg_ammo, 0, 1, 32, 5),
 				new WeightedRandomChestContent(ModItems.gun_fatman, 0, 1, 1, 1),
 				new WeightedRandomChestContent(ModItems.gun_fatman_ammo, 0, 1, 8, 2),
 				new WeightedRandomChestContent(ModItems.battery_advanced, 200, 1, 1, 3),
 				new WeightedRandomChestContent(ModItems.battery_schrabidium, 1000, 1, 1, 1),
 				new WeightedRandomChestContent(ModItems.syringe_awesome, 0, 1, 1, 1),
-				new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 2),
-				new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.pole_satellite_receiver), 0, 1, 3, 3)};
+				new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 4),
+				new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.float_bomb), 0, 1, 1, 1)};
 
 	private static WeightedRandomChestContent[] nukeTrash = new WeightedRandomChestContent[]
 			{new WeightedRandomChestContent(ModItems.nugget_u238, 0, 3, 12, 5),
@@ -98,11 +95,11 @@ public class HbmChestContents {
 				new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.yellow_barrel), 0, 1, 3, 3)};
 
 	private static WeightedRandomChestContent[] vertibird = new WeightedRandomChestContent[]
-			{new WeightedRandomChestContent(ModItems.t45_helmet, 0, 1, 1, 5),
-				new WeightedRandomChestContent(ModItems.t45_plate, 0, 1, 1, 5),
-				new WeightedRandomChestContent(ModItems.t45_legs, 0, 1, 1, 5),
-				new WeightedRandomChestContent(ModItems.t45_boots, 0, 1, 1, 5),
-				new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 5),
+			{new WeightedRandomChestContent(ModItems.t45_helmet, 0, 1, 1, 15),
+				new WeightedRandomChestContent(ModItems.t45_plate, 0, 1, 1, 15),
+				new WeightedRandomChestContent(ModItems.t45_legs, 0, 1, 1, 15),
+				new WeightedRandomChestContent(ModItems.t45_boots, 0, 1, 1, 15),
+				new WeightedRandomChestContent(ModItems.fusion_core, 0, 1, 1, 10),
 				new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 1, 3, 3),
 				new WeightedRandomChestContent(ModItems.circuit_gold, 0, 1, 3, 3),
 				new WeightedRandomChestContent(ModItems.gun_revolver, 0, 1, 1, 4),
@@ -111,7 +108,9 @@ public class HbmChestContents {
 				new WeightedRandomChestContent(ModItems.gun_rpg_ammo, 0, 1, 6, 3),
 				new WeightedRandomChestContent(ModItems.rod_uranium_fuel, 0, 1, 1, 2),
 				new WeightedRandomChestContent(ModItems.rod_dual_uranium_fuel, 0, 1, 1, 2),
-				new WeightedRandomChestContent(ModItems.rod_quad_uranium_fuel, 0, 1, 1, 2)};
+				new WeightedRandomChestContent(ModItems.rod_quad_uranium_fuel, 0, 1, 1, 2),
+				new WeightedRandomChestContent(ModItems.gun_fatman_ammo, 0, 1, 2, 2),
+				new WeightedRandomChestContent(ModItems.gun_fatman, 0, 1, 1, 1)};
 	
 	/**
 	 * @param i

com/hbm/lib/HbmWorldGen.java

@@ -4,9 +4,13 @@ import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.world.Antenna;
+import com.hbm.world.Bunker;
 import com.hbm.world.CrashedVertibird;
 import com.hbm.world.DesertAtom001;
+import com.hbm.world.LibraryDungeon;
 import com.hbm.world.Radio01;
+import com.hbm.world.Relay;
+import com.hbm.world.Satellite;
 import com.hbm.world.Vertibird;
 
 import net.minecraft.world.World;
@@ -192,6 +196,52 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 		}
+		
+		if(rand.nextInt(64) == 0)
+		{
+			int x = i + rand.nextInt(16);
+			int y = rand.nextInt(256);
+			int z = j + rand.nextInt(16);
+			new LibraryDungeon().generate(world, rand, x, y, z);
+		}
+		
+		if(biome == BiomeGenBase.plains || biome == BiomeGenBase.desert)
+		{
+			if(rand.nextInt(500) == 0)
+			{
+			for(int a = 0; a < 1; a++)
+			{
+				int x = i + rand.nextInt(16);
+				int z = j + rand.nextInt(16);
+				int y = world.getHeightValue(x, z);
+				
+				new Relay().generate(world, rand, x, y, z);
+			}
+			}
+		}
+		if(biome == BiomeGenBase.plains || biome == BiomeGenBase.desert)
+		{
+			if(rand.nextInt(500) == 0)
+			{
+			for(int a = 0; a < 1; a++)
+			{
+				int x = i + rand.nextInt(16);
+				int z = j + rand.nextInt(16);
+				int y = world.getHeightValue(x, z);
+				
+				new Satellite().generate(world, rand, x, y, z);
+			}
+			}
+		}
+		
+		if(rand.nextInt(1000) == 0)
+		{
+			int x = i + rand.nextInt(16);
+			int z = j + rand.nextInt(16);
+			int y = world.getHeightValue(x, z);
+
+			new Bunker().generate(world, rand, x, y, z);
+		}
 
 	}
 

com/hbm/main/MainRegistry.java

@@ -38,6 +38,7 @@ import com.hbm.blocks.TileEntityNukeFleija;
 import com.hbm.blocks.TileEntityNukeFurnace;
 import com.hbm.blocks.TileEntityNukeGadget;
 import com.hbm.blocks.TileEntityNukeMan;
+import com.hbm.blocks.TileEntityNukeMike;
 import com.hbm.blocks.TileEntityNukePrototype;
 import com.hbm.blocks.TileEntityNukeTsar;
 import com.hbm.blocks.TileEntityObjTester;
@@ -170,6 +171,7 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntityMachinePuF6Tank.class, "tileentity_puf6_tank");
 		GameRegistry.registerTileEntity(TileEntityMachineReactor.class, "tileentity_reactor");
 		GameRegistry.registerTileEntity(TileEntityBombMulti.class, "tileentity_bombmulti");
+		GameRegistry.registerTileEntity(TileEntityNukeMike.class, "tileentity_nukemike");
 		GameRegistry.registerTileEntity(TileEntityNukeTsar.class, "tileentity_nuketsar");
 		GameRegistry.registerTileEntity(TileEntityNukeFurnace.class, "tileentity_nukefurnace");
 		GameRegistry.registerTileEntity(TileEntityRtgFurnace.class, "tileentity_rtgfurnace");
@@ -297,7 +299,7 @@ public class MainRegistry
 
 		Configuration config = new Configuration(event.getSuggestedConfigurationFile());
 		config.load();
-        enableDebugMode = config.get(Configuration.CATEGORY_GENERAL, "_enableDebugMode", true).getBoolean(true);
+        enableDebugMode = config.get(Configuration.CATEGORY_GENERAL, "_enableDebugMode", false).getBoolean(true);
         enableMycelium = config.get(Configuration.CATEGORY_GENERAL, "_enableMyceliumSpread", true).getBoolean(true);
         
         Property propGadget = config.get(Configuration.CATEGORY_GENERAL, "gadgetRadius", 150);

com/hbm/render/RenderLaunchPadTier1.java

@@ -33,10 +33,13 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer {
     private ResourceLocation missileClusterTexture;
     private ResourceLocation missileBusterTexture;
     private ResourceLocation missileStrongTexture;
-    private ResourceLocation missileStrongIncenidaryTexture;
+    private ResourceLocation missileStrongIncendiaryTexture;
     private ResourceLocation missileStrongClusterTexture;
     private ResourceLocation missileStrongBusterTexture;
     private ResourceLocation missileHugeTexture;
+    private ResourceLocation missileHugeIncendiaryTexture;
+    private ResourceLocation missileHugeClusterTexture;
+    private ResourceLocation missileHugeBusterTexture;
     private ResourceLocation missileNuclearTexture;
     private ResourceLocation missileMirvTexture;
     private ResourceLocation missileThermoTexture;
@@ -56,10 +59,13 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer {
 		missileClusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileCluster.png");
 		missileBusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileBuster.png");
 		missileStrongTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGeneric.png");
-		missileStrongIncenidaryTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericIncendiary.png");
+		missileStrongIncendiaryTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericIncendiary.png");
 		missileStrongClusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericCluster.png");
 		missileStrongBusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileGenericBuster.png");
 		missileHugeTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHuge.png");
+		missileHugeIncendiaryTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHugeIncendiary.png");
+		missileHugeClusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHugeCluster.png");
+		missileHugeBusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHugeBuster.png");
 		missileNuclearTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileNuke.png");
 		missileMirvTexture = new ResourceLocation(RefStrings.MODID, "textures/models/missileMirv.png");
 		missileThermoTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileThermal.png");
@@ -129,7 +135,7 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer {
 			if(((TileEntityLaunchPad)tileEntity).state == 7)
 			{
 				GL11.glScalef(1.5F, 1.5F, 1.5F);
-				bindTexture(missileStrongIncenidaryTexture);
+				bindTexture(missileStrongIncendiaryTexture);
 				missileStrong.renderAll();
 			}
 			if(((TileEntityLaunchPad)tileEntity).state == 8)
@@ -153,19 +159,19 @@ public class RenderLaunchPadTier1 extends TileEntitySpecialRenderer {
 			if(((TileEntityLaunchPad)tileEntity).state == 11)
 			{
 				GL11.glScalef(2.0F, 2.0F, 2.0F);
-				bindTexture(missileHugeTexture);
+				bindTexture(missileHugeIncendiaryTexture);
 				missileHuge.renderAll();
 			}
 			if(((TileEntityLaunchPad)tileEntity).state == 12)
 			{
 				GL11.glScalef(2.0F, 2.0F, 2.0F);
-				bindTexture(missileHugeTexture);
+				bindTexture(missileHugeClusterTexture);
 				missileHuge.renderAll();
 			}
 			if(((TileEntityLaunchPad)tileEntity).state == 13)
 			{
 				GL11.glScalef(2.0F, 2.0F, 2.0F);
-				bindTexture(missileHugeTexture);
+				bindTexture(missileHugeBusterTexture);
 				missileHuge.renderAll();
 			}
 			if(((TileEntityLaunchPad)tileEntity).state == 14)

com/hbm/render/RenderMissileHuge.java

@@ -2,6 +2,14 @@ package com.hbm.render;
 
 import org.lwjgl.opengl.GL11;
 
+import com.hbm.entity.EntityMissileBunkerBuster;
+import com.hbm.entity.EntityMissileBurst;
+import com.hbm.entity.EntityMissileCluster;
+import com.hbm.entity.EntityMissileDrill;
+import com.hbm.entity.EntityMissileGeneric;
+import com.hbm.entity.EntityMissileIncendiary;
+import com.hbm.entity.EntityMissileInferno;
+import com.hbm.entity.EntityMissileRain;
 import com.hbm.lib.RefStrings;
 
 import net.minecraft.client.renderer.entity.Render;
@@ -15,10 +23,16 @@ public class RenderMissileHuge extends Render {
 	private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/MissileHuge.obj");
 	private IModelCustom boyModel;
     private ResourceLocation boyTexture;
+    private ResourceLocation missileIncendiaryTexture;
+    private ResourceLocation missileClusterTexture;
+    private ResourceLocation missileBusterTexture;
 	
 	public RenderMissileHuge() {
 		boyModel = AdvancedModelLoader.loadModel(objTesterModelRL);
 		boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHuge.png");
+		missileIncendiaryTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHugeIncendiary.png");
+		missileClusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHugeCluster.png");
+		missileBusterTexture = new ResourceLocation(RefStrings.MODID, "textures/models/MissileHugeBuster.png");
 	}
 
 	@Override
@@ -29,8 +43,15 @@ public class RenderMissileHuge extends Render {
         GL11.glScalef(2F, 2F, 2F);
         GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F);
         GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F);
-        
-        bindTexture(boyTexture);
+
+        if(p_76986_1_ instanceof EntityMissileBurst)
+        	bindTexture(boyTexture);
+        if(p_76986_1_ instanceof EntityMissileInferno)
+        	bindTexture(missileIncendiaryTexture);
+        if(p_76986_1_ instanceof EntityMissileRain)
+        	bindTexture(missileClusterTexture);
+        if(p_76986_1_ instanceof EntityMissileDrill)
+        	bindTexture(missileBusterTexture);
         boyModel.renderAll();
 		GL11.glPopMatrix();
 	}

com/hbm/world/DesertAtom003.java

@@ -5,12 +5,15 @@ package com.hbm.world;
 import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.blocks.TileEntityMachinePuF6Tank;
+import com.hbm.blocks.TileEntityMachineUF6Tank;
 import com.hbm.lib.HbmChestContents;
 import com.hbm.main.MainRegistry;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemDoor;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
@@ -366,9 +369,33 @@ public class DesertAtom003
 		world.setBlock(x + 26, y + 4, z + 7, Block19, 3, 3);
 		world.setBlock(x + 27, y + 4, z + 7, Block19, 3, 3);
 		world.setBlock(x + 28, y + 4, z + 7, Block20, 3, 3);
+		TileEntity tank0 = world.getTileEntity(x + 28, y + 4, z + 7);
+		if(tank0 instanceof TileEntityMachineUF6Tank)
+		{
+			TileEntityMachineUF6Tank tankuf0 = (TileEntityMachineUF6Tank)tank0;
+			tankuf0.fillState = rand.nextInt(tankuf0.maxFill);
+		}
 		world.setBlock(x + 29, y + 4, z + 7, Block20, 3, 3);
+		TileEntity tank1 = world.getTileEntity(x + 29, y + 4, z + 7);
+		if(tank0 instanceof TileEntityMachineUF6Tank)
+		{
+			TileEntityMachineUF6Tank tankuf1 = (TileEntityMachineUF6Tank)tank1;
+			tankuf1.fillState = rand.nextInt(tankuf1.maxFill);
+		}
 		world.setBlock(x + 30, y + 4, z + 7, Block21, 3, 3);
+		TileEntity tank2 = world.getTileEntity(x + 30, y + 4, z + 7);
+		if(tank0 instanceof TileEntityMachinePuF6Tank)
+		{
+			TileEntityMachinePuF6Tank tankuf2 = (TileEntityMachinePuF6Tank)tank2;
+			tankuf2.fillState = rand.nextInt(tankuf2.maxFill);
+		}
 		world.setBlock(x + 31, y + 4, z + 7, Block21, 3, 3);
+		TileEntity tank3 = world.getTileEntity(x + 31, y + 4, z + 7);
+		if(tank3 instanceof TileEntityMachinePuF6Tank)
+		{
+			TileEntityMachinePuF6Tank tankuf3 = (TileEntityMachinePuF6Tank)tank3;
+			tankuf3.fillState = rand.nextInt(tankuf3.maxFill);
+		}
 		world.setBlock(x + 32, y + 4, z + 7, Block2, 0, 3);
 		world.setBlock(x + 33, y + 4, z + 7, Block22, 0, 3);
 		world.setBlock(x + 34, y + 4, z + 7, Block23, 0, 3);