fixed radiation system, patched up item renderers, a bit of everything

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -382,6 +382,7 @@ public class ModBlocks {
 	public static Block sand_polonium;
 	public static Block sand_quartz;
 	public static Block sand_gold;
+	public static Block sand_gold198;
 	public static Block ash_digamma;
 	public static Block glass_boron;
 	public static Block glass_lead;
@@ -1509,6 +1510,7 @@ public class ModBlocks {
 		sand_polonium = new BlockFalling(Material.sand).setBlockName("sand_polonium").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_polonium");
 		sand_quartz = new BlockFalling(Material.sand).setBlockName("sand_quartz").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_quartz");
 		sand_gold = new BlockGoldSand(Material.sand).setBlockName("sand_gold").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_gold");
+		sand_gold198 = new BlockGoldSand(Material.sand).setBlockName("sand_gold198").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_gold");
 		glass_boron = new BlockNTMGlass(0, RefStrings.MODID + ":glass_boron", Material.glass).setBlockName("glass_boron").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F);
 		glass_lead = new BlockNTMGlass(0, RefStrings.MODID + ":glass_lead", Material.glass).setBlockName("glass_lead").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F);
 		glass_uranium = new BlockNTMGlass(1, RefStrings.MODID + ":glass_uranium", Material.glass).setBlockName("glass_uranium").setLightLevel(5F/15F).setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F);
@@ -1916,7 +1918,7 @@ public class ModBlocks {
 		machine_flare = new MachineGasFlare(Material.iron).setBlockName("machine_flare").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_flare");
 		machine_refinery = new MachineRefinery(Material.iron).setBlockName("machine_refinery").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_refinery");
 		machine_fraction_tower = new MachineFractionTower(Material.iron).setBlockName("machine_fraction_tower").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
-		fraction_spacer = new FractionSpacer(Material.iron).setBlockName("fraction_spacer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fraction_spacer");
+		fraction_spacer = new FractionSpacer(Material.iron).setBlockName("fraction_spacer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		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");
@@ -2577,6 +2579,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(sand_polonium, sand_polonium.getUnlocalizedName());
 		GameRegistry.registerBlock(sand_quartz, sand_quartz.getUnlocalizedName());
 		GameRegistry.registerBlock(sand_gold, sand_gold.getUnlocalizedName());
+		GameRegistry.registerBlock(sand_gold198, sand_gold198.getUnlocalizedName());
 		GameRegistry.registerBlock(glass_boron, glass_boron.getUnlocalizedName());
 		GameRegistry.registerBlock(glass_lead, glass_lead.getUnlocalizedName());
 		GameRegistry.registerBlock(glass_uranium, glass_uranium.getUnlocalizedName());

src/main/java/com/hbm/blocks/bomb/BlockVolcano.java

@@ -172,8 +172,12 @@ public class BlockVolcano extends Block {
 
 		if(meta == META_STATIC_EXTINGUISHING)
 			return 0.00003D; //about once every hour
-		if(isGrowing(meta))
-			return 0.014D; //about 500x an hour
+		
+		if(isGrowing(meta)) {
+			
+			if(meta != META_GROWING_ACTIVE || y < 199)
+				return 0.007D; //about 250x an hour
+		}
 		
 		return 0;
 	}

src/main/java/com/hbm/blocks/fluid/VolcanicBlock.java

@@ -135,4 +135,33 @@ public class VolcanicBlock extends BlockFluidClassic {
 	public int getRenderBlockPass() {
 		return 0;
 	}
+	
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
+
+		double dx;
+		double dy;
+		double dz;
+
+		if(world.getBlock(x, y + 1, z).getMaterial() == Material.air && !world.getBlock(x, y + 1, z).isOpaqueCube()) {
+			if(rand.nextInt(100) == 0) {
+				dx = (double) ((float) x + rand.nextFloat());
+				dy = (double) y + this.maxY;
+				dz = (double) ((float) z + rand.nextFloat());
+				world.spawnParticle("lava", dx, dy, dz, 0.0D, 0.0D, 0.0D);
+				world.playSound(dx, dy, dz, "liquid.lavapop", 0.2F + rand.nextFloat() * 0.2F, 0.9F + rand.nextFloat() * 0.15F, false);
+			}
+
+			if(rand.nextInt(200) == 0) {
+				world.playSound((double) x, (double) y, (double) z, "liquid.lava", 0.2F + rand.nextFloat() * 0.2F, 0.9F + rand.nextFloat() * 0.15F, false);
+			}
+		}
+
+		if(rand.nextInt(10) == 0 && World.doesBlockHaveSolidTopSurface(world, x, y - 1, z) && !world.getBlock(x, y - 2, z).getMaterial().blocksMovement()) {
+			dx = (double) ((float) x + rand.nextFloat());
+			dy = (double) y - 1.05D;
+			dz = (double) ((float) z + rand.nextFloat());
+			world.spawnParticle("dripLava", dx, dy, dz, 0.0D, 0.0D, 0.0D);
+		}
+	}
 }

src/main/java/com/hbm/blocks/generic/BlockGoldSand.java

@@ -1,5 +1,9 @@
 package com.hbm.blocks.generic;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.extprop.HbmLivingProps;
+import com.hbm.extprop.HbmLivingProps.ContaminationEffect;
+
 import net.minecraft.block.BlockFalling;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
@@ -18,6 +22,10 @@ public class BlockGoldSand extends BlockFalling {
 		
 		if(entity instanceof EntityLivingBase) {
 			entity.attackEntityFrom(DamageSource.inFire, 2F);
+			
+			if(this == ModBlocks.sand_gold198) {
+				HbmLivingProps.addCont((EntityLivingBase)entity, new ContaminationEffect(5F, 300, false));
+			}
 		}
 	}
 }

src/main/java/com/hbm/blocks/machine/MachineFractionTower.java

@@ -1,19 +1,18 @@
 package com.hbm.blocks.machine;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.items.ModItems;
-import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineFractionTower;
 
-import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class MachineFractionTower extends BlockDummyable {
 
@@ -26,6 +25,8 @@ public class MachineFractionTower extends BlockDummyable {
 		
 		if(meta >= 12)
 			return new TileEntityMachineFractionTower();
+		if(meta >= extra)
+			return new TileEntityProxyCombo(false, false, true);
 		
 		return null;
 	}
@@ -43,7 +44,7 @@ public class MachineFractionTower extends BlockDummyable {
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
 		
-		if(!player.isSneaking()) {
+		if(!world.isRemote && !player.isSneaking()) {
 				
 			if(player.getHeldItem() == null || player.getHeldItem().getItem() == ModItems.fluid_identifier) {
 				int[] pos = this.findCore(world, x, y, z);
@@ -60,6 +61,8 @@ public class MachineFractionTower extends BlockDummyable {
 				
 				if(player.getHeldItem() == null) {
 					
+					player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "=== FRACTIONING TOWER Y:" + pos[1] + " ==="));
+
 					for(int i = 0; i < frac.tanks.length; i++)
 						player.addChatComponentMessage(new ChatComponentText(frac.tanks[i].getTankType() + ": " + frac.tanks[i].getFill() + "/" + frac.tanks[i].getMaxFill() + "mB"));
 				} else {
@@ -82,4 +85,17 @@ public class MachineFractionTower extends BlockDummyable {
 			return true;
 		}
 	}
+
+	@Override
+	public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) {
+		super.fillSpace(world, x, y, z, dir, o);
+		
+		x = x + dir.offsetX * o;
+		z = z + dir.offsetZ * o;
+
+		this.makeExtra(world, x + 1, y, z);
+		this.makeExtra(world, x - 1, y, z);
+		this.makeExtra(world, x, y, z + 1);
+		this.makeExtra(world, x, y, z - 1);
+	}
 }

src/main/java/com/hbm/blocks/machine/MachineOrbus.java

@@ -11,6 +11,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class MachineOrbus extends BlockDummyable {
 
@@ -54,4 +55,22 @@ public class MachineOrbus extends BlockDummyable {
 			return true;
 		}
 	}
+
+	@Override
+	public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) {
+		super.fillSpace(world, x, y, z, dir, o);
+		
+		x = x + dir.offsetX * o;
+		z = z + dir.offsetZ * o;
+		
+		ForgeDirection d2 = dir.getRotation(ForgeDirection.UP);
+		dir = dir.getOpposite();
+
+		for(int i = 0; i < 5; i += 4) {
+			this.makeExtra(world, x, y + i, z);
+			this.makeExtra(world, x + dir.offsetX, y + i, z + dir.offsetZ);
+			this.makeExtra(world, x + d2.offsetX, y + i, z + d2.offsetZ);
+			this.makeExtra(world, x + dir.offsetX + d2.offsetX, y + i, z + dir.offsetZ + d2.offsetZ);
+		}
+	}
 }

src/main/java/com/hbm/crafting/ConsumableRecipes.java

@@ -176,6 +176,7 @@ public class ConsumableRecipes {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.injector_5htp, 1), new Object[] { ModItems.five_htp, ModItems.circuit_targeting_tier1, ModItems.plate_saturnite });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.injector_knife, 1), new Object[] { ModItems.injector_5htp, Items.iron_sword });
 		GameRegistry.addRecipe(new ItemStack(ModItems.shackles, 1), new Object[] { "CIC", "C C", "I I", 'I', ModItems.ingot_chainsteel, 'C', ModBlocks.chain });
+		GameRegistry.addRecipe(new ItemStack(ModItems.black_diamond, 1), new Object[] { "NIN", "IGI", "NIN", 'N', ModItems.nugget_au198, 'I', ModItems.ink, 'G', ModItems.gem_volcanic });
 		
 		//Stealth boy
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Item.getItemFromBlock(Blocks.stone_button), 'L', Items.leather, 'I', "ingotSteel", 'C', ModItems.circuit_red_copper }));

src/main/java/com/hbm/crafting/MineralRecipes.java

@@ -22,8 +22,9 @@ public class MineralRecipes {
 	public static void register() {
 
 		add1To9Pair(ModItems.powder_coal, ModItems.powder_coal_tiny);
-		
+
 		add1To9Pair(ModBlocks.sand_gold, ModItems.powder_gold);
+		add1To9Pair(ModBlocks.sand_gold198, ModItems.powder_au198);
 		
 		add1To9Pair(ModBlocks.block_aluminium, ModItems.ingot_aluminium);
 		add1To9Pair(ModBlocks.block_graphite, ModItems.ingot_graphite);

src/main/java/com/hbm/crafting/ToolRecipes.java

@@ -79,7 +79,9 @@ public class ToolRecipes {
 
 		//Super pickaxes
 		GameRegistry.addRecipe(new ItemStack(ModItems.bismuth_pickaxe, 1), new Object[] { " BM", "BPB", "TB ", 'B', ModItems.ingot_bismuth, 'M', ModItems.ingot_meteorite, 'P', ModItems.starmetal_pickaxe, 'T', ModItems.bolt_tungsten });
+		GameRegistry.addRecipe(new ItemStack(ModItems.volcanic_pickaxe, 1), new Object[] { " BM", "BPB", "TB ", 'B', ModItems.gem_volcanic, 'M', ModItems.ingot_meteorite, 'P', ModItems.starmetal_pickaxe, 'T', ModItems.bolt_tungsten });
 		GameRegistry.addRecipe(new ItemStack(ModItems.chlorophyte_pickaxe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_steel, 'D', ModItems.powder_chlorophyte, 'A', ModItems.ingot_fiberglass, 'P', ModItems.bismuth_pickaxe, 'F', ModItems.bolt_dura_steel });
+		GameRegistry.addRecipe(new ItemStack(ModItems.chlorophyte_pickaxe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_steel, 'D', ModItems.powder_chlorophyte, 'A', ModItems.ingot_fiberglass, 'P', ModItems.volcanic_pickaxe, 'F', ModItems.bolt_dura_steel });
 		GameRegistry.addRecipe(new ItemStack(ModItems.mese_pickaxe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_desh, 'D', ModItems.powder_dineutronium, 'A', ModItems.plate_paa, 'P', ModItems.chlorophyte_pickaxe, 'F', ModItems.shimmer_handle });
 
 		//Chainsaws

src/main/java/com/hbm/handler/EntityEffectHandler.java

@@ -9,6 +9,7 @@ import com.hbm.explosion.ExplosionNukeSmall;
 import com.hbm.extprop.HbmLivingProps;
 import com.hbm.extprop.HbmLivingProps.ContaminationEffect;
 import com.hbm.handler.radiation.ChunkRadiationManager;
+import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
 import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
@@ -30,7 +31,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
@@ -282,12 +282,12 @@ public class EntityEffectHandler {
 				
 				//T-30 minutes, take damage every 20 seconds
 				if(contagion < 30 * minute && rand.nextInt(400) == 0) {
-					entity.attackEntityFrom(DamageSource.magic, 1F);
+					entity.attackEntityFrom(ModDamageSource.mku, 1F);
 				}
 				
 				//T-5 minutes, take damage every 5 seconds
 				if(contagion < 5 * minute && rand.nextInt(100) == 0) {
-					entity.attackEntityFrom(DamageSource.magic, 2F);
+					entity.attackEntityFrom(ModDamageSource.mku, 2F);
 				}
 				
 				if(contagion < 30 * minute && (contagion + entity.getEntityId()) % 200 < 20) {
@@ -302,7 +302,7 @@ public class EntityEffectHandler {
 				
 				//end of contagion, drop dead
 				if(contagion == 0) {
-					entity.attackEntityFrom(DamageSource.magic, 1000F);
+					entity.attackEntityFrom(ModDamageSource.mku, 1000F);
 				}
 			}
 		}

src/main/java/com/hbm/handler/WeaponAbility.java

@@ -156,6 +156,33 @@ public abstract class WeaponAbility {
 		}
 	}
 	
+	public static class FireAbility extends WeaponAbility {
+		
+		int duration;
+		
+		public FireAbility(int duration) {
+			this.duration = duration;
+		}
+
+		@Override
+		public void onHit(World world, EntityPlayer player, Entity victim, IItemAbility tool) {
+			
+			if(victim instanceof EntityLivingBase) {
+				victim.setFire(duration);
+			}
+		}
+
+		@Override
+		public String getName() {
+			return "weapon.ability.fire";
+		}
+
+		@Override
+		public String getFullName() {
+			return I18n.format(getName()) + " (" + duration + ")";
+		}
+	}
+	
 	public static class ChainsawAbility extends WeaponAbility {
 		
 		int divider;

src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java

@@ -39,11 +39,7 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler {
 			if(world.blockExists(x, 0, z)) {
 				
 				ChunkCoordIntPair coords = new ChunkCoordIntPair(x >> 4, z >> 4);
-				
-				if(radWorld.radiation.containsKey(coords)) {
-					radWorld.radiation.put(coords, rad);
-				}
-
+				radWorld.radiation.put(coords, rad);
 				world.getChunkFromBlockCoords(x, z).isModified = true;
 			}
 		}
@@ -70,6 +66,9 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler {
 			
 			for(Entry<ChunkCoordIntPair, Float> chunk : buff.entrySet()) {
 				
+				if(chunk.getValue() == 0)
+					continue;
+				
 				ChunkCoordIntPair coord = chunk.getKey();
 				
 				for(int i = -1; i <= 1; i++) {
@@ -85,6 +84,8 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler {
 							float newRad = rad + chunk.getValue() * percent;
 							newRad = Math.max(0F, newRad * 0.99F - 0.05F);
 							radiation.put(newCoord, newRad);
+						} else {
+							radiation.put(newCoord, chunk.getValue() * percent);
 						}
 					}
 				}

src/main/java/com/hbm/inventory/AssemblerRecipes.java

@@ -276,6 +276,7 @@ public class AssemblerRecipes {
 		makeRecipe(new ComparableStack(ModBlocks.machine_crystallizer, 1), new AStack[] {new ComparableStack(ModItems.hull_big_steel, 4), new ComparableStack(ModItems.pipes_steel, 1), new OreDictStack("ingotDesh", 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.blades_advanced_alloy, 2), new OreDictStack("ingotSteel", 16), new OreDictStack("plateTitanium", 16), new ComparableStack(Blocks.glass, 4), new ComparableStack(ModItems.circuit_gold, 1), },400);
 		makeRecipe(new ComparableStack(ModBlocks.machine_fluidtank, 1), new AStack[] {new OreDictStack("ingotSteel", 2), new OreDictStack("plateSteel", 6), new ComparableStack(ModItems.hull_big_steel, 4), new ComparableStack(ModItems.oil_tar, 4), },150);
 		makeRecipe(new ComparableStack(ModBlocks.machine_bat9000, 1), new AStack[] {new OreDictStack("plateSteel", 16), new ComparableStack(ModItems.ingot_tcalloy, 16), new ComparableStack(ModBlocks.steel_scaffold, 16), new ComparableStack(ModItems.oil_tar, 16), },150);
+		makeRecipe(new ComparableStack(ModBlocks.machine_orbus, 1), new AStack[] {new OreDictStack("ingotSteel", 12), new ComparableStack(ModItems.ingot_tcalloy, 12), new OreDictStack("plateSaturnite", 12), new ComparableStack(ModItems.coil_advanced_alloy, 12), new ComparableStack(ModItems.battery_sc_polonium, 1) }, 200);
 		makeRecipe(new ComparableStack(ModBlocks.machine_drill, 1), new AStack[] {new ComparableStack(ModBlocks.steel_scaffold, 6), new OreDictStack("ingotSteel", 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.circuit_copper, 1), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.ingot_dura_steel, 2), new ComparableStack(ModItems.bolt_dura_steel, 2), new ComparableStack(ModItems.drill_titanium, 1), },200);
 		makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), new OreDictStack("plateSteel", 16), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 3), new ComparableStack(ModItems.ingot_polymer, 4), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.ingot_dura_steel, 4), new ComparableStack(ModItems.bolt_dura_steel, 6), new ComparableStack(ModBlocks.machine_battery, 3), },400);
 		makeRecipe(new ComparableStack(ModBlocks.machine_turbofan, 1), new AStack[] {new ComparableStack(ModItems.hull_big_steel, 1), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.hull_small_steel, 2), new ComparableStack(ModItems.turbine_tungsten, 1), new ComparableStack(ModItems.turbine_titanium, 7), new ComparableStack(ModItems.bolt_compound, 8), new OreDictStack("ingotMingrade", 12), new ComparableStack(ModItems.wire_red_copper, 24), },500);

src/main/java/com/hbm/inventory/CrystallizerRecipes.java

@@ -49,6 +49,7 @@ public class CrystallizerRecipes {
 		recipes.put("oreStarmetal", new ItemStack(ModItems.crystal_starmetal));
 		recipes.put("oreRareEarth", new ItemStack(ModItems.crystal_rare));
 		recipes.put("oreCobalt", new ItemStack(ModItems.crystal_cobalt));
+		recipes.put("oreCinnabar", new ItemStack(ModItems.crystal_cinnebar));
 		
 		recipes.put(new ComparableStack(ModBlocks.ore_nether_fire), new ItemStack(ModItems.crystal_phosphorus));
 		recipes.put(new ComparableStack(ModBlocks.ore_tikite), new ItemStack(ModItems.crystal_trixite));

src/main/java/com/hbm/inventory/MachineRecipes.java

@@ -2148,8 +2148,8 @@ public class MachineRecipes {
 			output[1] = new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidType.LUBRICANT);
 			break;
         case FP_NAPHTHA:
-			output[0] = new FluidStack(RefineryRecipes.napth_frac_heat * 10, FluidType.HEATINGOIL);
-			output[1] = new FluidStack(RefineryRecipes.napth_frac_diesel * 10, FluidType.DIESEL);
+			output[0] = new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidType.HEATINGOIL);
+			output[1] = new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidType.DIESEL);
 			break;
         case FP_LIGHTOIL:
 			output[0] = new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidType.DIESEL);

src/main/java/com/hbm/inventory/RefineryRecipes.java

@@ -1,6 +1,5 @@
 package com.hbm.inventory;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,7 +9,6 @@ import com.hbm.items.machine.ItemFluidIcon;
 import com.hbm.util.Tuple.Quartet;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
 public class RefineryRecipes {
 
@@ -24,8 +22,8 @@ public class RefineryRecipes {
 	public static final int heavy_frac_smear = 70;
 	public static final int smear_frac_heat = 60;
 	public static final int smear_frac_lube = 40;
-	public static final int napth_frac_heat = 40;
-	public static final int napth_frac_diesel = 60;
+	public static final int napht_frac_heat = 40;
+	public static final int napht_frac_diesel = 60;
 	public static final int light_frac_diesel = 40;
 	public static final int light_frac_kero = 60;
 	
@@ -49,7 +47,7 @@ public class RefineryRecipes {
 	public static void registerFractions() {
 		fractions.put(FluidType.HEAVYOIL, new Quartet(FluidType.BITUMEN, FluidType.SMEAR, heavy_frac_bitu, heavy_frac_smear));
 		fractions.put(FluidType.SMEAR, new Quartet(FluidType.HEATINGOIL, FluidType.LUBRICANT, smear_frac_heat, smear_frac_lube));
-		fractions.put(FluidType.NAPHTHA, new Quartet(FluidType.HEATINGOIL, FluidType.DIESEL, napth_frac_heat, napth_frac_diesel));
+		fractions.put(FluidType.NAPHTHA, new Quartet(FluidType.HEATINGOIL, FluidType.DIESEL, napht_frac_heat, napht_frac_diesel));
 		fractions.put(FluidType.LIGHTOIL, new Quartet(FluidType.DIESEL, FluidType.KEROSENE, light_frac_diesel, light_frac_kero));
 	}
 	

src/main/java/com/hbm/items/ModItems.java

@@ -7,7 +7,6 @@ import com.hbm.handler.ToolAbility.LuckAbility;
 import com.hbm.handler.WeaponAbility;
 import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.handler.guncfg.*;
-import static com.hbm.handler.indexing.AmmoIndex.AmmoTrait.*;
 import com.hbm.items.armor.*;
 import com.hbm.items.bomb.*;
 import com.hbm.items.food.*;
@@ -2113,6 +2112,7 @@ public class ModItems {
 	public static Item heart_container;
 	public static Item heart_booster;
 	public static Item heart_fab;
+	public static Item black_diamond;
 	public static Item wd40;
 	public static Item scrumpy;
 	public static Item wild_p;
@@ -3185,6 +3185,7 @@ public class ModItems {
 		heart_container = new ItemModHealth(20F).setUnlocalizedName("heart_container").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":heart_container");
 		heart_booster = new ItemModHealth(40F).setUnlocalizedName("heart_booster").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":heart_booster");
 		heart_fab = new ItemModHealth(60F).setUnlocalizedName("heart_fab").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":heart_fab");
+		black_diamond = new ItemModHealth(40F).setUnlocalizedName("black_diamond").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":black_diamond");
 		wd40 = new ItemModWD40().setUnlocalizedName("wd40").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":wd40");
 		scrumpy = new ItemModRevive(1).setUnlocalizedName("scrumpy").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":scrumpy");
 		wild_p = new ItemModRevive(3).setUnlocalizedName("wild_p").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":wild_p");
@@ -5006,7 +5007,7 @@ public class ModItems {
 				.addBreakAbility(new ToolAbility.SmelterAbility())
 				.addBreakAbility(new ToolAbility.LuckAbility(3))
 				.addBreakAbility(new ToolAbility.SilkAbility())
-				.addHitAbility(new WeaponAbility.StunAbility(5))
+				.addHitAbility(new WeaponAbility.FireAbility(5))
 				.addHitAbility(new WeaponAbility.VampireAbility(2F))
 				.addHitAbility(new WeaponAbility.BeheaderAbility())
 				.setDepthRockBreaker().setUnlocalizedName("volcanic_pickaxe").setTextureName(RefStrings.MODID + ":volcanic_pickaxe");
@@ -7341,6 +7342,7 @@ public class ModItems {
 		GameRegistry.registerItem(heart_container, heart_container.getUnlocalizedName());
 		GameRegistry.registerItem(heart_booster, heart_booster.getUnlocalizedName());
 		GameRegistry.registerItem(heart_fab, heart_fab.getUnlocalizedName());
+		GameRegistry.registerItem(black_diamond, black_diamond.getUnlocalizedName());
 		GameRegistry.registerItem(wd40, wd40.getUnlocalizedName());
 		GameRegistry.registerItem(scrumpy, scrumpy.getUnlocalizedName());
 		GameRegistry.registerItem(wild_p, wild_p.getUnlocalizedName());

src/main/java/com/hbm/items/armor/ItemModHealth.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.google.common.collect.Multimap;
 import com.hbm.handler.ArmorModHandler;
+import com.hbm.items.ModItems;
 
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
@@ -28,6 +29,12 @@ public class ItemModHealth extends ItemArmorMod {
 
 		list.add(color + "+" + (Math.round(health * 10 / 2) * 0.1) + " health");
 		list.add("");
+		
+		if(this == ModItems.black_diamond) {
+			list.add(EnumChatFormatting.DARK_GRAY + "Nostalgia");
+			list.add("");
+		}
+		
 		super.addInformation(itemstack, player, list, bool);
 	}
 

src/main/java/com/hbm/lib/ModDamageSource.java

@@ -1,15 +1,12 @@
 package com.hbm.lib;
 
 import com.hbm.entity.projectile.EntityBullet;
-import com.hbm.entity.projectile.EntityBulletBase;
-import com.hbm.entity.projectile.EntityCombineBall;
 import com.hbm.entity.projectile.EntityDischarge;
 import com.hbm.entity.projectile.EntityFire;
 import com.hbm.entity.projectile.EntityLN2;
 import com.hbm.entity.projectile.EntityLaserBeam;
 import com.hbm.entity.projectile.EntityMinerBeam;
 import com.hbm.entity.projectile.EntityPlasmaBeam;
-import com.hbm.entity.projectile.EntityRainbow;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.util.DamageSource;
@@ -51,6 +48,7 @@ public class ModDamageSource extends DamageSource {
 	public static DamageSource lunar = (new DamageSource("lunar")).setDamageIsAbsolute().setDamageBypassesArmor();
 	public static DamageSource monoxide = (new DamageSource("monoxide")).setDamageIsAbsolute().setDamageBypassesArmor();
 	public static DamageSource asbestos = (new DamageSource("asbestos")).setDamageIsAbsolute().setDamageBypassesArmor();
+	public static DamageSource mku = (new DamageSource("mku")).setDamageIsAbsolute().setDamageBypassesArmor();
 
 	public static final String s_bullet = "revolverBullet";
 	public static final String s_emplacer = "chopperBullet";

src/main/java/com/hbm/main/CraftingManager.java

@@ -251,6 +251,8 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.solar_mirror, 3), new Object[] { "AAA", " B ", "SSS", 'A', "plateAluminum", 'B', ModBlocks.steel_beam, 'S', "ingotSteel" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.anvil_iron, 1), new Object[] { "III", " B ", "III", 'I', "ingotIron", 'B', "blockIron" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.anvil_lead, 1), new Object[] { "III", " B ", "III", 'I', "ingotLead", 'B', "blockLead" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_fraction_tower), new Object[] { "SHS", "SGS", "SHS", 'S', "plateSteel", 'H', ModItems.hull_big_steel, 'G', ModBlocks.steel_grate }));
+		GameRegistry.addRecipe(new ItemStack(ModBlocks.fraction_spacer), new Object[] { "BHB", 'H', ModItems.hull_big_steel, 'B', Blocks.iron_bars });
 
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.muffler, 1), new Object[] { "III", "IWI", "III", 'I', ModItems.plate_polymer, 'W', Blocks.wool });
 
@@ -692,7 +694,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.barrel_iron, 1), new Object[] { ModBlocks.barrel_corroded, ModItems.oil_tar });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_steel, 1), new Object[] { "IPI", "ITI", "IPI", 'I', "plateSteel", 'P', "ingotSteel", 'T', ModItems.oil_tar }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_tcalloy, 1), new Object[] { "IPI", "I I", "IPI", 'I', "ingotTcAlloy", 'P', "plateTitanium" }));
-		GameRegistry.addRecipe(new ItemStack(ModBlocks.barrel_antimatter, 1), new Object[] { "IPI", "IPI", "IPI", 'I', ModItems.plate_saturnite, 'P', ModItems.coil_advanced_torus });
+		GameRegistry.addRecipe(new ItemStack(ModBlocks.barrel_antimatter, 1), new Object[] { "IPI", "IBI", "IPI", 'I', ModItems.plate_saturnite, 'P', ModItems.coil_advanced_torus, 'B', ModItems.battery_sc_technetium });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.tesla, 1), new Object[] { "CCC", "PIP", "WTW", 'C', ModItems.coil_copper, 'I', "ingotIron", 'P', "ingotPolymer", 'T', ModBlocks.machine_transformer, 'W', "plankWood" }));
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.struct_plasma_core, 1), new Object[] { "CBC", "BHB", "CBC", 'C', ModItems.circuit_gold, 'B', ModBlocks.machine_lithium_battery, 'H', ModBlocks.fusion_heater });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.circuit_red_copper, 48), new Object[] { ModBlocks.fusion_core });
@@ -976,6 +978,7 @@ public class CraftingManager {
 		GameRegistry.addSmelting(new ItemStack(ModBlocks.gravel_diamond), new ItemStack(Items.diamond), 3.0F);
 		GameRegistry.addSmelting(new ItemStack(ModBlocks.sand_uranium), new ItemStack(ModBlocks.glass_uranium), 0.25F);
 		GameRegistry.addSmelting(new ItemStack(ModBlocks.sand_polonium), new ItemStack(ModBlocks.glass_polonium), 0.75F);
+		GameRegistry.addSmelting(new ItemStack(ModBlocks.sand_quartz), new ItemStack(ModBlocks.glass_quartz), 0.75F);
 		GameRegistry.addSmelting(new ItemStack(ModBlocks.waste_trinitite), new ItemStack(ModBlocks.glass_trinitite), 0.25F);
 		GameRegistry.addSmelting(new ItemStack(ModBlocks.waste_trinitite_red), new ItemStack(ModBlocks.glass_trinitite), 0.25F);
 		GameRegistry.addSmelting(new ItemStack(ModBlocks.sand_boron), new ItemStack(ModBlocks.glass_boron), 0.25F);
@@ -1010,6 +1013,7 @@ public class CraftingManager {
 		GameRegistry.addSmelting(ModItems.crystal_cobalt, new ItemStack(ModItems.ingot_cobalt, 2), 2.0F);
 		GameRegistry.addSmelting(ModItems.crystal_starmetal, new ItemStack(ModItems.ingot_starmetal, 2), 2.0F);
 		GameRegistry.addSmelting(ModItems.crystal_trixite, new ItemStack(ModItems.ingot_plutonium, 4), 2.0F);
+		GameRegistry.addSmelting(ModItems.crystal_cinnebar, new ItemStack(ModItems.cinnebar, 4), 2.0F);
 
 		GameRegistry.addSmelting(ModItems.circuit_schrabidium, new ItemStack(ModItems.circuit_gold, 1), 1.0F);
 		GameRegistry.addSmelting(ModItems.circuit_gold, new ItemStack(ModItems.circuit_red_copper, 1), 1.0F);

src/main/java/com/hbm/main/ModEventHandler.java

@@ -146,10 +146,6 @@ public class ModEventHandler {
 						);
 			}
 			
-			if(event.player.getDisplayName().equals("the_NCR") && System.currentTimeMillis() < 1629649410000L) {
-				event.player.inventory.addItemStackToInventory(new ItemStack(ModItems.v1));
-			}
-
 			if(MobConfig.enableDucks && event.player instanceof EntityPlayerMP && !event.player.getEntityData().getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG).getBoolean("hasDucked"))
 				PacketDispatcher.wrapper.sendTo(new PlayerInformPacket("Press O to Duck!"), (EntityPlayerMP) event.player);
 		}

src/main/java/com/hbm/main/ResourceManager.java

@@ -326,6 +326,7 @@ public class ResourceManager {
 	//Refinery
 	public static final ResourceLocation refinery_tex = new ResourceLocation(RefStrings.MODID, "textures/models/refinery.png");
 	public static final ResourceLocation fraction_tower_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/fraction_tower.png");
+	public static final ResourceLocation fraction_spacer_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/fraction_spacer.png");
 	
 	//Flare Stack
 	public static final ResourceLocation oilflare_tex = new ResourceLocation(RefStrings.MODID, "textures/models/oilFlareTexture.png");

src/main/java/com/hbm/render/item/ItemRenderLibrary.java

@@ -1032,6 +1032,17 @@ public class ItemRenderLibrary {
 				GL11.glShadeModel(GL11.GL_FLAT);
 			}});
 		
+		renderers.put(Item.getItemFromBlock(ModBlocks.machine_orbus), new ItemRenderBase() {
+			public void renderInventory() {
+				GL11.glTranslated(0, -3, 0);
+				GL11.glScaled(2, 2, 2);
+			}
+			public void renderCommon() {
+				GL11.glShadeModel(GL11.GL_SMOOTH);
+				bindTexture(ResourceManager.orbus_tex); ResourceManager.orbus.renderAll();
+				GL11.glShadeModel(GL11.GL_FLAT);
+			}});
+		
 		renderers.put(Item.getItemFromBlock(ModBlocks.watz), new ItemRenderBase() {
 			public void renderInventory() {
 				GL11.glTranslated(0, -1, 0);
@@ -1052,6 +1063,15 @@ public class ItemRenderLibrary {
 				GL11.glScaled(1, 1, 1);
 				bindTexture(ResourceManager.fraction_tower_tex); ResourceManager.fraction_tower.renderAll();
 			}});
+		
+		renderers.put(Item.getItemFromBlock(ModBlocks.fraction_spacer), new ItemRenderBase() {
+			public void renderInventory() {
+				GL11.glScaled(3.25, 3.25, 3.25);
+			}
+			public void renderCommon() {
+				GL11.glScaled(1, 1, 1);
+				bindTexture(ResourceManager.fraction_spacer_tex); ResourceManager.fraction_spacer.renderAll();
+			}});
 	}
 	
 	private static void bindTexture(ResourceLocation res) {

src/main/java/com/hbm/render/tileentity/RenderSpacer.java

@@ -15,9 +15,9 @@ public class RenderSpacer extends TileEntitySpecialRenderer {
 		GL11.glPushMatrix();
 		GL11.glTranslated(x + 0.5D, y, z + 0.5D);
 		GL11.glEnable(GL11.GL_LIGHTING);
-		GL11.glDisable(GL11.GL_CULL_FACE);
+		GL11.glEnable(GL11.GL_CULL_FACE);
 		
-		bindTexture(ResourceManager.universal);
+		bindTexture(ResourceManager.fraction_spacer_tex);
 		ResourceManager.fraction_spacer.renderAll();
 		
 		GL11.glPopMatrix();

src/main/java/com/hbm/tileentity/machine/TileEntityMachineFractionTower.java

@@ -13,8 +13,10 @@ import com.hbm.util.Tuple.Quartet;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraftforge.common.util.ForgeDirection;
 import scala.actors.threadpool.Arrays;
 
 public class TileEntityMachineFractionTower extends TileEntity implements IFluidSource, IFluidAcceptor {
@@ -66,6 +68,11 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid
 			
 			if(worldObj.getTotalWorldTime() % 20 == 0)
 				fractionate();
+			
+			if(worldObj.getTotalWorldTime() % 10 == 0) {
+				fillFluidInit(tanks[1].getTankType());
+				fillFluidInit(tanks[2].getTankType());
+			}
 		}
 	}
 	
@@ -99,6 +106,22 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid
 	private boolean hasSpace(int left, int right) {
 		return tanks[1].getFill() + left <= tanks[1].getMaxFill() && tanks[2].getFill() + right <= tanks[2].getMaxFill();
 	}
+	
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+
+		for(int i = 0; i < 3; i++)
+			tanks[i].readFromNBT(nbt, "tank" + i);
+	}
+	
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+
+		for(int i = 0; i < 3; i++)
+			tanks[i].writeToNBT(nbt, "tank" + i);
+	}
 
 	@Override
 	public void setFillstate(int fill, int index) {
@@ -145,8 +168,11 @@ public class TileEntityMachineFractionTower extends TileEntity implements IFluid
 
 	@Override
 	public void fillFluidInit(FluidType type) {
-		// TODO Auto-generated method stub
 		
+		for(int i = 2; i < 6; i++) {
+			ForgeDirection dir = ForgeDirection.getOrientation(i);
+			fillFluid(xCoord + dir.offsetX * 2, yCoord, zCoord + dir.offsetZ * 2, this.getTact(), type);
+		}
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java

@@ -1,10 +1,12 @@
 package com.hbm.tileentity.machine;
 
+import com.hbm.blocks.BlockDummyable;
 import com.hbm.handler.FluidTypeHandler.FluidType;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class TileEntityMachineOrbus extends TileEntityBarrel {
 
@@ -22,14 +24,16 @@ public class TileEntityMachineOrbus extends TileEntityBarrel {
 
 	@Override
 	public void fillFluidInit(FluidType type) {
-		fillFluid(this.xCoord + 1, this.yCoord, this.zCoord + 3, getTact(), type);
-		fillFluid(this.xCoord - 1, this.yCoord, this.zCoord + 3, getTact(), type);
-		fillFluid(this.xCoord + 1, this.yCoord, this.zCoord - 3, getTact(), type);
-		fillFluid(this.xCoord - 1, this.yCoord, this.zCoord - 3, getTact(), type);
-		fillFluid(this.xCoord + 3, this.yCoord, this.zCoord + 1, getTact(), type);
-		fillFluid(this.xCoord - 3, this.yCoord, this.zCoord + 1, getTact(), type);
-		fillFluid(this.xCoord + 3, this.yCoord, this.zCoord - 1, getTact(), type);
-		fillFluid(this.xCoord - 3, this.yCoord, this.zCoord - 1, getTact(), type);
+		
+		ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset).getOpposite();
+		ForgeDirection d2 = dir.getRotation(ForgeDirection.DOWN);
+
+		for(int i = -1; i < 7; i += 7) {
+			this.fillFluid(xCoord, yCoord + i, zCoord, this.getTact(), this.tank.getTankType());
+			this.fillFluid(xCoord + dir.offsetX, yCoord + i, zCoord + dir.offsetZ, this.getTact(), this.tank.getTankType());
+			this.fillFluid(xCoord + d2.offsetX, yCoord + i, zCoord + d2.offsetZ, this.getTact(), this.tank.getTankType());
+			this.fillFluid(xCoord + dir.offsetX + d2.offsetX, yCoord + i, zCoord + dir.offsetZ + d2.offsetZ, this.getTact(), this.tank.getTankType());
+		}
 	}
 	
 	AxisAlignedBB bb = null;

src/main/java/com/hbm/tileentity/machine/TileEntitySpacer.java

@@ -1,6 +1,9 @@
 package com.hbm.tileentity.machine;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
 
 public class TileEntitySpacer extends TileEntity {
 	
@@ -8,4 +11,29 @@ public class TileEntitySpacer extends TileEntity {
 	public boolean canUpdate() {
 		return false;
 	}
+	
+	AxisAlignedBB bb = null;
+	
+	@Override
+	public AxisAlignedBB getRenderBoundingBox() {
+		
+		if(bb == null) {
+			bb = AxisAlignedBB.getBoundingBox(
+					xCoord - 1,
+					yCoord,
+					zCoord - 1,
+					xCoord + 2,
+					yCoord + 1,
+					zCoord + 2
+					);
+		}
+		
+		return bb;
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public double getMaxRenderDistanceSquared() {
+		return 65536.0D;
+	}
 }

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -180,6 +180,7 @@ container.arcFurnace=Lichtbogenofen
 container.armorTable=Rüstungsmodifikationstisch
 container.assembler=Fertigungsmaschine
 container.barrel=Fass
+container.bat9000=Big-Ass Tank 9000
 container.battery=Energiespeicher
 container.bombMulti=Mehrzweckbombe
 container.centrifuge=Zentrifuge
@@ -316,6 +317,7 @@ death.attack.laser.item=%1$s wurde von %2$s mit %3$s zerbröselt.
 death.attack.lead=%1$s starb an Bleivergiftung.
 death.attack.lunar=%1$s vergaß lebenswichtige Organe aufzuladen.
 death.attack.meteorite=%1$s wurde von einem fallenden Stein aus dem Weltall erschlagen.
+death.attack.mku=%1$s starb aus unbekannten Gründen.
 death.attack.monoxide=%1$s vergaß, die Batterien im Kohlenmonoxid-Detektor auszutauschen.
 death.attack.mudPoisoning=%1$s starb an Giftschlamm.
 death.attack.nuclearBlast=%1$s wurde von einer Atomexplosion weggeblasen.
@@ -770,6 +772,7 @@ item.bj_helmet.name=Augenklappe mit Infrarot-Sensor
 item.bj_legs.name=Lunare Kybernetischer Beinersatz
 item.bj_plate.name=Lunare Kybernetische Panzerung
 item.bj_plate_jetpack.name=Lunare Kybernetische Panzerung (Geflügelt)
+item.black_diamond.name=Black Diamond
 item.black_hole.name=Miniatur Schwarzes Loch
 item.blade_meteorite.name=Meteoritenklinge
 item.blade_titanium.name=Titanturbinenschaufel
@@ -1040,6 +1043,7 @@ item.crystal_charred.name=Verkohlter Kristall
 item.crystal_coal.name=Kohlekristalle
 item.crystal_cobalt.name=Kobaltkristalle
 item.crystal_copper.name=Kupferkristalle
+item.crystal_cinnebar.name=Zinnoberkristalle
 item.crystal_diamond.name=Diamantkristalle
 item.crystal_energy.name=Energiekristall
 item.crystal_fluorite.name=Fluoritkristalle
@@ -2458,6 +2462,7 @@ item.upgrade_speed_2.name=Geschwindigkeitsupgrade Mk.II
 item.upgrade_speed_3.name=Geschwindigkeitsupgrade Mk.III
 item.upgrade_template.name=Maschinenupgrade-Vorlage
 item.v1.name=V1
+item.volcanic_pickaxe.name=Geschmolzene Spitzhacke
 item.wand_d.name=Debug-Zauberstab
 item.wand_k.name=Konstruktions-Zauberstab
 item.wand_s.name=Struktur-Zauberstab
@@ -2708,7 +2713,8 @@ tile.brick_concrete_broken.name=Gebrochene Betonziegel
 tile.brick_concrete_cracked.name=Rissige Betonziegel
 tile.brick_concrete_marked.name=Beschriebene Betonziegel
 tile.brick_concrete_mossy.name=Bemooste Betonziegel
-tile.brick_dungeon.name=Berzelianitziiegel
+tile.brick_ducrete.name=Ducrete-Ziegel
+tile.brick_dungeon.name=Berzelianitziegel
 tile.brick_dungeon_circle.name=Berzelianitkreis
 tile.brick_dungeon_flat.name=Berzelianitblock
 tile.brick_dungeon_tile.name=Berzelianitfliese
@@ -2807,6 +2813,8 @@ tile.dfc_injector.name=DFC-Brennstoffinjektor
 tile.dfc_receiver.name=DFC-Receiver
 tile.dfc_stabilizer.name=DFC-Stabilisator
 tile.drill_pipe.name=Bohrgestänge
+tile.ducrete.name=Ducrete-Fliese
+tile.ducrete_smooth.name=Ducrete
 tile.dummy_block.name=Dummyblock
 tile.dummy_port.name=Dummyblock (Stromanschluss)
 tile.dungeon_chain.name=Metallkette
@@ -2830,6 +2838,7 @@ tile.flame_war.name=Flamewar aus der Box
 tile.float_bomb.name=Schwebebombe
 tile.fluid_duct.name=Universelles Flüssigkeitsrohr
 tile.foam_layer.name=Schaumdecke
+tile.fraction_spacer.name=Fraktionierungsturm-Teiler
 tile.frozen_dirt.name=Gefrorene Erde
 tile.frozen_grass.name=Gefrorenes Gras
 tile.frozen_log.name=Gefrorener Baumstamm
@@ -2861,6 +2870,7 @@ tile.glass_ash.name=Ascheglas
 tile.glass_boron.name=Borglas
 tile.glass_lead.name=Bleiglas
 tile.glass_polonium.name=Poloniumglas
+tile.glass_quartz.name=Quarzglas
 tile.glass_trinitite.name=Trinity-Glas
 tile.glass_uranium.name=Uranglas
 tile.gneiss_brick.name=Schieferziegel
@@ -2952,6 +2962,7 @@ tile.machine_fensu.name=FEnSU
 tile.machine_flare.name=Abfackelturm
 tile.machine_fluidtank.name=Tank
 tile.machine_forcefield.name=Kraftfeldgenerator
+tile.machine_fraction_tower.name=Fraktionierungsturm
 tile.machine_gascent.name=Gaszentrifuge
 tile.machine_generator.name=Atomreaktor (Alt)
 tile.machine_geo.name=Gepthermiegenerator
@@ -2965,6 +2976,7 @@ tile.machine_minirtg.name=Radioisotopenzelle
 tile.machine_missile_assembly.name=Raketenmontagestation
 tile.machine_nuke_furnace_off.name=Atombetriebener Ofen
 tile.machine_nuke_furnace_on.name=Atombetriebener Ofen
+tile.machine_orbus.name=Schwerer Magnetischer Lagerbehälter
 tile.machine_powerrtg.name=PT-Isotopenzelle
 tile.machine_press.name=Befeuerte Presse
 tile.machine_puf6_tank.name=Plutoniumhexafluorid-Tank
@@ -3150,6 +3162,7 @@ tile.red_cable.name=Rotes Kupferkabel
 tile.red_pylon.name=Strommasten
 tile.red_wire_coated.name=Geschirmtes rotes Kupferkabel
 tile.reinforced_brick.name=Verstärkter Stein
+tile.reinforced_ducrete.name=Verstärkter Ducrete
 tile.reinforced_glass.name=Verstärktes Glas
 tile.reinforced_lamp_off.name=Verstärkte Lampe
 tile.reinforced_lamp_on.name=Verstärkte Lampe
@@ -3162,8 +3175,10 @@ tile.safe.name=Panzerschrank
 tile.sand_boron.name=Borsand
 tile.sand_boron_layer.name=Borsanddecke
 tile.sand_gold.name=Goldsand
+tile.sand_gold198.name=Gold-198-Sand
 tile.sand_lead.name=Bleisand
 tile.sand_polonium.name=Poloniumsand
+tile.sand_quartz.name=Quarzsand
 tile.sand_uranium.name=Uransand
 tile.sat_dock.name=Frachtlandeplattform
 tile.sat_foeq.name=PEAF - Mk.I FOEQ Dunasonde mit experimenter nuklearer Schubdüse (Dekoblock)
@@ -3223,6 +3238,7 @@ tile.turret_friendly.name=Gatlingeschütz "Mister Friendly"
 tile.turret_fritz.name=Schwered Flammenwerfergeschütz "Fritz"
 tile.turret_heavy.name=Schweres MG-Geschütz
 tile.turret_howard.name=Goalkeeper-Zwilling CIWS "Howard"
+tile.turret_howard_damaged.name=Goalkeeper-Zwilling CIWS "turret_howard_damaged"
 tile.turret_jeremy.name=Autokanonengeschütz "Jeremy"
 tile.turret_light.name=Leichtes MG-Geschütz
 tile.turret_maxwell.name=Hochenergie-MASER-Geschütz "Maxwell"
@@ -3322,8 +3338,9 @@ tool.ability.silktouch=Behutsamkeit
 tool.ability.smelter=Auto-Ofen
 
 weapon.ability.beheader=Köpfer
-weapon.ability.chainsaw=Skelettensäge
 # Should rhyme with the translation for "chainsaw"
+weapon.ability.chainsaw=Skelettensäge
+weapon.ability.fire=Flammend
 weapon.ability.radiation=Radioaktive Schneide
 weapon.ability.phosphorus=Phosphorspitze
 weapon.ability.stun=Betäubend

src/main/resources/assets/hbm/lang/en_US.lang

@@ -248,6 +248,7 @@ container.arcFurnace=Arc Furnace
 container.armorTable=Armor Modification Table
 container.assembler=Assembly Machine
 container.barrel=Barrel
+container.bat9000=Big-Ass Tank 9000
 container.battery=Energy Storage
 container.bombMulti=Multi Purpose Bomb
 container.centrifuge=Centrifuge
@@ -384,6 +385,7 @@ death.attack.laser.item=%1$s was turned into ash by %2$s using %3$s.
 death.attack.lead=%1$s died from lead poisoning.
 death.attack.lunar=%1$s forgot to charge their vital organs.
 death.attack.meteorite=%1$s was hit by a falling rock from outer space.
+death.attack.mku=%1$s died from unknown causes.
 death.attack.monoxide=%1$s forgot to change the batteries in their carbon monoxide detector.
 death.attack.mudPoisoning=%1$s died in poisonous mud.
 death.attack.nuclearBlast=%1$s was blown away by a nuclear explosion.
@@ -838,6 +840,7 @@ item.bj_helmet.name=Eyepatch with Thermal Sensor
 item.bj_legs.name=Lunar Cybernetic Leg Replacements
 item.bj_plate.name=Lunar Cybernetic Plating
 item.bj_plate_jetpack.name=Lunar Cybernetic Plating (Winged)
+item.black_diamond.name=Black Diamond
 item.black_hole.name=Miniature Black Hole
 item.blade_meteorite.name=Meteorite Blade
 item.blade_titanium.name=Titanium Blade
@@ -1108,6 +1111,7 @@ item.crystal_charred.name=Charred Crystal
 item.crystal_coal.name=Coal Crystals
 item.crystal_cobalt.name=Cobalt Crystals
 item.crystal_copper.name=Copper Crystals
+item.crystal_cinnebar.name=Cinnabar Crystals
 item.crystal_diamond.name=Diamond Crystals
 item.crystal_energy.name=Energy Crystal
 item.crystal_fluorite.name=Fluorite Crystals
@@ -2525,6 +2529,7 @@ item.upgrade_speed_2.name=Speed Upgrade Mk.II
 item.upgrade_speed_3.name=Speed Upgrade Mk.III
 item.upgrade_template.name=Machine Upgrade Template
 item.v1.name=V1
+item.volcanic_pickaxe.name=Molten Pickaxe
 item.wand_d.name=Debug Wand
 item.wand_k.name=Construction Wand
 item.wand_s.name=Structure Wand
@@ -2775,6 +2780,7 @@ tile.brick_concrete_broken.name=Broken Concrete Bricks
 tile.brick_concrete_cracked.name=Cracked Concrete Bricks
 tile.brick_concrete_marked.name=Marked Concrete Bricks
 tile.brick_concrete_mossy.name=Mossy Concrete Bricks
+tile.brick_ducrete.name=Ducrete Bricks
 tile.brick_dungeon.name=Berzelianite Bricks
 tile.brick_dungeon_circle.name=Berzelianite Cirlce
 tile.brick_dungeon_flat.name=Berzelianite Block
@@ -2890,6 +2896,8 @@ tile.dfc_injector.name=DFC Fuel Injector
 tile.dfc_receiver.name=DFC Receiver
 tile.dfc_stabilizer.name=DFC Stabilizer
 tile.drill_pipe.name=Drill Pipe
+tile.ducrete.name=Ducrete Tile
+tile.ducrete_smooth.name=Ducrete
 tile.dummy_block.name=Dummy Block
 tile.dummy_port.name=Dummy Block (Electricity Port)
 tile.dungeon_chain.name=Metal Chain
@@ -2913,6 +2921,7 @@ tile.flame_war.name=Flame War in a Box
 tile.float_bomb.name=Levitation Bomb
 tile.fluid_duct.name=Universal Fluid Duct
 tile.foam_layer.name=Foam layer
+tile.fraction_spacer.name=Fractioning Tower Separator
 tile.frozen_dirt.name=Frozen Dirt
 tile.frozen_grass.name=Frozen Grass
 tile.frozen_log.name=Frozen Log
@@ -2944,6 +2953,7 @@ tile.glass_ash.name=Ash Glass
 tile.glass_boron.name=Boron Glass
 tile.glass_lead.name=Lead Glass
 tile.glass_polonium.name=Polonium Glass
+tile.glass_quartz.name=Quartz Glass
 tile.glass_trinitite.name=Trinity Glass
 tile.glass_uranium.name=Uranium Glass
 tile.gneiss_brick.name=Schist Brick
@@ -3035,6 +3045,7 @@ tile.machine_fensu.name=FEnSU
 tile.machine_flare.name=Gas Flare
 tile.machine_fluidtank.name=Tank
 tile.machine_forcefield.name=Forcefield Emitter
+tile.machine_fraction_tower.name=Fractioning Tower
 tile.machine_gascent.name=Gas Centrifuge
 tile.machine_generator.name=Nuclear Reactor (Old)
 tile.machine_geo.name=Geothermal Electric Generator
@@ -3048,6 +3059,7 @@ tile.machine_minirtg.name=Radio Isotope Cell
 tile.machine_missile_assembly.name=Missile Assembly Station
 tile.machine_nuke_furnace_off.name=Nuclear Furnace
 tile.machine_nuke_furnace_on.name=Nuclear Furnace
+tile.machine_orbus.name=Heavy Magnetic Storage Tank
 tile.machine_powerrtg.name=PT Isotope Cell
 tile.machine_press.name=Burner Press
 tile.machine_puf6_tank.name=Plutonium Hexafluoride Tank
@@ -3233,6 +3245,7 @@ tile.red_cable.name=Red Copper Cable
 tile.red_pylon.name=Electricity Pole
 tile.red_wire_coated.name=Coated Red Copper Cable
 tile.reinforced_brick.name=Reinforced Stone
+tile.reinforced_ducrete.name=Reinforced Ducrete
 tile.reinforced_glass.name=Reinforced Glass
 tile.reinforced_lamp_off.name=Reinforced Lamp
 tile.reinforced_lamp_on.name=Reinforced Lamp
@@ -3245,8 +3258,10 @@ tile.safe.name=Safe
 tile.sand_boron.name=Boron Sand
 tile.sand_boron_layer.name=Boron Sand Layer
 tile.sand_gold.name=Gold Sand
+tile.sand_gold198.name=Gold-198 Sand
 tile.sand_lead.name=Lead Sand
 tile.sand_polonium.name=Polonium Sand
+tile.sand_quartz.name=Quartz Sand
 tile.sand_uranium.name=Uranium Sand
 tile.sat_dock.name=Cargo Landing Pad
 tile.sat_foeq.name=PEAF - Mk.I FOEQ Duna Probe with experimental Nuclear Propulsion (Deco Block)
@@ -3306,6 +3321,7 @@ tile.turret_friendly.name=Chaingun Turret "Mister Friendly"
 tile.turret_fritz.name=Heavy Flamethrower Turret "Fritz"
 tile.turret_heavy.name=Heavy Machine Gun Turret
 tile.turret_howard.name=Goalkeeper Twin Chaingun CIWS "Howard"
+tile.turret_howard_damaged.name=Goalkeeper Twin Chaingun CIWS "Methusalem"
 tile.turret_jeremy.name=Autocannon Turret "Jeremy"
 tile.turret_light.name=Light Machine Gun Turret
 tile.turret_maxwell.name=High-Energy MASER Turret "Maxwell"
@@ -3404,8 +3420,9 @@ tool.ability.silktouch=Silk Touch
 tool.ability.smelter=Auto-Smelter
 
 weapon.ability.beheader=Decapitator
-weapon.ability.chainsaw=Painsaw
 # Should rhyme with the translation for "chainsaw"
+weapon.ability.chainsaw=Painsaw
+weapon.ability.fire=Flaming
 weapon.ability.radiation=Radioactive Blade
 weapon.ability.phosphorus=Phosphorus Tip
 weapon.ability.stun=Stunning