updated titanium and copper textures, small laser changes

com/hbm/blocks/BlockDummyable.java

@@ -172,8 +172,10 @@ public abstract class BlockDummyable extends BlockContainer {
 			return;
 		}
 		
-		world.setBlock(x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, this, dir.ordinal() + offset, 3);
-		fillSpace(world, x, y, z, dir, o);
+		if(!world.isRemote) {
+			world.setBlock(x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, this, dir.ordinal() + offset, 3);
+			fillSpace(world, x, y, z, dir, o);
+		}
 		y -= getHeightOffset();
 		world.scheduleBlockUpdate(x, y, z, this, 1);
 		world.scheduleBlockUpdate(x, y, z, this, 2);

com/hbm/blocks/ModBlocks.java

@@ -598,6 +598,7 @@ public class ModBlocks {
 	public static final int guiID_machine_drill = 45;
 
 	public static Block machine_mining_laser;
+	public static Block barricade;
 	public static final int guiID_mining_laser = 95;
 
 	public static Block machine_assembler;
@@ -1266,6 +1267,7 @@ public class ModBlocks {
 		machine_drill = new MachineMiningDrill(Material.iron).setBlockName("machine_drill").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_drill");
 		drill_pipe = new BlockNoDrop(Material.iron).setBlockName("drill_pipe").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":drill_pipe");
 		machine_mining_laser = new MachineMiningLaser(Material.iron).setBlockName("machine_mining_laser").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_mining_laser");
+		barricade = new BlockNoDrop(Material.sand).setBlockName("barricade").setHardness(1.0F).setResistance(2.5F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":barricade");
 		machine_assembler = new MachineAssembler(Material.iron).setBlockName("machine_assembler").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_assembler");
 		machine_chemplant = new MachineChemplant(Material.iron).setBlockName("machine_chemplant").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_chemplant");
 		machine_fluidtank = new MachineFluidTank(Material.iron).setBlockName("machine_fluidtank").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_fluidtank");
@@ -1792,6 +1794,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(machine_refinery, machine_refinery.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_drill, machine_drill.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_mining_laser, machine_mining_laser.getUnlocalizedName());
+		GameRegistry.registerBlock(barricade, barricade.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_turbofan, machine_turbofan.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_schrabidium_transmutator, machine_schrabidium_transmutator.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_combine_factory, machine_combine_factory.getUnlocalizedName());

com/hbm/lib/HbmWorldGen.java

@@ -237,7 +237,7 @@ public class HbmWorldGen implements IWorldGenerator {
 			BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, j);
 
 			if (biome == BiomeGenBase.plains || biome == BiomeGenBase.desert) {
-				if (rand.nextInt(MainRegistry.radioStructure) == 0) {
+				if (MainRegistry.radioStructure > 0 && rand.nextInt(MainRegistry.radioStructure) == 0) {
 					for (int a = 0; a < 1; a++) {
 						int x = i + rand.nextInt(16);
 						int z = j + rand.nextInt(16);
@@ -250,7 +250,7 @@ public class HbmWorldGen implements IWorldGenerator {
 
 			if (biome == BiomeGenBase.plains || biome == BiomeGenBase.forest || biome == BiomeGenBase.desert
 					|| biome == BiomeGenBase.swampland || biome == BiomeGenBase.extremeHills) {
-				if (rand.nextInt(MainRegistry.antennaStructure) == 0) {
+				if (MainRegistry.antennaStructure > 0 && rand.nextInt(MainRegistry.antennaStructure) == 0) {
 					for (int a = 0; a < 1; a++) {
 						int x = i + rand.nextInt(16);
 						int z = j + rand.nextInt(16);
@@ -263,7 +263,7 @@ public class HbmWorldGen implements IWorldGenerator {
 
 			if (biome == BiomeGenBase.desert || biome == BiomeGenBase.beach || biome == BiomeGenBase.mesa
 					|| biome == BiomeGenBase.mesaPlateau) {
-				if (rand.nextInt(MainRegistry.atomStructure) == 0) {
+				if (MainRegistry.atomStructure > 0 && rand.nextInt(MainRegistry.atomStructure) == 0) {
 					for (int a = 0; a < 1; a++) {
 						int x = i + rand.nextInt(16);
 						int z = j + rand.nextInt(16);
@@ -275,7 +275,7 @@ public class HbmWorldGen implements IWorldGenerator {
 			}
 
 			if (biome == BiomeGenBase.desert) {
-				if (rand.nextInt(MainRegistry.vertibirdStructure) == 0) {
+				if (MainRegistry.vertibirdStructure > 0 && rand.nextInt(MainRegistry.vertibirdStructure) == 0) {
 					for (int a = 0; a < 1; a++) {
 						int x = i + rand.nextInt(16);
 						int z = j + rand.nextInt(16);
@@ -291,7 +291,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 
-			if (rand.nextInt(MainRegistry.dungeonStructure) == 0) {
+			if (MainRegistry.dungeonStructure > 0 && rand.nextInt(MainRegistry.dungeonStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int y = rand.nextInt(256);
 				int z = j + rand.nextInt(16);
@@ -299,7 +299,7 @@ public class HbmWorldGen implements IWorldGenerator {
 			}
 
 			if (biome == BiomeGenBase.plains || biome == BiomeGenBase.desert) {
-				if (rand.nextInt(MainRegistry.relayStructure) == 0) {
+				if (MainRegistry.relayStructure > 0 && rand.nextInt(MainRegistry.relayStructure) == 0) {
 					for (int a = 0; a < 1; a++) {
 						int x = i + rand.nextInt(16);
 						int z = j + rand.nextInt(16);
@@ -310,7 +310,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 			if (biome == BiomeGenBase.plains || biome == BiomeGenBase.desert) {
-				if (rand.nextInt(MainRegistry.satelliteStructure) == 0) {
+				if (MainRegistry.satelliteStructure > 0 && rand.nextInt(MainRegistry.satelliteStructure) == 0) {
 					for (int a = 0; a < 1; a++) {
 						int x = i + rand.nextInt(16);
 						int z = j + rand.nextInt(16);
@@ -332,7 +332,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 
-			if (rand.nextInt(MainRegistry.bunkerStructure) == 0) {
+			if (MainRegistry.bunkerStructure > 0 && rand.nextInt(MainRegistry.bunkerStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -340,7 +340,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				new Bunker().generate(world, rand, x, y, z);
 			}
 
-			if (rand.nextInt(MainRegistry.siloStructure) == 0) {
+			if (MainRegistry.siloStructure > 0 && rand.nextInt(MainRegistry.siloStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -348,7 +348,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				new Silo().generate(world, rand, x, y, z);
 			}
 
-			if (rand.nextInt(MainRegistry.factoryStructure) == 0) {
+			if (MainRegistry.factoryStructure > 0 && rand.nextInt(MainRegistry.factoryStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -356,7 +356,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				new Factory().generate(world, rand, x, y, z);
 			}
 
-			if (rand.nextInt(MainRegistry.dudStructure) == 0) {
+			if (MainRegistry.dudStructure > 0 && rand.nextInt(MainRegistry.dudStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -364,7 +364,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				new Dud().generate(world, rand, x, y, z);
 			}
 
-			if (rand.nextInt(MainRegistry.spaceshipStructure) == 0) {
+			if (MainRegistry.spaceshipStructure > 0 && rand.nextInt(MainRegistry.spaceshipStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -372,7 +372,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				new Spaceship().generate(world, rand, x, y, z);
 			}
 			
-			if (biome == BiomeGenBase.desert && rand.nextInt(MainRegistry.barrelStructure) == 0) {
+			if (MainRegistry.barrelStructure > 0 && biome == BiomeGenBase.desert && rand.nextInt(MainRegistry.barrelStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -380,7 +380,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				new Barrel().generate(world, rand, x, y, z);
 			}
 
-			if (rand.nextInt(MainRegistry.broadcaster) == 0) {
+			if (MainRegistry.broadcaster > 0 && rand.nextInt(MainRegistry.broadcaster) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -393,7 +393,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 
-			if (MainRegistry.enableMines && rand.nextInt(MainRegistry.minefreq) == 0) {
+			if (MainRegistry.minefreq > 0 && MainRegistry.enableMines && rand.nextInt(MainRegistry.minefreq) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -406,7 +406,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 			
-			if (MainRegistry.enableRad && rand.nextInt(MainRegistry.radfreq) == 0 && biome == BiomeGenBase.desert) {
+			if (MainRegistry.radfreq > 0 && MainRegistry.enableRad && rand.nextInt(MainRegistry.radfreq) == 0 && biome == BiomeGenBase.desert) {
 				
 				for (int a = 0; a < 1; a++) {
 					int x = i + rand.nextInt(16);
@@ -424,7 +424,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 
-			if (biome == BiomeGenBase.plains && rand.nextInt(MainRegistry.geyserWater) == 0) {
+			if (MainRegistry.geyserWater > 0 && biome == BiomeGenBase.plains && rand.nextInt(MainRegistry.geyserWater) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -433,7 +433,7 @@ public class HbmWorldGen implements IWorldGenerator {
 					new Geyser().generate(world, rand, x, y, z);
 			}
 
-			if (biome == BiomeGenBase.desert && rand.nextInt(MainRegistry.geyserChlorine) == 0) {
+			if (MainRegistry.geyserChlorine > 0 && biome == BiomeGenBase.desert && rand.nextInt(MainRegistry.geyserChlorine) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -442,7 +442,7 @@ public class HbmWorldGen implements IWorldGenerator {
 					new GeyserLarge().generate(world, rand, x, y, z);
 			}
 
-			if (biome == BiomeGenBase.beach && rand.nextInt(MainRegistry.capsuleStructure) == 0) {
+			if (MainRegistry.capsuleStructure > 0 && biome == BiomeGenBase.beach && rand.nextInt(MainRegistry.capsuleStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z) - 4;
@@ -462,7 +462,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				}
 			}
 
-			if (rand.nextInt(MainRegistry.geyserVapor) == 0) {
+			if (MainRegistry.geyserVapor > 0 && rand.nextInt(MainRegistry.geyserVapor) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -488,7 +488,7 @@ public class HbmWorldGen implements IWorldGenerator {
 					MainRegistry.logger.info("[Debug] Successfully spawned pink tree at " + x + " " + z);
 			}
 
-			if (MainRegistry.enableVaults && rand.nextInt(MainRegistry.vaultfreq) == 0) {
+			if (MainRegistry.vaultfreq > 0 && MainRegistry.enableVaults && rand.nextInt(MainRegistry.vaultfreq) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				int y = world.getHeightValue(x, z);
@@ -535,7 +535,7 @@ public class HbmWorldGen implements IWorldGenerator {
 				
 			}
 
-			if (rand.nextInt(MainRegistry.meteorStructure) == 0) {
+			if (MainRegistry.meteorStructure > 0 && rand.nextInt(MainRegistry.meteorStructure) == 0) {
 				int x = i + rand.nextInt(16);
 				int z = j + rand.nextInt(16);
 				

com/hbm/render/tileentity/RenderLaserMiner.java

@@ -27,7 +27,7 @@ public class RenderLaserMiner extends TileEntitySpecialRenderer {
 		double ty = (laser.targetY - laser.lastTargetY) * interpolation + laser.lastTargetY;
 		double tz = (laser.targetZ - laser.lastTargetZ) * interpolation + laser.lastTargetZ;
 		double vx = tx - laser.xCoord;
-		double vy = ty - laser.yCoord + 1.5;
+		double vy = ty - laser.yCoord + 3;
 		double vz = tz - laser.zCoord;
 		
 		Vec3 nVec = Vec3.createVectorHelper(vx, vy, vz);

com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java

@@ -33,7 +33,7 @@ import net.minecraft.util.AxisAlignedBB;
 public class TileEntityMachineMiningLaser extends TileEntityMachineBase implements IConsumer {
 	
 	public long power;
-	public static final long maxPower = 10000000;
+	public static final long maxPower = 100000000;
 	public static final int consumption = 10000;
 
 	public boolean isOn;
@@ -102,7 +102,16 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
 					
 					scan(range);
 					
-					if(beam && canBreak(worldObj.getBlock(targetX, targetY, targetZ), targetX, targetY, targetZ)) {
+					
+					Block block = worldObj.getBlock(targetX, targetY, targetZ);
+					
+					if(block.getMaterial().isLiquid()) {
+						worldObj.setBlockToAir(targetX, targetY, targetZ);
+						buildDam();
+						continue;
+					}
+					
+					if(beam && canBreak(block, targetX, targetY, targetZ)) {
 						
 						breakProgress += getBreakSpeed(speed);
 						clientBreakProgress = Math.min(breakProgress, 1);
@@ -111,6 +120,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
 							worldObj.destroyBlockInWorldPartially(-1, targetX, targetY, targetZ, (int) Math.floor(breakProgress * 10));
 						} else {
 							breakBlock(fortune);
+							buildDam();
 						}
 					}
 				}
@@ -154,6 +164,18 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
 		this.breakProgress = data.getDouble("progress");
 	}
 	
+	private void buildDam() {
+
+		if(worldObj.getBlock(targetX + 1, targetY, targetZ).getMaterial().isLiquid())
+			worldObj.setBlock(targetX + 1, targetY, targetZ, ModBlocks.barricade);
+		if(worldObj.getBlock(targetX - 1, targetY, targetZ).getMaterial().isLiquid())
+			worldObj.setBlock(targetX - 1, targetY, targetZ, ModBlocks.barricade);
+		if(worldObj.getBlock(targetX, targetY, targetZ + 1).getMaterial().isLiquid())
+			worldObj.setBlock(targetX, targetY, targetZ + 1, ModBlocks.barricade);
+		if(worldObj.getBlock(targetX, targetY, targetZ - 1).getMaterial().isLiquid())
+			worldObj.setBlock(targetX, targetY, targetZ - 1, ModBlocks.barricade);
+	}
+	
 	private void tryFillContainer(int x, int y, int z) {
 		
 		Block b = worldObj.getBlock(x, y, z);
@@ -335,7 +357,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
 	}
 	
 	private boolean canBreak(Block block, int x, int y, int z) {
-		return block != Blocks.air && block.getBlockHardness(worldObj, x, y, z) >= 0 && block.getMaterial().isSolid();
+		return block != Blocks.air && block.getBlockHardness(worldObj, x, y, z) >= 0 && !block.getMaterial().isLiquid() && block != Blocks.bedrock;
 	}
 	
 	public int getOverdrive() {
@@ -395,7 +417,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
 			}
 		}
 		
-		return Math.min(range, 26);
+		return Math.min(range, 25);
 	}
 	
 	public int getFortune() {