AMS functionality, transformer, oil sands, jetpacks

assets/hbm/lang/de_DE.lang

@@ -9,6 +9,8 @@ achievement.sacrifice.desc=Überlebe den Flammentod.
 achievement.impossible=Vollkommen unmöglich
 achievement.impossible.desc=Du kannst diese Errungenschaft nicht bekommen.
 
+potion.hbm_taint=Verseucht
+
 hbmfluid.none=Nichts
 hbmfluid.water=Wasser
 hbmfluid.steam=Dampf
@@ -50,6 +52,8 @@ chem.FP_NAPHTHA=Mitteldestillatsverarbeitung
 chem.FP_LIGHTOIL=Leichtölverarbeitung
 chem.FR_REOIL=Öl-Wiederaufbereitung
 chem.FR_PETROIL=Gemischherstellung
+chem.OIL_SAND=Teersand-Extraktion
+chem.FC_BITUMEN=Bitumen-Cracking
 chem.FC_I_NAPHTHA=Industriöl-Cracking
 chem.FC_GAS_PETROLEUM=Erdgas-Cracking
 chem.FC_DIESEL_KEROSENE=Diesel-Cracking
@@ -83,6 +87,7 @@ chem.SF_BIOFUEL=Biodieselverfestigung
 chem.POLYMER=Polymersynthese
 chem.DEUTERIUM=Deuteriumextrahierung
 chem.STEAM=WWasser kochen
+chem.YELLOWCAKE=Yellowcakeproduction
 chem.UF6=Uranhexafluoritproduktion
 chem.PUF6=Plutoniumhexafluoritproduktion
 chem.BP_BIOGAS=Biogasherstellung
@@ -497,6 +502,7 @@ tile.block_unobtainium.name=Unobtainiumblock
 tile.block_daffergon.name=Daffergonblock
 tile.block_verticium.name=Verticiumblock
 tile.block_desh.name=Verstärketer Deshblock
+tile.block_yellowcake.name=Yellowcakeblock
 
 tile.ore_aluminium.name=Aluminiumerz
 tile.ore_copper.name=Kupfererz
@@ -528,6 +534,7 @@ tile.ore_rare.name=Seltenerden-Erz
 
 tile.ore_oil.name=Ölvorkommen
 tile.ore_oil_empty.name=Leeres Ölvorkommen
+tile.ore_oil_sand.name=Teersand
 
 tile.reinforced_brick.name=Verstärkter Stein
 tile.reinforced_glass.name=Verstärktes Glas
@@ -612,6 +619,8 @@ item.powder_niobium_tiny.name=Kleiner Haufen Niobstaub
 item.powder_cerium_tiny.name=Kleiner Haufen Cerstaub
 item.powder_lanthanium_tiny.name=Kleiner Haufen Lanthanstaub
 item.powder_actinium_tiny.name=Kleiner Haufen Actiniumstaub
+item.powder_yellowcake.name=Yellowcake
+item.powder_magic.name=Pulverisierte Verzauberung
 
 item.fragment_neodymium.name=Neodymfragment
 item.fragment_cobalt.name=Cobaltfragment
@@ -694,6 +703,8 @@ item.magnet_circular.name=Flachmagnet
 item.cyclotron_tower.name=Zyklotronenturm
 item.plate_dalekanium.name=Wütendes Metall
 item.biomass.name=Biomasse
+item.component_limiter.name=Stabilisatorkomponente
+item.component_emitter.name=Emitterkomponente
 
 item.cell_empty.name=Leere Zelle
 item.cell_uf6.name=Uranhexafluorit-Zelle
@@ -1131,6 +1142,7 @@ tile.yellow_barrel.name=Radioaktives Fass
 
 item.designator.name=Kurzdistanz Zielmarkierer
 item.designator_range.name=Weitstrecken-Zielmarkierer
+item.designator_manual.name=Manueller Zielmarkierer
 item.missile_generic.name=HE Rakete
 item.missile_anti_ballistic.name=Flugabwehrrakete (WIP)
 item.missile_incendiary.name=Brandrakete
@@ -1276,6 +1288,7 @@ item.cape_codered_.name=codered_s Cape
 
 tile.machine_converter_he_rf.name=HE zu RF Konverter
 tile.machine_converter_rf_he.name=RF zu HE Konverter
+tile.machine_transformer.name=Transformator
 
 item.schrabidium_hammer.name=Schrabidiumhammer
 item.shimmer_sledge.name=Shimmer Sledge
@@ -1332,6 +1345,7 @@ item.can_creature.name='Creature' Energy-Drink
 item.can_redbomb.name='Red Bomb' Energy-Drink
 item.can_mrsugar.name='Dr. Sugar' Softdrink
 item.can_overcharge.name=Overcharge Delirium XT
+item.can_luna.name=Black Mesa Luna - Dark Cola
 item.bottle_empty.name=Leere bombenförmige Glasflasche
 item.bottle_nuka.name=Nuka-Cola Flasche
 item.bottle_cherry.name=Nuka-Cherry Flasche
@@ -1413,11 +1427,20 @@ item.ams_catalyst_niobium.name=Niob-Reaktionskatalysator
 item.ams_catalyst_strontium.name=Strontium-Reaktionskatalysator
 item.ams_catalyst_thorium.name=Thorium-Reaktionskatalysator
 item.ams_catalyst_tungsten.name=Wolfram-Reaktionskatalysator
+item.ams_catalyst_schrabidium.name=Schrabidium-Reaktionskatalysator
+item.ams_catalyst_dineutronium.name=Dineutronium-Reaktionskatalysator
 
 item.ams_focus_blank.name=Blanker Stabilisierungsfokus
 item.ams_focus_limiter.name=Beschränkender Stabilisierungsfokus
 item.ams_focus_booster.name=Verstärkender Stabilisierungsfokus
 
+item.ams_muzzle.name=Strahlenemissions-Mündung
+
+item.ams_core_sing.name=Vibrierende Singularität (AMS-Kern)
+item.ams_core_wormhole.name=Winziges Wurmloch (AMS-Kern)
+item.ams_core_eyeofharmony.name=Auge der Harmonie (AMS-Kern)
+item.ams_core_thingy.name=Dings (AMS-Kern)
+
 item.crystal_energy.name=Energiekristall
 item.pellet_coolant.name=Kühlcluster
 
@@ -1454,7 +1477,7 @@ item.reer_graar.name=The Reer Graar
 
 item.letter.name=Eilbrief
 item.polaroid.name=Das Polaroid
-item.glitch.name=Glitch [WIP]
+item.glitch.name=Glitch
 item.book_secret.name=3-596-50802-9
 item.burnt_bark.name=Verbrannte Rinde
 

assets/hbm/lang/en_US.lang

@@ -9,6 +9,8 @@ achievement.sacrifice.desc=Face the fire and live.
 achievement.impossible=Literally impossible
 achievement.impossible.desc=You can't get this achievement.
 
+potion.hbm_taint=Tainted
+
 hbmfluid.none=None
 hbmfluid.water=Water
 hbmfluid.steam=Steam
@@ -50,6 +52,8 @@ chem.FP_NAPHTHA=Naphtha Processing
 chem.FP_LIGHTOIL=Light Oil Processing
 chem.FR_REOIL=Oil Reprocessing
 chem.FR_PETROIL=Petroil Mixing
+chem.OIL_SAND=Tar Sand Extraction
+chem.FC_BITUMEN=Bitumen Cracking
 chem.FC_I_NAPHTHA=Industrial Oil Cracking
 chem.FC_GAS_PETROLEUM=Gas Cracking
 chem.FC_DIESEL_KEROSENE=Diesel Cracking
@@ -83,6 +87,7 @@ chem.SF_BIOFUEL=Biofuel Solidification
 chem.POLYMER=Polymer Synthesis
 chem.DEUTERIUM=Deuterium Extraction
 chem.STEAM=Water Boiling
+chem.YELLOWCAKE=Yellowcake Production
 chem.UF6=Uranium Hexafluoride Production
 chem.PUF6=Plutonium Hexafluoride Production
 chem.BP_BIOGAS=Biogas Production
@@ -497,6 +502,7 @@ tile.block_unobtainium.name=Block of Unobtainium
 tile.block_daffergon.name=Block of Daffergon
 tile.block_verticium.name=Block of Verticium
 tile.block_desh.name=Reinforced Block of Desh
+tile.block_yellowcake.name=Block of Yellowcake
 
 tile.ore_aluminium.name=Aluminium Ore
 tile.ore_copper.name=Copper Ore
@@ -528,6 +534,7 @@ tile.ore_rare.name=Rare Earth Ore
 
 tile.ore_oil.name=Oil Deposit
 tile.ore_oil_empty.name=Empty Oil Deposit
+tile.ore_oil_sand.name=Tar Sand
 
 tile.reinforced_brick.name=Reinforced Stone
 tile.reinforced_glass.name=Reinforced Glass
@@ -614,7 +621,9 @@ item.powder_lanthanium_tiny.name=Tiny Pile of Lanthanium Powder
 item.powder_actinium_tiny.name=Tiny Pile of Actinium Powder
 item.powder_euphemium.name=Euphemium Powder
 item.powder_meteorite.name=Meteorite Powder
-item.powder_meteorite_tiny.name=Tiny Pile of Ḿeteorite Powder
+item.powder_meteorite_tiny.name=Tiny Pile of Meteorite Powder
+item.powder_yellowcake.name=Yellowcake
+item.powder_magic.name=Pulverized Enchantment
 
 item.fragment_neodymium.name=Neodymium Fragment
 item.fragment_cobalt.name=Cobalt Fragment
@@ -697,6 +706,8 @@ item.magnet_circular.name=Flat Magnet
 item.cyclotron_tower.name=Cyclotron Tower
 item.plate_dalekanium.name=Angry Metal
 item.biomass.name=Biomass
+item.component_limiter.name=Stabilizer Component
+item.component_emitter.name=Emitter Component
 
 item.cell_empty.name=Empty Cell
 item.cell_uf6.name=Uranium Hexafluorite Cell
@@ -1134,6 +1145,7 @@ tile.yellow_barrel.name=Radioactive Barrel
 
 item.designator.name=Short Range Target Designator
 item.designator_range.name=Long Range Target Designator
+item.designator_manual.name=Manual Target Designator
 item.missile_generic.name=High Explosive Missile
 item.missile_anti_ballistic.name=Anti Ballistic Missile (WIP)
 item.missile_incendiary.name=Incendiary Missile
@@ -1279,6 +1291,7 @@ item.cape_codered_.name=codered_'s Cape
 
 tile.machine_converter_he_rf.name=HE to RF Converter
 tile.machine_converter_rf_he.name=RF to HE Converter
+tile.machine_transformer.name=Transformer
 
 item.schrabidium_hammer.name=Schrabidium Hammer
 item.shimmer_sledge.name=Shimmer Sledge
@@ -1335,6 +1348,7 @@ item.can_creature.name='Creature' Energy Drink
 item.can_redbomb.name='Red Bomb' Energy Drink
 item.can_mrsugar.name='Dr. Sugar' Soft Drink
 item.can_overcharge.name=Overcharge Delirium XT
+item.can_luna.name=Black Mesa Luna - Dark Cola
 item.bottle_empty.name=Empty Bomb-Shaped Bottle
 item.bottle_nuka.name=Bottle of Nuka Cola
 item.bottle_cherry.name=Bottle of Nuka Cherry
@@ -1416,11 +1430,20 @@ item.ams_catalyst_niobium.name=Niobium Reaction Catalyst
 item.ams_catalyst_strontium.name=Strontium Reaction Catalyst
 item.ams_catalyst_thorium.name=Thorium Reaction Catalyst
 item.ams_catalyst_tungsten.name=Tungsten Reaction Catalyst
+item.ams_catalyst_schrabidium.name=Schrabidium Reaction Catalyst
+item.ams_catalyst_dineutronium.name=Dineutronium Reaction Catalyst
 
 item.ams_focus_blank.name=Blank Stabilizer Focus
 item.ams_focus_limiter.name=Limiting Stabilizer Focus
 item.ams_focus_booster.name=Boosting Stabilizer Focus
 
+item.ams_muzzle.name=Ray-Emission Muzzle
+
+item.ams_core_sing.name=Vibrant Singularity (AMS Core)
+item.ams_core_wormhole.name=Tiny Wormhole (AMS Core)
+item.ams_core_eyeofharmony.name=Eye of Harmony (AMS Core)
+item.ams_core_thingy.name=Thingy (AMS Core)
+
 item.crystal_energy.name=Energy Crystal
 item.pellet_coolant.name=Coolant Cluster
 
@@ -1457,7 +1480,7 @@ item.reer_graar.name=The Reer Graar
 
 item.letter.name=Express Mail
 item.polaroid.name=The Polaroid
-item.glitch.name=Glitch [WIP]
+item.glitch.name=Glitch
 item.book_secret.name=3-596-50802-9
 item.burnt_bark.name=Burnt Bark
 

com/hbm/blocks/ModBlocks.java

@@ -75,6 +75,7 @@ public class ModBlocks {
 
 	public static Block ore_oil;
 	public static Block ore_oil_empty;
+	public static Block ore_oil_sand;
 
 	public static Block ore_tikite;
 
@@ -99,6 +100,7 @@ public class ModBlocks {
 	public static Block block_magnetized_tungsten;
 	public static Block block_combine_steel;
 	public static Block block_desh;
+	public static Block block_yellowcake;
 
 	public static Block block_australium;
 	public static Block block_weidanium;
@@ -264,6 +266,8 @@ public class ModBlocks {
 	public static Block gas_duct;
 	public static Block fluid_duct;
 
+	public static Block machine_transformer;
+
 	public static Block bomb_multi_large;
 	public static final int guiID_bomb_multi_large = 18;
 
@@ -514,6 +518,7 @@ public class ModBlocks {
 
 		ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil");
 		ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty");
+		ore_oil_sand = new BlockGeneric(Material.sand).setBlockName("ore_oil_sand").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeSand).setHardness(0.5F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_sand_alt");
 		
 		ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt");
 		
@@ -539,6 +544,7 @@ public class ModBlocks {
 		block_magnetized_tungsten = new BlockGeneric(Material.iron).setBlockName("block_magnetized_tungsten").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(35.0F).setBlockTextureName(RefStrings.MODID + ":block_magnetized_tungsten");
 		block_combine_steel = new BlockGeneric(Material.iron).setBlockName("block_combine_steel").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_combine_steel");
 		block_desh = new BlockGeneric(Material.iron).setBlockName("block_desh").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_desh");
+		block_yellowcake = new BlockFalling(Material.sand).setBlockName("block_yellowcake").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeSand).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_yellowcake");
 
 		block_australium = new BlockGeneric(Material.iron).setBlockName("block_australium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_australium");
 		block_weidanium = new BlockGeneric(Material.iron).setBlockName("block_weidanium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_weidanium");
@@ -674,6 +680,8 @@ public class ModBlocks {
 		gas_duct_solid = new GasDuctSolid(Material.iron).setBlockName("gas_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":gas_duct_solid");
 		gas_duct = new BlockGasDuct(Material.iron).setBlockName("gas_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":gas_duct_icon");
 		fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon");
+		
+		machine_transformer = new MachineTransformer(Material.iron).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_transformer");
 
 		factory_titanium_hull = new BlockGeneric(Material.iron).setBlockName("factory_titanium_hull").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":factory_titanium_hull");
 		factory_titanium_furnace = new FactoryHatch(Material.iron).setBlockName("factory_titanium_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":factory_titanium_furnace");
@@ -855,6 +863,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(ore_lead, ore_lead.getUnlocalizedName());
 		GameRegistry.registerBlock(ore_oil, ore_oil.getUnlocalizedName());
 		GameRegistry.registerBlock(ore_oil_empty, ore_oil_empty.getUnlocalizedName());
+		GameRegistry.registerBlock(ore_oil_sand, ore_oil_sand.getUnlocalizedName());
 		GameRegistry.registerBlock(ore_schrabidium, ItemSchrabidiumBlock.class, ore_schrabidium.getUnlocalizedName());
 		
 		//Rare Minerals
@@ -891,6 +900,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(block_beryllium, block_beryllium.getUnlocalizedName());
 		GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName());
 		GameRegistry.registerBlock(block_lead, block_lead.getUnlocalizedName());
+		GameRegistry.registerBlock(block_yellowcake, block_yellowcake.getUnlocalizedName());
 		GameRegistry.registerBlock(block_scrap, block_scrap.getUnlocalizedName());
 		GameRegistry.registerBlock(block_electrical_scrap, block_electrical_scrap.getUnlocalizedName());
 		GameRegistry.registerBlock(block_trinitite, block_trinitite.getUnlocalizedName());
@@ -1045,6 +1055,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(gas_duct_solid, gas_duct_solid.getUnlocalizedName());
 		GameRegistry.registerBlock(fluid_duct, fluid_duct.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_battery, machine_battery.getUnlocalizedName());
+		GameRegistry.registerBlock(machine_transformer, machine_transformer.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_converter_he_rf, machine_converter_he_rf.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_converter_rf_he, machine_converter_rf_he.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_electric_furnace_off, machine_electric_furnace_off.getUnlocalizedName());

com/hbm/blocks/machine/MachineTransformer.java

@@ -0,0 +1,44 @@
+package com.hbm.blocks.machine;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.machine.TileEntityMachineTransformer;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class MachineTransformer extends BlockContainer {
+	
+	@SideOnly(Side.CLIENT)
+	private IIcon iconTop;
+
+	public MachineTransformer(Material p_i45394_1_) {
+		super(p_i45394_1_);
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iconRegister) {
+		
+		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top");
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer");
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int metadata) {
+		return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityMachineTransformer();
+	}
+}

com/hbm/inventory/MachineRecipes.java

@@ -3789,8 +3789,12 @@ public class MachineRecipes {
         case BP_BIOGAS:
 			list.add(new ItemStack(ModItems.biomass, 16));
 			break;
-        case UF6:
+        case YELLOWCAKE:
 			list.add(new ItemStack(ModItems.powder_uranium, 1));
+			list.add(new ItemStack(ModItems.sulfur, 2));
+			break;
+        case UF6:
+			list.add(new ItemStack(ModItems.powder_yellowcake, 1));
 			list.add(new ItemStack(ModItems.fluorite, 3));
 			break;
         case PUF6:
@@ -3804,6 +3808,9 @@ public class MachineRecipes {
         case NITAN:
 			list.add(new ItemStack(ModItems.powder_nitan_mix, 2));
 			break;
+        case OIL_SAND:
+			list.add(new ItemStack(ModBlocks.ore_oil_sand, 16));
+			break;
 		default:
 			break;
 		}
@@ -3841,6 +3848,10 @@ public class MachineRecipes {
 			input[0] = new FluidStack(800, FluidType.RECLAIMED);
 			input[1] = new FluidStack(200, FluidType.LUBRICANT);
 			break;
+        case FC_BITUMEN:
+			input[0] = new FluidStack(1200, FluidType.BITUMEN);
+			input[1] = new FluidStack(2400, FluidType.STEAM);
+			break;
         case FC_I_NAPHTHA:
 			input[0] = new FluidStack(1400, FluidType.SMEAR);
 			input[1] = new FluidStack(800, FluidType.WATER);
@@ -3954,6 +3965,9 @@ public class MachineRecipes {
         case BP_BIOFUEL:
 			input[0] = new FluidStack(2000, FluidType.BIOGAS);
         	break;
+        case YELLOWCAKE:
+			input[0] = new FluidStack(500, FluidType.ACID);
+        	break;
         case UF6:
 			input[0] = new FluidStack(1000, FluidType.WATER);
         	break;
@@ -3966,6 +3980,9 @@ public class MachineRecipes {
         case NITAN:
 			input[0] = new FluidStack(600, FluidType.KEROSENE);
         	break;
+        case OIL_SAND:
+			input[0] = new FluidStack(400, FluidType.BITUMEN);
+        	break;
 		default:
 			break;
 		}
@@ -4059,6 +4076,9 @@ public class MachineRecipes {
         case POLYMER:
 			output[0] = new ItemStack(ModItems.ingot_polymer, 1);
         	break;
+        case YELLOWCAKE:
+			output[0] = new ItemStack(ModItems.powder_yellowcake, 1);
+        	break;
 		default:
 			break;
 		}
@@ -4096,6 +4116,10 @@ public class MachineRecipes {
         case FR_PETROIL:
 			input[0] = new FluidStack(1000, FluidType.PETROIL);
 			break;
+        case FC_BITUMEN:
+			input[0] = new FluidStack(1000, FluidType.OIL);
+			input[1] = new FluidStack(200, FluidType.PETROLEUM);
+			break;
         case FC_I_NAPHTHA:
 			input[0] = new FluidStack(800, FluidType.NAPHTHA);
 			break;
@@ -4153,6 +4177,9 @@ public class MachineRecipes {
         case NITAN:
 			input[0] = new FluidStack(1000, FluidType.NITAN);
         	break;
+        case OIL_SAND:
+			input[0] = new FluidStack(1000, FluidType.BITUMEN);
+        	break;
 		default:
 			break;
 		}

com/hbm/inventory/container/ContainerAMSBase.java

@@ -15,14 +15,10 @@ public class ContainerAMSBase extends Container {
 private TileEntityAMSBase amsBase;
 
 	private int heat;
-	private int field;
-	private int efficiency;
 	private int warning;
 	private int mode;
 	
 	public ContainerAMSBase(InventoryPlayer invPlayer, TileEntityAMSBase tedf) {
-		field = 0;
-		efficiency = 0;
 		amsBase = tedf;
 
 		//Cool 1 In
@@ -114,21 +110,11 @@ private TileEntityAMSBase amsBase;
 				par1.sendProgressBarUpdate(this, 0, this.amsBase.heat);
 			}
 			
-			if(this.efficiency != this.amsBase.efficiency)
-			{
-				par1.sendProgressBarUpdate(this, 1, this.amsBase.efficiency);
-			}
-			
 			if(this.warning != this.amsBase.warning)
 			{
 				par1.sendProgressBarUpdate(this, 2, this.amsBase.warning);
 			}
 			
-			if(this.field != this.amsBase.field)
-			{
-				par1.sendProgressBarUpdate(this, 3, this.amsBase.field);
-			}
-			
 			if(this.mode != this.amsBase.mode)
 			{
 				par1.sendProgressBarUpdate(this, 4, this.amsBase.mode);
@@ -136,8 +122,6 @@ private TileEntityAMSBase amsBase;
 		}
 
 		this.heat = this.amsBase.heat;
-		this.field = this.amsBase.field;
-		this.efficiency = this.amsBase.efficiency;
 		this.warning = this.amsBase.warning;
 		this.mode = this.amsBase.mode;
 	}

com/hbm/inventory/container/ContainerAMSEmitter.java

@@ -15,11 +15,9 @@ public class ContainerAMSEmitter extends Container {
 private TileEntityAMSEmitter amsEmitter;
 
 	private int heat;
-	private int efficiency;
 	private int warning;
 	
 	public ContainerAMSEmitter(InventoryPlayer invPlayer, TileEntityAMSEmitter tedf) {
-		efficiency = 0;
 		amsEmitter = tedf;
 
 		//Fluid In
@@ -96,11 +94,6 @@ private TileEntityAMSEmitter amsEmitter;
 				par1.sendProgressBarUpdate(this, 0, this.amsEmitter.heat);
 			}
 			
-			if(this.efficiency != this.amsEmitter.efficiency)
-			{
-				par1.sendProgressBarUpdate(this, 1, this.amsEmitter.efficiency);
-			}
-			
 			if(this.warning != this.amsEmitter.warning)
 			{
 				par1.sendProgressBarUpdate(this, 2, this.amsEmitter.warning);
@@ -108,7 +101,6 @@ private TileEntityAMSEmitter amsEmitter;
 		}
 
 		this.heat = this.amsEmitter.heat;
-		this.efficiency = this.amsEmitter.efficiency;
 		this.warning = this.amsEmitter.warning;
 	}
 	
@@ -118,10 +110,6 @@ private TileEntityAMSEmitter amsEmitter;
 		{
 			amsEmitter.heat = j;
 		}
-		if(i == 1)
-		{
-			amsEmitter.efficiency = j;
-		}
 		if(i == 2)
 		{
 			amsEmitter.warning = j;

com/hbm/inventory/container/ContainerAMSLimiter.java

@@ -16,12 +16,10 @@ public class ContainerAMSLimiter extends Container {
 private TileEntityAMSLimiter amsLmiter;
 
 	private int heat;
-	private int efficiency;
 	private int warning;
 	private int mode;
 	
 	public ContainerAMSLimiter(InventoryPlayer invPlayer, TileEntityAMSLimiter tedf) {
-		efficiency = 0;
 		amsLmiter = tedf;
 
 		//Fluid In
@@ -98,11 +96,6 @@ private TileEntityAMSLimiter amsLmiter;
 				par1.sendProgressBarUpdate(this, 0, this.amsLmiter.heat);
 			}
 			
-			if(this.efficiency != this.amsLmiter.efficiency)
-			{
-				par1.sendProgressBarUpdate(this, 1, this.amsLmiter.efficiency);
-			}
-			
 			if(this.warning != this.amsLmiter.warning)
 			{
 				par1.sendProgressBarUpdate(this, 2, this.amsLmiter.warning);
@@ -115,7 +108,6 @@ private TileEntityAMSLimiter amsLmiter;
 		}
 
 		this.heat = this.amsLmiter.heat;
-		this.efficiency = this.amsLmiter.efficiency;
 		this.warning = this.amsLmiter.warning;
 		this.mode = this.amsLmiter.mode;
 	}
@@ -126,10 +118,6 @@ private TileEntityAMSLimiter amsLmiter;
 		{
 			amsLmiter.heat = j;
 		}
-		if(i == 1)
-		{
-			amsLmiter.efficiency = j;
-		}
 		if(i == 2)
 		{
 			amsLmiter.warning = j;

com/hbm/items/ModItems.java

@@ -92,6 +92,7 @@ public class ModItems {
 	public static Item nugget_desh;
 	public static Item ingot_dineutronium;
 	public static Item nugget_dineutronium;
+	public static Item powder_dineutronium;
 
 	public static Item nugget_uranium;
 	public static Item nugget_u235;
@@ -211,6 +212,8 @@ public class ModItems {
 	public static Item powder_desh_mix;
 	public static Item powder_nitan_mix;
 	public static Item powder_spark_mix;
+	public static Item powder_yellowcake;
+	public static Item powder_magic;
 
 	public static Item fragment_neodymium;
 	public static Item fragment_cobalt;
@@ -249,6 +252,8 @@ public class ModItems {
 	public static Item magnet_dee;
 	public static Item magnet_circular;
 	public static Item cyclotron_tower;
+	public static Item component_limiter;
+	public static Item component_emitter;
 
 	public static Item circuit_raw;
 	public static Item circuit_aluminium;
@@ -398,13 +403,26 @@ public class ModItems {
 	public static Item ams_catalyst_cerium;
 	public static Item ams_catalyst_cobalt;
 	public static Item ams_catalyst_copper;
+	public static Item ams_catalyst_dineutronium;
 	public static Item ams_catalyst_euphemium;
 	public static Item ams_catalyst_iron;
 	public static Item ams_catalyst_lithium;
 	public static Item ams_catalyst_niobium;
+	public static Item ams_catalyst_schrabidium;
 	public static Item ams_catalyst_strontium;
 	public static Item ams_catalyst_thorium;
 	public static Item ams_catalyst_tungsten;
+
+	public static Item ams_focus_blank;
+	public static Item ams_focus_limiter;
+	public static Item ams_focus_booster;
+
+	public static Item ams_muzzle;
+
+	public static Item ams_core_sing;
+	public static Item ams_core_wormhole;
+	public static Item ams_core_eyeofharmony;
+	public static Item ams_core_thingy;
 	
 	public static Item cell_empty;
 	public static Item cell_uf6;
@@ -469,6 +487,7 @@ public class ModItems {
 	public static Item can_redbomb;
 	public static Item can_mrsugar;
 	public static Item can_overcharge;
+	public static Item can_luna;
 	public static Item bottle_empty;
 	public static Item bottle_nuka;
 	public static Item bottle_cherry;
@@ -812,10 +831,6 @@ public class ModItems {
 	public static Item factory_core_titanium;
 	public static Item factory_core_advanced;
 
-	public static Item ams_focus_blank;
-	public static Item ams_focus_limiter;
-	public static Item ams_focus_booster;
-
 	public static Item upgrade_template;
 	public static Item upgrade_speed_1;
 	public static Item upgrade_speed_2;
@@ -887,6 +902,9 @@ public class ModItems {
 	public static Item australium_iv;
 	public static Item australium_v;
 
+	public static Item jetpack_boost;
+	public static Item jetpack_fly;
+
 	public static Item schrabidium_sword;
 	public static Item schrabidium_pickaxe;
 	public static Item schrabidium_axe;
@@ -1209,6 +1227,7 @@ public class ModItems {
 		nugget_desh = new ItemCustomLore().setUnlocalizedName("nugget_desh").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_desh");
 		ingot_dineutronium = new ItemCustomLore().setUnlocalizedName("ingot_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dineutronium");
 		nugget_dineutronium = new ItemCustomLore().setUnlocalizedName("nugget_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_dineutronium");
+		powder_dineutronium = new ItemCustomLore().setUnlocalizedName("powder_dineutronium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_dineutronium");
 
 		ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_lanthanium");
 		ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_actinium");
@@ -1313,6 +1332,8 @@ public class ModItems {
 		powder_lanthanium_tiny = new Item().setUnlocalizedName("powder_lanthanium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium_tiny");
 		powder_actinium_tiny = new Item().setUnlocalizedName("powder_actinium_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_actinium_tiny");
 		powder_meteorite_tiny = new Item().setUnlocalizedName("powder_meteorite_tiny").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_meteorite_tiny");
+		powder_yellowcake = new ItemRadioactive().setUnlocalizedName("powder_yellowcake").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_yellowcake");
+		powder_magic = new Item().setUnlocalizedName("powder_magic").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_magic");
 
 		fragment_neodymium = new Item().setUnlocalizedName("fragment_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_neodymium");
 		fragment_cobalt = new Item().setUnlocalizedName("fragment_cobalt").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":fragment_cobalt");
@@ -1349,6 +1370,8 @@ public class ModItems {
 		magnet_circular = new Item().setUnlocalizedName("magnet_circular").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":magnet_circular");
 		cyclotron_tower = new Item().setUnlocalizedName("cyclotron_tower").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":cyclotron_tower");
 		pellet_coal = new Item().setUnlocalizedName("pellet_coal").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":pellet_coal");
+		component_limiter = new Item().setUnlocalizedName("component_limiter").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":component_limiter");
+		component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":component_emitter");
 		
 		cap_aluminium = new Item().setUnlocalizedName("cap_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":cap_aluminium");      
 		hull_small_steel = new Item().setUnlocalizedName("hull_small_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":hull_small_steel");
@@ -1439,19 +1462,21 @@ public class ModItems {
 		rune_thurisaz = new ItemCustomLore().setUnlocalizedName("rune_thurisaz").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_thurisaz");
 
 		ams_catalyst_blank = new Item().setUnlocalizedName("ams_catalyst_blank").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_blank");
-		ams_catalyst_aluminium = new ItemCatalyst(0xCCCCCC).setUnlocalizedName("ams_catalyst_aluminium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_aluminium");
-		ams_catalyst_beryllium = new ItemCatalyst(0x97978B).setUnlocalizedName("ams_catalyst_beryllium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_beryllium");
-		ams_catalyst_caesium = new ItemCatalyst(0x6400FF).setUnlocalizedName("ams_catalyst_caesium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_caesium");
-		ams_catalyst_cerium = new ItemCatalyst(0x1D3FFF).setUnlocalizedName("ams_catalyst_cerium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cerium");
-		ams_catalyst_cobalt = new ItemCatalyst(0x789BBE).setUnlocalizedName("ams_catalyst_cobalt").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cobalt");
-		ams_catalyst_copper = new ItemCatalyst(0xAADE29).setUnlocalizedName("ams_catalyst_copper").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_copper");
-		ams_catalyst_euphemium = new ItemCatalyst(0xFF9CD2).setUnlocalizedName("ams_catalyst_euphemium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_euphemium");
-		ams_catalyst_iron = new ItemCatalyst(0xFF7E22).setUnlocalizedName("ams_catalyst_iron").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_iron");
-		ams_catalyst_lithium = new ItemCatalyst(0xFF2727).setUnlocalizedName("ams_catalyst_lithium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_lithium");
-		ams_catalyst_niobium = new ItemCatalyst(0x3BF1B6).setUnlocalizedName("ams_catalyst_niobium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_niobium");
-		ams_catalyst_strontium = new ItemCatalyst(0xDD0D35).setUnlocalizedName("ams_catalyst_strontium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_strontium");
-		ams_catalyst_thorium = new ItemCatalyst(0x653B22).setUnlocalizedName("ams_catalyst_thorium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_thorium");
-		ams_catalyst_tungsten = new ItemCatalyst(0xF5FF48).setUnlocalizedName("ams_catalyst_tungsten").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_tungsten");
+		ams_catalyst_aluminium = 	new ItemCatalyst(0xCCCCCC, 1000000, 1.15F, 	0.85F, 	1.0F).setUnlocalizedName("ams_catalyst_aluminium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_aluminium");
+		ams_catalyst_beryllium = 	new ItemCatalyst(0x97978B, 0, 		1.25F, 	0.95F, 	1.0F).setUnlocalizedName("ams_catalyst_beryllium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_beryllium");
+		ams_catalyst_caesium = 		new ItemCatalyst(0x6400FF, 2500000, 1.0F, 	0.85F, 	1.0F).setUnlocalizedName("ams_catalyst_caesium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_caesium");
+		ams_catalyst_cerium = 		new ItemCatalyst(0x1D3FFF, 1000000, 1.15F, 	1.15F, 	1.0F).setUnlocalizedName("ams_catalyst_cerium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cerium");
+		ams_catalyst_cobalt = 		new ItemCatalyst(0x789BBE, 0, 		1.25F, 	1.05F, 	1.0F).setUnlocalizedName("ams_catalyst_cobalt").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_cobalt");
+		ams_catalyst_copper = 		new ItemCatalyst(0xAADE29, 0, 		1.25F, 	1.0F, 	1.0F).setUnlocalizedName("ams_catalyst_copper").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_copper");
+		ams_catalyst_dineutronium = new ItemCatalyst(0x334077, 2500000, 1.0F, 	1.15F, 	1.0F).setUnlocalizedName("ams_catalyst_dineutronium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_dineutronium");
+		ams_catalyst_euphemium = 	new ItemCatalyst(0xFF9CD2, 2500000, 1.0F, 	1.0F, 	1.0F).setUnlocalizedName("ams_catalyst_euphemium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_euphemium");
+		ams_catalyst_iron = 		new ItemCatalyst(0xFF7E22, 1000000, 1.15F, 	0.95F, 	1.0F).setUnlocalizedName("ams_catalyst_iron").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_iron");
+		ams_catalyst_lithium = 		new ItemCatalyst(0xFF2727, 0, 		1.25F, 	0.85F, 	1.0F).setUnlocalizedName("ams_catalyst_lithium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_lithium");
+		ams_catalyst_niobium = 		new ItemCatalyst(0x3BF1B6, 1000000, 1.15F, 	1.05F, 	1.0F).setUnlocalizedName("ams_catalyst_niobium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_niobium");
+		ams_catalyst_schrabidium = 	new ItemCatalyst(0x32FFFF, 2500000, 1.0F, 	1.05F, 	1.0F).setUnlocalizedName("ams_catalyst_schrabidium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_schrabidium");
+		ams_catalyst_strontium = 	new ItemCatalyst(0xDD0D35, 1000000, 1.15F, 	1.0F, 	1.0F).setUnlocalizedName("ams_catalyst_strontium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_strontium");
+		ams_catalyst_thorium = 		new ItemCatalyst(0x653B22, 2500000, 1.0F, 	0.95F, 	1.0F).setUnlocalizedName("ams_catalyst_thorium").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_thorium");
+		ams_catalyst_tungsten = 	new ItemCatalyst(0xF5FF48, 0, 		1.25F, 	1.15F, 	1.0F).setUnlocalizedName("ams_catalyst_tungsten").setCreativeTab(MainRegistry.tabParts).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_tungsten");
 		
 		cell_empty = new ItemCell().setUnlocalizedName("cell_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":cell_empty");
 		cell_uf6 = new Item().setUnlocalizedName("cell_uf6").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_uf6");
@@ -1553,6 +1578,7 @@ public class ModItems {
 		can_redbomb = new ItemEnergy().setUnlocalizedName("can_redbomb").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_redbomb");
 		can_mrsugar = new ItemEnergy().setUnlocalizedName("can_mrsugar").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_mrsugar");
 		can_overcharge = new ItemEnergy().setUnlocalizedName("can_overcharge").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_overcharge");
+		can_luna = new ItemEnergy().setUnlocalizedName("can_luna").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":can_luna");
 		bottle_empty = new Item().setUnlocalizedName("bottle_empty").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_empty");
 		bottle_nuka = new ItemEnergy().setUnlocalizedName("bottle_nuka").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_nuka");
 		bottle_cherry = new ItemEnergy().setUnlocalizedName("bottle_cherry").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle_cherry");
@@ -1882,9 +1908,14 @@ public class ModItems {
 		factory_core_titanium = new ItemBattery(70400).setUnlocalizedName("factory_core_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":factory_core_titanium");
 		factory_core_advanced = new ItemBattery(41600).setUnlocalizedName("factory_core_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":factory_core_advanced");
 
-		ams_focus_blank = new ItemCustomLore().setUnlocalizedName("ams_focus_blank").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_blank");
+		ams_focus_blank = new Item().setUnlocalizedName("ams_focus_blank").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_blank");
 		ams_focus_limiter = new ItemCustomLore().setUnlocalizedName("ams_focus_limiter").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_limiter");
 		ams_focus_booster = new ItemCustomLore().setUnlocalizedName("ams_focus_booster").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_focus_booster");
+		ams_muzzle = new ItemCustomLore().setUnlocalizedName("ams_muzzle").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_muzzle");
+		ams_core_sing = new ItemAMSCore().setUnlocalizedName("ams_core_sing").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_core_sing");
+		ams_core_wormhole = new ItemAMSCore().setUnlocalizedName("ams_core_wormhole").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_core_wormhole");
+		ams_core_eyeofharmony = new ItemAMSCore().setUnlocalizedName("ams_core_eyeofharmony").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ams_core_eyeofharmony");
+		ams_core_thingy = new ItemAMSCore().setUnlocalizedName("ams_core_thingy").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":ams_core_thingy");
 
 		upgrade_template = new ItemCustomLore().setUnlocalizedName("upgrade_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":upgrade_template");
 		upgrade_speed_1 = new ItemCustomLore().setUnlocalizedName("upgrade_speed_1").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":upgrade_speed_1");
@@ -2081,6 +2112,9 @@ public class ModItems {
 		australium_iii = new ArmorAustralium(MainRegistry.enumArmorMaterialAusIII, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii");
 		australium_iv = new ArmorAustralium(MainRegistry.enumArmorMaterialAusIV, 9, 1).setUnlocalizedName("australium_iv").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iv");
 		australium_v = new ArmorAustralium(MainRegistry.enumArmorMaterialAusV, 9, 1).setUnlocalizedName("australium_v").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_v");
+		
+		jetpack_boost = new JetpackBooster(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_boost").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost");
+		jetpack_fly = new JetpackRegular(MainRegistry.enumArmorMaterialSteel, 9, 1).setUnlocalizedName("jetpack_fly").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly");
 
 		cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test");
 		cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation");
@@ -2305,6 +2339,7 @@ public class ModItems {
 		GameRegistry.registerItem(powder_aluminium, powder_aluminium.getUnlocalizedName());
 		GameRegistry.registerItem(powder_steel, powder_steel.getUnlocalizedName());
 		GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName());
+		GameRegistry.registerItem(powder_yellowcake, powder_yellowcake.getUnlocalizedName());
 		GameRegistry.registerItem(powder_beryllium, powder_beryllium.getUnlocalizedName());
 		GameRegistry.registerItem(powder_dura_steel, powder_dura_steel.getUnlocalizedName());
 		GameRegistry.registerItem(powder_polymer, powder_polymer.getUnlocalizedName());
@@ -2331,11 +2366,14 @@ 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_magic, powder_magic.getUnlocalizedName());
 		GameRegistry.registerItem(powder_desh_mix, powder_desh_mix.getUnlocalizedName());
 		GameRegistry.registerItem(powder_desh, powder_desh.getUnlocalizedName());
 		GameRegistry.registerItem(powder_nitan_mix, powder_nitan_mix.getUnlocalizedName());
 		GameRegistry.registerItem(powder_spark_mix, powder_spark_mix.getUnlocalizedName());
 		GameRegistry.registerItem(powder_meteorite, powder_meteorite.getUnlocalizedName());
+		GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName());
+		GameRegistry.registerItem(powder_dineutronium, powder_dineutronium.getUnlocalizedName());
 		GameRegistry.registerItem(dust, dust.getUnlocalizedName());
 		GameRegistry.registerItem(powder_lithium_tiny, powder_lithium_tiny.getUnlocalizedName());
 		GameRegistry.registerItem(powder_neodymium_tiny, powder_neodymium_tiny.getUnlocalizedName());
@@ -2345,7 +2383,6 @@ public class ModItems {
 		GameRegistry.registerItem(powder_lanthanium_tiny, powder_lanthanium_tiny.getUnlocalizedName());
 		GameRegistry.registerItem(powder_actinium_tiny, powder_actinium_tiny.getUnlocalizedName());
 		GameRegistry.registerItem(powder_meteorite_tiny, powder_meteorite_tiny.getUnlocalizedName());
-		GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName());
 		
 		//Powders
 		GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName());
@@ -2465,6 +2502,10 @@ public class ModItems {
 		GameRegistry.registerItem(telepad, telepad.getUnlocalizedName());
 		GameRegistry.registerItem(entanglement_kit, entanglement_kit.getUnlocalizedName());
 		
+		//AMS Parts
+		GameRegistry.registerItem(component_limiter, component_limiter.getUnlocalizedName());
+		GameRegistry.registerItem(component_emitter, component_emitter.getUnlocalizedName());
+		
 		//Bomb Parts
 		GameRegistry.registerItem(cap_aluminium, cap_aluminium.getUnlocalizedName());
 		GameRegistry.registerItem(hull_small_steel, hull_small_steel.getUnlocalizedName());
@@ -2750,9 +2791,11 @@ public class ModItems {
 		GameRegistry.registerItem(ams_catalyst_cobalt, ams_catalyst_cobalt.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_copper, ams_catalyst_copper.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_euphemium, ams_catalyst_euphemium.getUnlocalizedName());
+		GameRegistry.registerItem(ams_catalyst_dineutronium, ams_catalyst_dineutronium.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_iron, ams_catalyst_iron.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_lithium, ams_catalyst_lithium.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_niobium, ams_catalyst_niobium.getUnlocalizedName());
+		GameRegistry.registerItem(ams_catalyst_schrabidium, ams_catalyst_schrabidium.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_strontium, ams_catalyst_strontium.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_thorium, ams_catalyst_thorium.getUnlocalizedName());
 		GameRegistry.registerItem(ams_catalyst_tungsten, ams_catalyst_tungsten.getUnlocalizedName());
@@ -2775,6 +2818,11 @@ public class ModItems {
 		GameRegistry.registerItem(ams_focus_blank, ams_focus_blank.getUnlocalizedName());
 		GameRegistry.registerItem(ams_focus_limiter, ams_focus_limiter.getUnlocalizedName());
 		GameRegistry.registerItem(ams_focus_booster, ams_focus_booster.getUnlocalizedName());
+		GameRegistry.registerItem(ams_muzzle, ams_muzzle.getUnlocalizedName());
+		GameRegistry.registerItem(ams_core_sing, ams_core_sing.getUnlocalizedName());
+		GameRegistry.registerItem(ams_core_wormhole, ams_core_wormhole.getUnlocalizedName());
+		GameRegistry.registerItem(ams_core_eyeofharmony, ams_core_eyeofharmony.getUnlocalizedName());
+		GameRegistry.registerItem(ams_core_thingy, ams_core_thingy.getUnlocalizedName());
 		
 		//Fuel Rods
 		GameRegistry.registerItem(rod_empty, rod_empty.getUnlocalizedName());
@@ -3151,6 +3199,7 @@ public class ModItems {
 		GameRegistry.registerItem(can_redbomb, can_redbomb.getUnlocalizedName());
 		GameRegistry.registerItem(can_mrsugar, can_mrsugar.getUnlocalizedName());
 		GameRegistry.registerItem(can_overcharge, can_overcharge.getUnlocalizedName());
+		GameRegistry.registerItem(can_luna, can_luna.getUnlocalizedName());
 		
 		//Cola
 		GameRegistry.registerItem(bottle_empty, bottle_empty.getUnlocalizedName());
@@ -3269,6 +3318,8 @@ public class ModItems {
 		GameRegistry.registerItem(watch, watch.getUnlocalizedName());
 		GameRegistry.registerItem(mask_of_infamy, mask_of_infamy.getUnlocalizedName());
 		GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName());
+		GameRegistry.registerItem(jetpack_boost, jetpack_boost.getUnlocalizedName());
+		GameRegistry.registerItem(jetpack_fly, jetpack_fly.getUnlocalizedName());
 		//GameRegistry.registerItem(australium_iv, australium_iv.getUnlocalizedName());
 		//GameRegistry.registerItem(australium_v, australium_v.getUnlocalizedName());
 		

com/hbm/items/food/ItemEnergy.java

@@ -58,6 +58,13 @@ public class ItemEnergy extends Item {
                 p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 30 * 20, 2));
                 p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 0));
         	}
+        	if(this == ModItems.can_luna)
+        	{
+                p_77654_3_.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 30 * 20, 1));
+                p_77654_3_.addPotionEffect(new PotionEffect(Potion.resistance.id, 30 * 20, 2));
+                p_77654_3_.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 1));
+                p_77654_3_.addPotionEffect(new PotionEffect(Potion.regeneration.id, 30 * 20, 2));
+        	}
         	if(this == ModItems.chocolate_milk)
         	{
         		ExplosionLarge.explode(p_77654_2_, p_77654_3_.posX, p_77654_3_.posY, p_77654_3_.posZ, 50, true, false, false);
@@ -121,7 +128,9 @@ public class ItemEnergy extends Item {
 
         if (!p_77654_3_.capabilities.isCreativeMode && this != ModItems.chocolate_milk)
         {
-        	if(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart) {
+        	if(this == ModItems.can_creature || this == ModItems.can_mrsugar || 
+        			this == ModItems.can_overcharge || this == ModItems.can_redbomb || 
+        			this == ModItems.can_smart || this == ModItems.can_luna) {
             	p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.ring_pull));
         		if (p_77654_1_.stackSize <= 0)
             	{
@@ -200,7 +209,10 @@ public class ItemEnergy extends Item {
     @Override
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
     {
-    	if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart || this == ModItems.chocolate_milk))
+    	if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || 
+    			this == ModItems.can_overcharge || this == ModItems.can_redbomb || 
+    			this == ModItems.can_smart || this == ModItems.chocolate_milk || 
+    			this == ModItems.can_luna))
     		if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener))
     			return p_77659_1_;
     	
@@ -233,6 +245,10 @@ public class ItemEnergy extends Item {
     	{
             list.add("Possible side effects include heart attacks, seizures or zombification");
     	}
+    	if(this == ModItems.can_luna)
+    	{
+            list.add("Contains actual selenium and star metal. Tastes like night.");
+    	}
     	if(this == ModItems.chocolate_milk)
     	{
             list.add("Regular chocolate milk. Safe to drink.");

com/hbm/items/gear/JetpackBooster.java

@@ -0,0 +1,110 @@
+package com.hbm.items.gear;
+
+import com.hbm.entity.particle.EntityGasFlameFX;
+import com.hbm.items.ModItems;
+import com.hbm.render.model.ModelGoggles;
+import com.hbm.render.model.ModelJetPack;
+import com.hbm.render.model.ModelOxygenMask;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class JetpackBooster extends ItemArmor {
+
+	private ModelJetPack model;
+
+	public JetpackBooster(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) {
+		super(p_i45325_1_, p_i45325_2_, p_i45325_3_);
+	}
+
+
+	@Override
+	public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) {
+		return armorType == 1;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
+		if (armorSlot == 1) {
+			if (model == null) {
+				this.model = new ModelJetPack();
+			}
+			return this.model;
+		}
+		
+		return null;
+	}
+
+	@Override
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
+		return "hbm:textures/models/JetPack.png";
+	}
+
+	public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
+    	
+    	if(player.isSneaking() && this.getBoost(stack) == 0 && this.getCooldown(stack) == 0) {
+    		this.setBoost(stack, 15);
+    		this.setCooldown(stack, 40);
+    	}
+    	
+    	if(this.getBoost(stack) > 0) {
+    		
+    		Vec3 vec = Vec3.createVectorHelper(player.getLookVec().xCoord, 0, player.getLookVec().zCoord);
+    		vec.normalize();
+    		player.motionY += 0.15;
+    		
+    		this.setBoost(stack, this.getBoost(stack) - 1);
+    		EntityGasFlameFX fx = new EntityGasFlameFX(world);
+    		fx.posX = player.posX - vec.xCoord;
+    		fx.posY = player.posY - 1;
+    		fx.posZ = player.posZ - vec.zCoord;
+    		fx.motionY = -0.1;
+    		world.spawnEntityInWorld(fx);
+    		
+    		if(player.motionY > 0)
+    			player.fallDistance = 0;
+    	}
+    	
+    	if(this.getCooldown(stack) > 0)
+    		this.setCooldown(stack, this.getCooldown(stack) - 1);
+    }
+    
+    public void setBoost(ItemStack stack, int i) {
+    	if(!stack.hasTagCompound())
+    		stack.stackTagCompound = new NBTTagCompound();
+    	
+    	stack.stackTagCompound.setInteger("boost", i);
+    }
+    
+    public int getBoost(ItemStack stack) {
+    	if(!stack.hasTagCompound())
+    		return 0;
+    	
+    	return stack.stackTagCompound.getInteger("boost");
+    }
+    
+    public void setCooldown(ItemStack stack, int i) {
+    	if(!stack.hasTagCompound())
+    		stack.stackTagCompound = new NBTTagCompound();
+    	
+    	stack.stackTagCompound.setInteger("cool", i);
+    }
+    
+    public int getCooldown(ItemStack stack) {
+    	if(!stack.hasTagCompound())
+    		return 0;
+    	
+    	return stack.stackTagCompound.getInteger("cool");
+    }
+
+}

com/hbm/items/gear/JetpackRegular.java

@@ -0,0 +1,72 @@
+package com.hbm.items.gear;
+
+import com.hbm.entity.particle.EntityGasFlameFX;
+import com.hbm.items.ModItems;
+import com.hbm.render.model.ModelGoggles;
+import com.hbm.render.model.ModelJetPack;
+import com.hbm.render.model.ModelOxygenMask;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+
+public class JetpackRegular extends ItemArmor {
+
+	private ModelJetPack model;
+
+	public JetpackRegular(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) {
+		super(p_i45325_1_, p_i45325_2_, p_i45325_3_);
+	}
+
+
+	@Override
+	public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) {
+		return armorType == 1;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
+		if (armorSlot == 1) {
+			if (model == null) {
+				this.model = new ModelJetPack();
+			}
+			return this.model;
+		}
+		
+		return null;
+	}
+
+	@Override
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
+		return "hbm:textures/models/JetPackRed.png";
+	}
+
+	public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
+    	
+    	if(player.isSneaking()) {
+    		
+    		Vec3 vec = Vec3.createVectorHelper(player.getLookVec().xCoord, 0, player.getLookVec().zCoord);
+    		vec.normalize();
+    		player.motionY += 0.1;
+    		
+    		EntityGasFlameFX fx = new EntityGasFlameFX(world);
+    		fx.posX = player.posX - vec.xCoord;
+    		fx.posY = player.posY - 1;
+    		fx.posZ = player.posZ - vec.zCoord;
+    		fx.motionY = -0.1;
+    		world.spawnEntityInWorld(fx);
+    		
+    		player.fallDistance = 0;
+    	}
+    }
+
+}

com/hbm/items/special/ItemAMSCore.java

@@ -0,0 +1,92 @@
+package com.hbm.items.special;
+
+import java.util.List;
+
+import com.hbm.items.ModItems;
+import com.hbm.main.MainRegistry;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class ItemAMSCore extends Item {
+
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
+
+		if (this == ModItems.ams_core_sing) {
+			list.add("A modified undefined state of spacetime");
+			list.add("used to aid in inter-gluon fusion and");
+			list.add("spacetime annihilation. Yes, this destroys");
+			list.add("the universe itself, slowly but steadily,");
+			list.add("but at least you can power your toaster with");
+			list.add("this, so it's all good.");
+		}
+
+		if (this == ModItems.ams_core_wormhole) {
+			list.add("A cloud of billions of nano-wormholes which");
+			list.add("deliberately fail at tunneling matter from");
+			list.add("another dimension, rather it converts all");
+			list.add("that matter into pure energy. That means");
+			list.add("you're actively contributing to the destruction");
+			list.add("of another dimension, sucking it dry like a");
+			list.add("juicebox.");
+			list.add("That dimension probably sucked, anyways. I");
+			list.add("bet it was full of wasps or some crap, man,");
+			list.add("I hate these things.");
+		}
+
+		if (this == ModItems.ams_core_eyeofharmony) {
+			list.add("A star collapsing in on itself, mere nanoseconds");
+			list.add("away from being turned into a black hole,");
+			list.add("frozen in time. If I didn't know better I");
+			list.add("would say this is some deep space magic");
+			list.add("bullcrap some guy made up to sound intellectual.");
+			list.add("Probably Steve from accounting. You still owe me");
+			list.add("ten bucks.");
+		}
+
+		if (this == ModItems.ams_core_thingy) {
+			if(MainRegistry.polaroidID == 11) {
+				list.add("Yeah I'm not even gonna question that one.");
+			} else {
+				list.add("...");
+				list.add("...");
+				list.add("...am I even holding this right?");
+				list.add("It's a small metal thing. I dunno where it's from");
+				list.add("or what it does, maybe they found it on a");
+				list.add("junkyard and sold it as some kind of antique");
+				list.add("artifact. If it weren't for the fact that I can");
+				list.add("actually stuff this into some great big laser");
+				list.add("reactor thing, I'd probably bring it back to where");
+				list.add("it belongs. In the trash.");
+			}
+		}
+	}
+
+    @Override
+	public EnumRarity getRarity(ItemStack p_77613_1_) {
+
+    	if(this == ModItems.ams_core_thingy)
+    	{
+    		return EnumRarity.epic;
+    	}
+    	
+    	return EnumRarity.uncommon;
+    }
+
+    @Override
+	@SideOnly(Side.CLIENT)
+    public boolean hasEffect(ItemStack p_77636_1_)
+    {
+    	if(this == ModItems.ams_core_thingy && MainRegistry.polaroidID == 11)
+    	{
+    		return true;
+    	}
+    	
+    	return false;
+    }
+}

com/hbm/items/special/ItemCatalyst.java

@@ -1,17 +1,48 @@
 package com.hbm.items.special;
 
+import java.util.List;
+
+import com.hbm.items.ModItems;
+
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 
 public class ItemCatalyst extends Item {
-	
+
 	int color;
+	int powerAbs;
+	float powerMod;
+	float heatMod;
+	float fuelMod;
 	
 	public ItemCatalyst(int color) {
 		this.color = color;
+		this.powerAbs = 0;
+		this.powerMod = 1.0F;
+		this.heatMod = 1.0F;
+		this.fuelMod = 1.0F;
+	}
+	
+	public ItemCatalyst(int color, int powerAbs, float powerMod, float heatMod, float fuelMod) {
+		this.color = color;
+		this.powerAbs = powerAbs;
+		this.powerMod = powerMod;
+		this.heatMod = heatMod;
+		this.fuelMod = fuelMod;
 	}
 	
 	public int getColor() {
 		return this.color;
 	}
+	
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool)
+	{
+		list.add("Absolute Energy Bonus: " + powerAbs + "HE");
+		list.add("Energy Modifier:           " + (powerMod >= 1 ? "+" : "") + (Math.round(powerMod * 1000) * .10 - 100) + "%");
+		list.add("Heat Modifier:               " + (heatMod >= 1 ? "+" : "") + (Math.round(heatMod * 1000) * .10 - 100) + "%");
+		list.add("Fuel Modifier:               " + (fuelMod >= 1 ? "+" : "") + (Math.round(fuelMod * 1000) * .10 - 100) + "%");
+	}
 
 }

com/hbm/items/special/ItemCustomLore.java

@@ -561,6 +561,23 @@ public class ItemCustomLore extends ItemRadioactive {
 			list.add("Enables dimension-shifting via");
 			list.add("beryllium-enhanced resource scanner.");
 		}
+		
+		if(this == ModItems.ams_focus_limiter)
+		{
+			list.add("Maximum performance for restriction field:");
+			list.add("Standard cooling, no energy bonus.");
+		}
+		
+		if(this == ModItems.ams_focus_booster)
+		{
+			list.add("Weaker restriction field and core energy injection:");
+			list.add("More heat generation, extra energy.");
+		}
+		
+		if(this == ModItems.ams_muzzle)
+		{
+			list.add("...it emits an energy-beam thingy.");
+		}
 	}
 
     @Override

com/hbm/items/special/ItemGlitch.java

@@ -93,7 +93,7 @@ public class ItemGlitch extends Item {
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip));
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_sparkle));
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter));
-				player.addChatMessage(new ChatComponentText("Congratz, you're the wasteland hero now, now throw yourself into some fire or something for this weird achievement. Get going already, I'm not even being paid to tell you this."));
+				player.addChatMessage(new ChatComponentText("Congratz, you're the hero now, now throw yourself into some fire or something for this weird achievement. Get going already, I'm not even being paid to tell you this."));
 				break;
 			case 14:
 				player.inventory.dropAllItems();

com/hbm/items/special/ItemRadioactive.java

@@ -159,7 +159,8 @@ public class ItemRadioactive extends Item {
 					this == ModItems.cell_tritium || 
 					this == ModItems.rod_tritium || 
 					this == ModItems.rod_dual_tritium || 
-					this == ModItems.rod_quad_tritium) {
+					this == ModItems.rod_quad_tritium || 
+					this == ModItems.powder_yellowcake) {
 				living.addPotionEffect(new PotionEffect(Potion.poison.id, 5 * 20, 0));
 			}
 			

com/hbm/items/tool/ItemChemistryTemplate.java

@@ -31,6 +31,7 @@ public class ItemChemistryTemplate extends Item {
 		FP_LIGHTOIL,
 		FR_REOIL,
 		FR_PETROIL,
+		FC_BITUMEN,
 		FC_I_NAPHTHA,
 		FC_GAS_PETROLEUM,
 		FC_DIESEL_KEROSENE,
@@ -57,6 +58,7 @@ public class ItemChemistryTemplate extends Item {
 		SF_BIOFUEL,
 		BP_BIOGAS,
 		BP_BIOFUEL,
+		OIL_SAND,
 		ASPHALT,
 		COOLANT,
 		DESH,
@@ -67,6 +69,7 @@ public class ItemChemistryTemplate extends Item {
 		POLYMER,
 		DEUTERIUM,
 		STEAM,
+		YELLOWCAKE,
 		UF6,
 		PUF6,
 		SAS3;
@@ -133,6 +136,10 @@ public class ItemChemistryTemplate extends Item {
         	return 30;
         case FR_PETROIL:
         	return 30;
+        case OIL_SAND:
+        	return 200;
+        case FC_BITUMEN:
+        	return 100;
         case FC_I_NAPHTHA:
         	return 150;
         case FC_GAS_PETROLEUM:
@@ -205,6 +212,8 @@ public class ItemChemistryTemplate extends Item {
         	return 200;
         case BP_BIOFUEL:
         	return 100;
+        case YELLOWCAKE:
+        	return 250;
         case UF6:
         	return 100;
         case PUF6:

com/hbm/items/tool/ItemGeigerCounter.java

@@ -102,16 +102,16 @@ public class ItemGeigerCounter extends Item {
 		int i = 0;
 
 		if(b == ModBlocks.waste_trinitite) {
-			i = 3;
-		}
-		if(b == ModBlocks.waste_trinitite_red) {
-			i = 3;
-		}
-		if(b == ModBlocks.ore_uranium) {
 			i = 2;
 		}
+		if(b == ModBlocks.waste_trinitite_red) {
+			i = 2;
+		}
+		if(b == ModBlocks.ore_uranium) {
+			i = 1;
+		}
 		if(b == ModBlocks.ore_nether_plutonium) {
-			i = 15;
+			i = 10;
 		}
 		if(b == ModBlocks.block_trinitite) {
 			i = 20;
@@ -131,6 +131,9 @@ public class ItemGeigerCounter extends Item {
 		if(b == ModBlocks.yellow_barrel) {
 			i = 30;
 		}
+		if(b == ModBlocks.block_yellowcake) {
+			i = 2;
+		}
 		
 		return i * level;
 	}

com/hbm/items/weapon/ItemClip.java

@@ -1,5 +1,7 @@
 package com.hbm.items.weapon;
 
+import java.util.List;
+
 import com.hbm.items.ModItems;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -273,4 +275,13 @@ public class ItemClip extends Item {
 		return stack;
 		
 	}
+	
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool)
+	{
+		if(this == ModItems.ammo_container)
+		{
+			list.add("Gives ammo for all held weapons.");
+		}
+	}
 }

com/hbm/lib/HbmWorldGen.java

@@ -12,6 +12,7 @@ import com.hbm.world.Dud;
 import com.hbm.world.Factory;
 import com.hbm.world.LibraryDungeon;
 import com.hbm.world.OilBubble;
+import com.hbm.world.OilSandBubble;
 import com.hbm.world.Radio01;
 import com.hbm.world.Relay;
 import com.hbm.world.Satellite;
@@ -288,6 +289,17 @@ public class HbmWorldGen implements IWorldGenerator {
 					}
 				}
 			}
+			if (biome == BiomeGenBase.desert) {
+				if (rand.nextInt(200) == 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);
+
+						OilSandBubble.spawnOil(world, x, y, z, 15 + rand.nextInt(31));
+					}
+				}
+			}
 
 			if (rand.nextInt(MainRegistry.bunkerStructure) == 0) {
 				int x = i + rand.nextInt(16);

com/hbm/lib/Library.java

@@ -724,14 +724,14 @@ public class Library {
 				slots[index].setItemDamage(slots[index].getItemDamage() - 1);
 			} else break;
 
-		/*if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_desh)))
+		if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_desh && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
 			slots[index] = new ItemStack(ModItems.dynosphere_desh_charged);
-		if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_schrabidium)))
+		if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_schrabidium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
 			slots[index] = new ItemStack(ModItems.dynosphere_schrabidium_charged);
-		if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_euphemium)))
+		if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_euphemium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
 			slots[index] = new ItemStack(ModItems.dynosphere_euphemium_charged);
-		if(slots[index] != null && slots[index].equals(ItemBattery.getFullBattery(ModItems.dynosphere_dineutronium)))
-			slots[index] = new ItemStack(ModItems.dynosphere_dineutronium_charged);*/
+		if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_dineutronium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
+			slots[index] = new ItemStack(ModItems.dynosphere_dineutronium_charged);
 		
 		return power;
 	}

com/hbm/main/CraftingManager.java

@@ -120,6 +120,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_desh), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_desh });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_cobble), 1), new Object[] { "##", "##", '#', ModItems.fragment_meteorite });
 		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_broken), 1), new Object[] { "###", "###", "###", '#', ModItems.fragment_meteorite });
+		GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_yellowcake), 1), new Object[] { "###", "###", "###", '#', ModItems.powder_yellowcake });
 
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "nuggetUranium235", "nuggetUranium235", "nuggetUranium235", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium240", "nuggetPlutonium240", "nuggetPlutonium240" }));
@@ -156,6 +157,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.ingot_daffergon, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_daffergon) });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ingot_verticium, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_verticium) });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ingot_desh, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_desh) });
+		GameRegistry.addRecipe(new ItemStack(ModItems.powder_yellowcake, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_yellowcake) });
 
 		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 });

com/hbm/main/MainRegistry.java

@@ -228,6 +228,7 @@ import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator;
 import com.hbm.tileentity.machine.TileEntityMachineShredder;
 import com.hbm.tileentity.machine.TileEntityMachineSiren;
 import com.hbm.tileentity.machine.TileEntityMachineTeleporter;
+import com.hbm.tileentity.machine.TileEntityMachineTransformer;
 import com.hbm.tileentity.machine.TileEntityMachineTurbofan;
 import com.hbm.tileentity.machine.TileEntityMachineUF6Tank;
 import com.hbm.tileentity.machine.TileEntityNukeFurnace;
@@ -555,6 +556,7 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntityMachineSPP.class, "tileentity_spp");
 		GameRegistry.registerTileEntity(TileEntityTurretSpitfire.class, "tileentity_turret_spitfire");
 		GameRegistry.registerTileEntity(TileEntityMachineRadGen.class, "tileentity_radgen");
+		GameRegistry.registerTileEntity(TileEntityMachineTransformer.class, "tileentity_transformer");
 
 	    EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
 	    EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
@@ -678,7 +680,7 @@ public class MainRegistry
 				achievementCraftCentrifuge
 		}));*/
 		achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", 0, 0, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat();
-		achImpossible = new Achievement("achievement.impossible", "impossible", 1, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat();
+		achImpossible = new Achievement("achievement.impossible", "impossible", 2, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat();
 		
 		AchievementPage.registerAchievementPage(new AchievementPage("NTM Achievements", new Achievement[]{ 
 				achSacrifice,
@@ -802,6 +804,7 @@ public class MainRegistry
 		OreDictionary.registerOre("dustActinium", ModItems.powder_actinium);
 		OreDictionary.registerOre("dustDesh", ModItems.powder_desh);
 		OreDictionary.registerOre("dustEuphemium", ModItems.powder_euphemium);
+		OreDictionary.registerOre("dustDineutronium", ModItems.powder_dineutronium);
 
 		OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium);
 		OreDictionary.registerOre("dustIodine", ModItems.powder_iodine);
@@ -943,6 +946,7 @@ public class MainRegistry
 		recipes.overridePreSetRecipe(new ItemStack(ModItems.fragment_actinium), new ItemStack(ModItems.powder_actinium_tiny, 1));
 		recipes.overridePreSetRecipe(new ItemStack(ModItems.fragment_meteorite), new ItemStack(ModItems.powder_meteorite_tiny, 1));
 		recipes.overridePreSetRecipe(new ItemStack(ModBlocks.block_meteor), new ItemStack(ModItems.powder_meteorite, 10));
+		recipes.overridePreSetRecipe(new ItemStack(Items.enchanted_book), new ItemStack(ModItems.powder_magic, 1));
 		
 		recipes.PrintRecipes();
 
@@ -987,7 +991,7 @@ public class MainRegistry
 		FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_anti_schrabidium), new ItemStack(ModItems.cell_empty), FluidType.ASCHRAB, 1000));
 		FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_sas3), new ItemStack(ModItems.cell_empty), FluidType.SAS3, 1000));
 
-		FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), new ItemStack(ModBlocks.ore_oil_empty), FluidType.OIL, 500));
+		FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), new ItemStack(ModBlocks.ore_oil_empty), FluidType.OIL, 250));
 
 		FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 1), new ItemStack(ModItems.tank_waste, 1, 0), FluidType.WATZ, 8000));
 		FluidContainerRegistry.instance.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 2), new ItemStack(ModItems.tank_waste, 1, 1), FluidType.WATZ, 8000));

com/hbm/main/NEIConfig.java

@@ -67,6 +67,7 @@ public class NEIConfig implements IConfigureNEI {
 		if(MainRegistry.polaroidID != 11) {
 			API.hideItem(new ItemStack(ModItems.book_secret));
 			API.hideItem(new ItemStack(ModItems.burnt_bark));
+			API.hideItem(new ItemStack(ModItems.ams_core_thingy));
 		}
 		API.hideItem(new ItemStack(ModBlocks.dummy_block_assembler));
 		API.hideItem(new ItemStack(ModBlocks.dummy_block_centrifuge));

com/hbm/main/ResourceManager.java

@@ -86,6 +86,7 @@ public class ResourceManager {
 	public static final ResourceLocation ams_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_base.png");
 	public static final ResourceLocation ams_emitter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_emitter.png");
 	public static final ResourceLocation ams_limiter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_limiter.png");
+	public static final ResourceLocation ams_destroyed_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_destroyed.png");
 
 	
 	

com/hbm/packet/AuxGaugePacket.java

@@ -65,11 +65,17 @@ public class AuxGaugePacket implements IMessage {
 
 				if (te instanceof TileEntityAMSLimiter) {
 					TileEntityAMSLimiter limiter = (TileEntityAMSLimiter)te;
-					limiter.locked = m.value == 1;
+					if(m.id == 0)
+						limiter.locked = m.value == 1;
+					else if(m.id == 1)
+						limiter.efficiency = m.value;
 				}
 				if (te instanceof TileEntityAMSEmitter) {
 					TileEntityAMSEmitter emitter = (TileEntityAMSEmitter)te;
-					emitter.locked = m.value == 1;
+					if(m.id == 0)
+						emitter.locked = m.value == 1;
+					else if(m.id == 1)
+						emitter.efficiency = m.value;
 				}
 				if (te instanceof TileEntityAMSBase) {
 					TileEntityAMSBase base = (TileEntityAMSBase)te;
@@ -78,6 +84,10 @@ public class AuxGaugePacket implements IMessage {
 						base.locked = m.value == 1;
 					else if(m.id == 1)
 						base.color = m.value;
+					else if(m.id == 2)
+						base.efficiency = m.value;
+					else if(m.id == 3)
+						base.field = m.value;
 				}
 				
 			} catch (Exception x) { }

com/hbm/packet/TEPylonSenderPacket.java

@@ -63,12 +63,14 @@ public class TEPylonSenderPacket implements IMessage {
 		@Override
 		public IMessage onMessage(TEPylonSenderPacket m, MessageContext ctx) {
 			TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z);
-
+			
+			try {
 			if (te != null && te instanceof TileEntityPylonRedWire) {
 					
 				TileEntityPylonRedWire pyl = (TileEntityPylonRedWire) te;
 				pyl.addTileEntityBasedOnCoords(m.conX, m.conY, m.conZ);
 			}
+			} catch(Exception x) {}
 			return null;
 		}
 	}

com/hbm/potion/PotionEffectTaint.java

@@ -47,7 +47,7 @@ public class PotionEffectTaint extends Potion {
 	    		int b = rand.nextInt(5) + (int)entity.posY - 2;
 	    		int c = rand.nextInt(5) + (int)entity.posZ - 2;
 	            if(entity.worldObj.getBlock(a, b, c).isReplaceable(entity.worldObj, a, b, c) && BlockTaint.hasPosNeightbour(entity.worldObj, a, b, c))
-	            	entity.worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(16), 2);
+	            	entity.worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3), 2);
 	    	}
     	}
     }

com/hbm/render/model/ModelJetPack.java

@@ -0,0 +1,172 @@
+// Date: 29.01.2018 23:31:37
+// Template version 1.1
+// Java generated by Techne
+// Keep in mind that you still need to fill in some blanks
+// - ZeuX
+
+package com.hbm.render.model;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.ItemStack;
+
+public class ModelJetPack extends ModelBiped {
+	// fields
+	ModelRenderer Tank1;
+	ModelRenderer Tank2;
+	ModelRenderer Tip1;
+	ModelRenderer Tip2;
+	ModelRenderer Duct1;
+	ModelRenderer Duct2;
+	ModelRenderer Thruster1;
+	ModelRenderer Thruster2;
+	ModelRenderer Pack;
+	ModelRenderer JetPack;
+
+	public ModelJetPack() {
+		textureWidth = 32;
+		textureHeight = 32;
+
+		float x = 0F;
+		float y = 0F;
+		float z = -2F;
+		
+		JetPack = new ModelRenderer(this, 0, 0);
+		JetPack.setRotationPoint(x, y, z);
+		
+		Pack = new ModelRenderer(this, 12, 10);
+		Pack.addBox(0F, 0F, 0F, 4, 6, 1);
+		Pack.setRotationPoint(-2F, 3F, 0F);
+		Pack.setTextureSize(32, 32);
+		Pack.mirror = true;
+		convertToChild(JetPack, Pack);
+		setRotation(Pack, 0F, 0F, 0F);
+		Tank1 = new ModelRenderer(this, 0, 0);
+		Tank1.addBox(0F, 0F, 0F, 3, 8, 3);
+		Tank1.setRotationPoint(0.5F, 2F, 0.5F);
+		Tank1.setTextureSize(32, 32);
+		Tank1.mirror = true;
+		setRotation(Tank1, 0F, 0F, 0F);
+		convertToChild(JetPack, Tank1);
+		Tank2 = new ModelRenderer(this, 0, 11);
+		Tank2.addBox(0F, 0F, 0F, 3, 8, 3);
+		Tank2.setRotationPoint(-3.5F, 2F, 0.5F);
+		Tank2.setTextureSize(32, 32);
+		Tank2.mirror = true;
+		setRotation(Tank2, 0F, 0F, 0F);
+		convertToChild(JetPack, Tank2);
+		Tip1 = new ModelRenderer(this, 0, 22);
+		Tip1.addBox(0F, 0F, 0F, 2, 1, 2);
+		Tip1.setRotationPoint(1F, 1F, 1F);
+		Tip1.setTextureSize(32, 32);
+		Tip1.mirror = true;
+		setRotation(Tip1, 0F, 0F, 0F);
+		convertToChild(JetPack, Tip1);
+		Tip2 = new ModelRenderer(this, 0, 25);
+		Tip2.addBox(0F, 0F, 0F, 2, 1, 2);
+		Tip2.setRotationPoint(-3F, 1F, 1F);
+		Tip2.setTextureSize(32, 32);
+		Tip2.mirror = true;
+		setRotation(Tip2, 0F, 0F, 0F);
+		convertToChild(JetPack, Tip2);
+		Duct1 = new ModelRenderer(this, 8, 22);
+		Duct1.addBox(0F, 0F, 0F, 2, 1, 2);
+		Duct1.setRotationPoint(1F, 9.5F, 1F);
+		Duct1.setTextureSize(32, 32);
+		Duct1.mirror = true;
+		setRotation(Duct1, 0F, 0F, 0F);
+		convertToChild(JetPack, Duct1);
+		Duct2 = new ModelRenderer(this, 8, 25);
+		Duct2.addBox(0F, 0F, 0F, 2, 1, 2);
+		Duct2.setRotationPoint(-3F, 9.5F, 1F);
+		Duct2.setTextureSize(32, 32);
+		Duct2.mirror = true;
+		setRotation(Duct2, 0F, 0F, 0F);
+		convertToChild(JetPack, Duct2);
+		Thruster1 = new ModelRenderer(this, 12, 0);
+		Thruster1.addBox(0F, 0F, 0F, 3, 2, 3);
+		Thruster1.setRotationPoint(0.5F, 10.5F, 0.5F);
+		Thruster1.setTextureSize(32, 32);
+		Thruster1.mirror = true;
+		setRotation(Thruster1, 0F, 0F, 0F);
+		convertToChild(JetPack, Thruster1);
+		Thruster2 = new ModelRenderer(this, 12, 5);
+		Thruster2.addBox(0F, 0F, 0F, 3, 2, 3);
+		Thruster2.setRotationPoint(-3.5F, 10.5F, 0.5F);
+		Thruster2.setTextureSize(32, 32);
+		Thruster2.mirror = true;
+		setRotation(Thruster2, 0F, 0F, 0F);
+		convertToChild(JetPack, Thruster2);
+	}
+
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		//super.render(entity, f, f1, f2, f3, f4, f5);
+		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		
+		/*Tank1.render(f5);
+		Tank2.render(f5);
+		Tip1.render(f5);
+		Tip2.render(f5);
+		Duct1.render(f5);
+		Duct2.render(f5);
+		Thruster1.render(f5);
+		Thruster2.render(f5);*/
+		JetPack.render(f5);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+	@Override
+	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
+		if (entity instanceof EntityPlayer) {
+			EntityPlayer player = (EntityPlayer) entity;
+			if (player.isSneaking()) {
+				this.isSneak = true;
+			} else {
+				this.isSneak = false;
+			}
+			ItemStack itemstack = player.inventory.getCurrentItem();
+			this.heldItemRight = itemstack != null ? 1 : 0;
+
+			if (itemstack != null && player.getItemInUseCount() > 0) {
+				EnumAction enumaction = itemstack.getItemUseAction();
+
+				if (enumaction == EnumAction.block) {
+					this.heldItemRight = 3;
+				} else if (enumaction == EnumAction.bow) {
+					this.aimedBow = true;
+				}
+			}
+		}
+		float s = 1 / 16;
+
+		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		this.JetPack.rotationPointX = this.bipedBody.rotationPointX;
+		this.JetPack.rotationPointY = this.bipedBody.rotationPointY;
+		this.JetPack.rotationPointZ = this.bipedBody.rotationPointZ;
+		this.JetPack.rotateAngleX = this.bipedBody.rotateAngleX;
+		this.JetPack.rotateAngleY = this.bipedBody.rotateAngleY;
+		this.JetPack.rotateAngleZ = this.bipedBody.rotateAngleZ;
+	}
+
+	protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild) {
+		parChild.rotationPointX -= parParent.rotationPointX;
+		parChild.rotationPointY -= parParent.rotationPointY;
+		parChild.rotationPointZ -= parParent.rotationPointZ;
+		parChild.rotateAngleX -= parParent.rotateAngleX;
+		parChild.rotateAngleY -= parParent.rotateAngleY;
+		parChild.rotateAngleZ -= parParent.rotateAngleZ;
+		parParent.addChild(parChild);
+	}
+
+}

com/hbm/render/model/ModelT45Chest.java

@@ -4,11 +4,6 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-
-
-
-
-
 package com.hbm.render.model;
 
 import org.lwjgl.opengl.GL11;
@@ -20,304 +15,279 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 
-public class ModelT45Chest extends ModelBiped
-{
-  //fields
-    ModelRenderer chest;
-    ModelRenderer leftarm;
-    ModelRenderer rightarm;
-    ModelRenderer Shape1;
-    ModelRenderer Shape2;
-    ModelRenderer Shape3;
-    ModelRenderer Shape4;
-    ModelRenderer Shape5;
-    ModelRenderer Shape6;
-    ModelRenderer Shape7;
-    ModelRenderer Shape8;
-    ModelRenderer Shape9;
-    ModelRenderer Shape10;
-    ModelRenderer Shape11;
-    ModelRenderer Shape12;
-    ModelRenderer Shape13;
-    ModelRenderer Shape14;
-    ModelRenderer Shape15;
-    ModelRenderer Shape16;
-    ModelRenderer Shape17;
-    ModelRenderer Shape18;
-    ModelRenderer Shape19;
-  
-  public ModelT45Chest()
-  {
-    textureWidth = 128;
-    textureHeight = 64;
+public class ModelT45Chest extends ModelBiped {
+	// fields
+	ModelRenderer chest;
+	ModelRenderer leftarm;
+	ModelRenderer rightarm;
+	ModelRenderer Shape1;
+	ModelRenderer Shape2;
+	ModelRenderer Shape3;
+	ModelRenderer Shape4;
+	ModelRenderer Shape5;
+	ModelRenderer Shape6;
+	ModelRenderer Shape7;
+	ModelRenderer Shape8;
+	ModelRenderer Shape9;
+	ModelRenderer Shape10;
+	ModelRenderer Shape11;
+	ModelRenderer Shape12;
+	ModelRenderer Shape13;
+	ModelRenderer Shape14;
+	ModelRenderer Shape15;
+	ModelRenderer Shape16;
+	ModelRenderer Shape17;
+	ModelRenderer Shape18;
+	ModelRenderer Shape19;
 
-    chest = new ModelRenderer(this, 0, 0);
-    leftarm = new ModelRenderer(this, 0, 0);
-    rightarm = new ModelRenderer(this, 0, 0);
-      Shape1 = new ModelRenderer(this, 0, 0);
-      Shape1.addBox(0F, 0F, 0F, 8, 12, 4);
-      Shape1.setRotationPoint(-4F, 0F - 0.0625F / 2, -2F);
-      Shape1.setTextureSize(128, 64);
-      Shape1.mirror = true;
-      setRotation(Shape1, 0F, 0F, 0F);
-      convertToChild(chest, Shape1);
-      Shape2 = new ModelRenderer(this, 0, 16);
-      Shape2.addBox(0F, 0F, 0F, 7, 5, 2);
-      Shape2.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F);
-      Shape2.setTextureSize(128, 64);
-      Shape2.mirror = true;
-      setRotation(Shape2, 0F, 0F, 0F);
-      convertToChild(chest, Shape2);
-      Shape3 = new ModelRenderer(this, 0, 23);
-      Shape3.addBox(0F, 0F, 0F, 1, 1, 1);
-      Shape3.setRotationPoint(-2.5F, 7F - 0.0625F / 2, -3F);
-      Shape3.setTextureSize(128, 64);
-      Shape3.mirror = true;
-      setRotation(Shape3, 0F, 0F, 0F);
-      convertToChild(chest, Shape3);
-      Shape4 = new ModelRenderer(this, 0, 25);
-      Shape4.addBox(0F, 0F, 0F, 1, 1, 1);
-      Shape4.setRotationPoint(1.5F, 7F - 0.0625F / 2, -3F);
-      Shape4.setTextureSize(128, 64);
-      Shape4.mirror = true;
-      setRotation(Shape4, 0F, 0F, 0F);
-      convertToChild(chest, Shape4);
-      Shape5 = new ModelRenderer(this, 0, 28);
-      Shape5.addBox(0F, -2F, 0F, 7, 2, 2);
-      Shape5.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F);
-      Shape5.setTextureSize(128, 64);
-      Shape5.mirror = true;
-      setRotation(Shape5, -0.6108652F, 0F, 0F);
-      convertToChild(chest, Shape5);
-      Shape6 = new ModelRenderer(this, 48, 0);
-      Shape6.addBox(0F, 0F, 0F, 4, 12, 4);
-      Shape6.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -2F);
-      Shape6.setTextureSize(128, 64);
-      Shape6.mirror = true;
-      setRotation(Shape6, 0F, 0F, 0F);
-      convertToChild(leftarm, Shape6);
-      Shape7 = new ModelRenderer(this, 32, 0);
-      Shape7.addBox(0F, 0F, 0F, 4, 12, 4);
-      Shape7.setRotationPoint(-8F + 6 - 0.25F, 0F - 3, -2F);
-      Shape7.setTextureSize(128, 64);
-      Shape7.mirror = true;
-      setRotation(Shape7, 0F, 0F, 0F);
-      convertToChild(rightarm, Shape7);
-      Shape8 = new ModelRenderer(this, 32, 16);
-      Shape8.addBox(0F, 0F, 0F, 5, 6, 6);
-      Shape8.setRotationPoint(4F - 6 + 0.25F, 4F - 3, -3F);
-      Shape8.setTextureSize(128, 64);
-      Shape8.mirror = true;
-      setRotation(Shape8, 0F, 0F, 0F);
-      convertToChild(leftarm, Shape8);
-      Shape9 = new ModelRenderer(this, 0, 34);
-      Shape9.addBox(0F, 0F, 0F, 5, 6, 6);
-      Shape9.setRotationPoint(-9F + 6 - 0.25F, 4F - 3, -3F);
-      Shape9.setTextureSize(128, 64);
-      Shape9.mirror = true;
-      setRotation(Shape9, 0F, 0F, 0F);
-      convertToChild(rightarm, Shape9);
-      Shape10 = new ModelRenderer(this, 32, 30);
-      Shape10.addBox(0F, 0F, 0F, 2, 6, 2);
-      Shape10.setRotationPoint(1F, 4F - 0.0625F / 2, 2F);
-      Shape10.setTextureSize(128, 64);
-      Shape10.mirror = true;
-      setRotation(Shape10, 0F, 0F, 0F);
-      convertToChild(chest, Shape10);
-      Shape11 = new ModelRenderer(this, 42, 30);
-      Shape11.addBox(0F, 0F, 0F, 2, 6, 2);
-      Shape11.setRotationPoint(-3F, 4F - 0.0625F / 2, 2F);
-      Shape11.setTextureSize(128, 64);
-      Shape11.mirror = true;
-      setRotation(Shape11, 0F, 0F, 0F);
-      convertToChild(chest, Shape11);
-      Shape12 = new ModelRenderer(this, 26, 9);
-      Shape12.addBox(0F, 0F, 0F, 1, 6, 1);
-      Shape12.setRotationPoint(1.5F, -2F - 0.0625F / 2, 2F);
-      Shape12.setTextureSize(128, 64);
-      Shape12.mirror = true;
-      setRotation(Shape12, 0F, 0F, 0F);
-      convertToChild(chest, Shape12);
-      Shape13 = new ModelRenderer(this, 26, 0);
-      Shape13.addBox(0F, 0F, 0F, 1, 6, 1);
-      Shape13.setRotationPoint(-2.5F, -2F - 0.0625F / 2, 2F);
-      Shape13.setTextureSize(128, 64);
-      Shape13.mirror = true;
-      setRotation(Shape13, 0F, 0F, 0F);
-      convertToChild(chest, Shape13);
-      Shape14 = new ModelRenderer(this, 20, 18);
-      Shape14.addBox(0F, 0F, 0F, 2, 2, 1);
-      Shape14.setRotationPoint(-1F, 1F - 0.0625F / 2, 2F);
-      Shape14.setTextureSize(128, 64);
-      Shape14.mirror = true;
-      setRotation(Shape14, 0F, 0F, 0F);
-      convertToChild(chest, Shape14);
-      Shape15 = new ModelRenderer(this, 21, 23);
-      Shape15.addBox(-1.5F, -1.5F, 0F, 3, 3, 1);
-      Shape15.setRotationPoint(0F, 2F - 0.0625F / 2, 3F);
-      Shape15.setTextureSize(128, 64);
-      Shape15.mirror = true;
-      setRotation(Shape15, 0F, 0F, 0.7853982F);
-      convertToChild(chest, Shape15);
-      Shape16 = new ModelRenderer(this, 0, 48);
-      Shape16.addBox(0F, -1F, 0F, 3, 1, 4);
-      Shape16.setRotationPoint(-8F + 6 - 0.25F, 12F - 3, -2F);
-      Shape16.setTextureSize(128, 64);
-      Shape16.mirror = true;
-      setRotation(Shape16, 0F, 0F, 0.5235988F);
-      convertToChild(rightarm, Shape16);
-      Shape17 = new ModelRenderer(this, 0, 55);
-      Shape17.addBox(-3F, -1F, 0F, 3, 1, 4);
-      Shape17.setRotationPoint(8F - 6 + 0.25F, 12F - 3, -2F);
-      Shape17.setTextureSize(128, 64);
-      Shape17.mirror = true;
-      setRotation(Shape17, 0F, 0F, -0.5235988F);
-      convertToChild(leftarm, Shape17);
-      Shape18 = new ModelRenderer(this, 90, 0);
-      Shape18.addBox(0F, -3F, 0F, 5, 3, 6);
-      Shape18.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -3F);
-      Shape18.setTextureSize(128, 64);
-      Shape18.mirror = true;
-      setRotation(Shape18, 0F, 0F, 0.2617994F);
-      convertToChild(leftarm, Shape18);
-      Shape19 = new ModelRenderer(this, 66, 0);
-      Shape19.addBox(-5F, -3F, 0F, 5, 3, 6);
-      Shape19.setRotationPoint(-4F + 6 - 0.25F, 0F - 3, -3F);
-      Shape19.setTextureSize(128, 64);
-      Shape19.mirror = true;
-      setRotation(Shape19, 0F, 0F, -0.2617994F);
-      convertToChild(rightarm, Shape19);
-  }
-  
-  /*public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
-  {
-    super.render(entity, f, f1, f2, f3, f4, f5);
-    setRotationAngles(f, f1, f2, f3, f4, f5);
-    Shape1.render(f5);
-    Shape2.render(f5);
-    Shape3.render(f5);
-    Shape4.render(f5);
-    Shape5.render(f5);
-    Shape6.render(f5);
-    Shape7.render(f5);
-    Shape8.render(f5);
-    Shape9.render(f5);
-    Shape10.render(f5);
-    Shape11.render(f5);
-    Shape12.render(f5);
-    Shape13.render(f5);
-    Shape14.render(f5);
-    Shape15.render(f5);
-    Shape16.render(f5);
-    Shape17.render(f5);
-    Shape18.render(f5);
-    Shape19.render(f5);
-  }*/
-  
-  private void setRotation(ModelRenderer model, float x, float y, float z)
-  {
-    model.rotateAngleX = x;
-    model.rotateAngleY = y;
-    model.rotateAngleZ = z;
-  }
-  
-  @Override
-public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
-  {
-	  if(entity instanceof EntityPlayer)
-	  {
-		  EntityPlayer player = (EntityPlayer)entity;
-		  if(player.isSneaking())
-		  {
-			  this.isSneak = true;
-		  } else {
-			  this.isSneak = false;
-		  }
-	        ItemStack itemstack = player.inventory.getCurrentItem();
-	        this.heldItemRight = itemstack != null ? 1 : 0;
+	public ModelT45Chest() {
+		textureWidth = 128;
+		textureHeight = 64;
 
-	        if (itemstack != null && player.getItemInUseCount() > 0)
-	        {
-	            EnumAction enumaction = itemstack.getItemUseAction();
+		chest = new ModelRenderer(this, 0, 0);
+		leftarm = new ModelRenderer(this, 0, 0);
+		rightarm = new ModelRenderer(this, 0, 0);
+		Shape1 = new ModelRenderer(this, 0, 0);
+		Shape1.addBox(0F, 0F, 0F, 8, 12, 4);
+		Shape1.setRotationPoint(-4F, 0F - 0.0625F / 2, -2F);
+		Shape1.setTextureSize(128, 64);
+		Shape1.mirror = true;
+		setRotation(Shape1, 0F, 0F, 0F);
+		convertToChild(chest, Shape1);
+		Shape2 = new ModelRenderer(this, 0, 16);
+		Shape2.addBox(0F, 0F, 0F, 7, 5, 2);
+		Shape2.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F);
+		Shape2.setTextureSize(128, 64);
+		Shape2.mirror = true;
+		setRotation(Shape2, 0F, 0F, 0F);
+		convertToChild(chest, Shape2);
+		Shape3 = new ModelRenderer(this, 0, 23);
+		Shape3.addBox(0F, 0F, 0F, 1, 1, 1);
+		Shape3.setRotationPoint(-2.5F, 7F - 0.0625F / 2, -3F);
+		Shape3.setTextureSize(128, 64);
+		Shape3.mirror = true;
+		setRotation(Shape3, 0F, 0F, 0F);
+		convertToChild(chest, Shape3);
+		Shape4 = new ModelRenderer(this, 0, 25);
+		Shape4.addBox(0F, 0F, 0F, 1, 1, 1);
+		Shape4.setRotationPoint(1.5F, 7F - 0.0625F / 2, -3F);
+		Shape4.setTextureSize(128, 64);
+		Shape4.mirror = true;
+		setRotation(Shape4, 0F, 0F, 0F);
+		convertToChild(chest, Shape4);
+		Shape5 = new ModelRenderer(this, 0, 28);
+		Shape5.addBox(0F, -2F, 0F, 7, 2, 2);
+		Shape5.setRotationPoint(-3.5F, 2F - 0.0625F / 2, -3.5F);
+		Shape5.setTextureSize(128, 64);
+		Shape5.mirror = true;
+		setRotation(Shape5, -0.6108652F, 0F, 0F);
+		convertToChild(chest, Shape5);
+		Shape6 = new ModelRenderer(this, 48, 0);
+		Shape6.addBox(0F, 0F, 0F, 4, 12, 4);
+		Shape6.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -2F);
+		Shape6.setTextureSize(128, 64);
+		Shape6.mirror = true;
+		setRotation(Shape6, 0F, 0F, 0F);
+		convertToChild(leftarm, Shape6);
+		Shape7 = new ModelRenderer(this, 32, 0);
+		Shape7.addBox(0F, 0F, 0F, 4, 12, 4);
+		Shape7.setRotationPoint(-8F + 6 - 0.25F, 0F - 3, -2F);
+		Shape7.setTextureSize(128, 64);
+		Shape7.mirror = true;
+		setRotation(Shape7, 0F, 0F, 0F);
+		convertToChild(rightarm, Shape7);
+		Shape8 = new ModelRenderer(this, 32, 16);
+		Shape8.addBox(0F, 0F, 0F, 5, 6, 6);
+		Shape8.setRotationPoint(4F - 6 + 0.25F, 4F - 3, -3F);
+		Shape8.setTextureSize(128, 64);
+		Shape8.mirror = true;
+		setRotation(Shape8, 0F, 0F, 0F);
+		convertToChild(leftarm, Shape8);
+		Shape9 = new ModelRenderer(this, 0, 34);
+		Shape9.addBox(0F, 0F, 0F, 5, 6, 6);
+		Shape9.setRotationPoint(-9F + 6 - 0.25F, 4F - 3, -3F);
+		Shape9.setTextureSize(128, 64);
+		Shape9.mirror = true;
+		setRotation(Shape9, 0F, 0F, 0F);
+		convertToChild(rightarm, Shape9);
+		Shape10 = new ModelRenderer(this, 32, 30);
+		Shape10.addBox(0F, 0F, 0F, 2, 6, 2);
+		Shape10.setRotationPoint(1F, 4F - 0.0625F / 2, 2F);
+		Shape10.setTextureSize(128, 64);
+		Shape10.mirror = true;
+		setRotation(Shape10, 0F, 0F, 0F);
+		convertToChild(chest, Shape10);
+		Shape11 = new ModelRenderer(this, 42, 30);
+		Shape11.addBox(0F, 0F, 0F, 2, 6, 2);
+		Shape11.setRotationPoint(-3F, 4F - 0.0625F / 2, 2F);
+		Shape11.setTextureSize(128, 64);
+		Shape11.mirror = true;
+		setRotation(Shape11, 0F, 0F, 0F);
+		convertToChild(chest, Shape11);
+		Shape12 = new ModelRenderer(this, 26, 9);
+		Shape12.addBox(0F, 0F, 0F, 1, 6, 1);
+		Shape12.setRotationPoint(1.5F, -2F - 0.0625F / 2, 2F);
+		Shape12.setTextureSize(128, 64);
+		Shape12.mirror = true;
+		setRotation(Shape12, 0F, 0F, 0F);
+		convertToChild(chest, Shape12);
+		Shape13 = new ModelRenderer(this, 26, 0);
+		Shape13.addBox(0F, 0F, 0F, 1, 6, 1);
+		Shape13.setRotationPoint(-2.5F, -2F - 0.0625F / 2, 2F);
+		Shape13.setTextureSize(128, 64);
+		Shape13.mirror = true;
+		setRotation(Shape13, 0F, 0F, 0F);
+		convertToChild(chest, Shape13);
+		Shape14 = new ModelRenderer(this, 20, 18);
+		Shape14.addBox(0F, 0F, 0F, 2, 2, 1);
+		Shape14.setRotationPoint(-1F, 1F - 0.0625F / 2, 2F);
+		Shape14.setTextureSize(128, 64);
+		Shape14.mirror = true;
+		setRotation(Shape14, 0F, 0F, 0F);
+		convertToChild(chest, Shape14);
+		Shape15 = new ModelRenderer(this, 21, 23);
+		Shape15.addBox(-1.5F, -1.5F, 0F, 3, 3, 1);
+		Shape15.setRotationPoint(0F, 2F - 0.0625F / 2, 3F);
+		Shape15.setTextureSize(128, 64);
+		Shape15.mirror = true;
+		setRotation(Shape15, 0F, 0F, 0.7853982F);
+		convertToChild(chest, Shape15);
+		Shape16 = new ModelRenderer(this, 0, 48);
+		Shape16.addBox(0F, -1F, 0F, 3, 1, 4);
+		Shape16.setRotationPoint(-8F + 6 - 0.25F, 12F - 3, -2F);
+		Shape16.setTextureSize(128, 64);
+		Shape16.mirror = true;
+		setRotation(Shape16, 0F, 0F, 0.5235988F);
+		convertToChild(rightarm, Shape16);
+		Shape17 = new ModelRenderer(this, 0, 55);
+		Shape17.addBox(-3F, -1F, 0F, 3, 1, 4);
+		Shape17.setRotationPoint(8F - 6 + 0.25F, 12F - 3, -2F);
+		Shape17.setTextureSize(128, 64);
+		Shape17.mirror = true;
+		setRotation(Shape17, 0F, 0F, -0.5235988F);
+		convertToChild(leftarm, Shape17);
+		Shape18 = new ModelRenderer(this, 90, 0);
+		Shape18.addBox(0F, -3F, 0F, 5, 3, 6);
+		Shape18.setRotationPoint(4F - 6 + 0.25F, 0F - 3, -3F);
+		Shape18.setTextureSize(128, 64);
+		Shape18.mirror = true;
+		setRotation(Shape18, 0F, 0F, 0.2617994F);
+		convertToChild(leftarm, Shape18);
+		Shape19 = new ModelRenderer(this, 66, 0);
+		Shape19.addBox(-5F, -3F, 0F, 5, 3, 6);
+		Shape19.setRotationPoint(-4F + 6 - 0.25F, 0F - 3, -3F);
+		Shape19.setTextureSize(128, 64);
+		Shape19.mirror = true;
+		setRotation(Shape19, 0F, 0F, -0.2617994F);
+		convertToChild(rightarm, Shape19);
+	}
 
-	            if (enumaction == EnumAction.block)
-	            {
-	                this.heldItemRight = 3;
-	            }
-	            else if (enumaction == EnumAction.bow)
-	            {
-	                this.aimedBow = true;
-	            }
-	        }
-	  }
-	  float s = 1/16;
-	  
-    super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-    this.chest.rotationPointX = this.bipedBody.rotationPointX;
-    this.chest.rotationPointY = this.bipedBody.rotationPointY;
-    this.chest.rotationPointZ = this.bipedBody.rotationPointZ;
-    this.chest.rotateAngleX = this.bipedBody.rotateAngleX;
-    this.chest.rotateAngleY = this.bipedBody.rotateAngleY;
-    this.chest.rotateAngleZ = this.bipedBody.rotateAngleZ;
-    this.leftarm.rotationPointX = this.bipedLeftArm.rotationPointX;
-    this.leftarm.rotationPointY = this.bipedLeftArm.rotationPointY;
-    this.leftarm.rotationPointZ = this.bipedLeftArm.rotationPointZ;
-    this.leftarm.rotateAngleX = this.bipedLeftArm.rotateAngleX;
-    this.leftarm.rotateAngleY = this.bipedLeftArm.rotateAngleY;
-    this.leftarm.rotateAngleZ = this.bipedLeftArm.rotateAngleZ;
-    this.rightarm.rotationPointX = this.bipedRightArm.rotationPointX;
-    this.rightarm.rotationPointY = this.bipedRightArm.rotationPointY;
-    this.rightarm.rotationPointZ = this.bipedRightArm.rotationPointZ;
-    this.rightarm.rotateAngleX = this.bipedRightArm.rotateAngleX;
-    this.rightarm.rotateAngleY = this.bipedRightArm.rotateAngleY;
-    this.rightarm.rotateAngleZ = this.bipedRightArm.rotateAngleZ;
-  }
-  @Override
-public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7)
-  {
-	setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
-    GL11.glPushMatrix();
-    GL11.glScalef(1.125F, 1.125F, 1.125F);
-    this.chest.render(par7);
-    this.aimedBow = false;
-    GL11.glPopMatrix();
-    this.renderLeft(par1Entity, par2, par3, par4, par5, par6, par7);
-    this.renderRight(par1Entity, par2, par3, par4, par5, par6, par7);
-  }
+	/*
+	 * public void render(Entity entity, float f, float f1, float f2, float f3,
+	 * float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5);
+	 * setRotationAngles(f, f1, f2, f3, f4, f5); Shape1.render(f5);
+	 * Shape2.render(f5); Shape3.render(f5); Shape4.render(f5);
+	 * Shape5.render(f5); Shape6.render(f5); Shape7.render(f5);
+	 * Shape8.render(f5); Shape9.render(f5); Shape10.render(f5);
+	 * Shape11.render(f5); Shape12.render(f5); Shape13.render(f5);
+	 * Shape14.render(f5); Shape15.render(f5); Shape16.render(f5);
+	 * Shape17.render(f5); Shape18.render(f5); Shape19.render(f5); }
+	 */
 
-  public void renderLeft(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7)
-  {
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+	@Override
+	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
+		if (entity instanceof EntityPlayer) {
+			EntityPlayer player = (EntityPlayer) entity;
+			if (player.isSneaking()) {
+				this.isSneak = true;
+			} else {
+				this.isSneak = false;
+			}
+			ItemStack itemstack = player.inventory.getCurrentItem();
+			this.heldItemRight = itemstack != null ? 1 : 0;
+
+			if (itemstack != null && player.getItemInUseCount() > 0) {
+				EnumAction enumaction = itemstack.getItemUseAction();
+
+				if (enumaction == EnumAction.block) {
+					this.heldItemRight = 3;
+				} else if (enumaction == EnumAction.bow) {
+					this.aimedBow = true;
+				}
+			}
+		}
+		float s = 1 / 16;
+
+		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		this.chest.rotationPointX = this.bipedBody.rotationPointX;
+		this.chest.rotationPointY = this.bipedBody.rotationPointY;
+		this.chest.rotationPointZ = this.bipedBody.rotationPointZ;
+		this.chest.rotateAngleX = this.bipedBody.rotateAngleX;
+		this.chest.rotateAngleY = this.bipedBody.rotateAngleY;
+		this.chest.rotateAngleZ = this.bipedBody.rotateAngleZ;
+		this.leftarm.rotationPointX = this.bipedLeftArm.rotationPointX;
+		this.leftarm.rotationPointY = this.bipedLeftArm.rotationPointY;
+		this.leftarm.rotationPointZ = this.bipedLeftArm.rotationPointZ;
+		this.leftarm.rotateAngleX = this.bipedLeftArm.rotateAngleX;
+		this.leftarm.rotateAngleY = this.bipedLeftArm.rotateAngleY;
+		this.leftarm.rotateAngleZ = this.bipedLeftArm.rotateAngleZ;
+		this.rightarm.rotationPointX = this.bipedRightArm.rotationPointX;
+		this.rightarm.rotationPointY = this.bipedRightArm.rotationPointY;
+		this.rightarm.rotationPointZ = this.bipedRightArm.rotationPointZ;
+		this.rightarm.rotateAngleX = this.bipedRightArm.rotateAngleX;
+		this.rightarm.rotateAngleY = this.bipedRightArm.rotateAngleY;
+		this.rightarm.rotateAngleZ = this.bipedRightArm.rotateAngleZ;
+	}
+
+	@Override
+	public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) {
 		setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
-	    GL11.glPushMatrix();
-	    GL11.glScalef(1.125F, 1.125F, 1.125F);
-    this.leftarm.render(par7);
-    this.aimedBow = false;
-    GL11.glPopMatrix();
-  }
+		GL11.glPushMatrix();
+		GL11.glScalef(1.125F, 1.125F, 1.125F);
+		this.chest.render(par7);
+		this.aimedBow = false;
+		GL11.glPopMatrix();
+		this.renderLeft(par1Entity, par2, par3, par4, par5, par6, par7);
+		this.renderRight(par1Entity, par2, par3, par4, par5, par6, par7);
+	}
 
-  public void renderRight(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7)
-  {
+	public void renderLeft(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) {
 		setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
-	    GL11.glPushMatrix();
-	    GL11.glScalef(1.125F, 1.125F, 1.125F);
-    this.rightarm.render(par7);
-    this.aimedBow = false;
-    GL11.glPopMatrix();
-  }
-  
-  //Jabelar, you saved my time! I was about to redo all this crap if you can simply use this method!!
-  protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild)
-  {
-     // move child rotation point to be relative to parent
-     parChild.rotationPointX -= parParent.rotationPointX;
-     parChild.rotationPointY -= parParent.rotationPointY;
-     parChild.rotationPointZ -= parParent.rotationPointZ;
-     // make rotations relative to parent
-     parChild.rotateAngleX -= parParent.rotateAngleX;
-     parChild.rotateAngleY -= parParent.rotateAngleY;
-     parChild.rotateAngleZ -= parParent.rotateAngleZ;
-     // create relationship
-     parParent.addChild(parChild);
-  }
+		GL11.glPushMatrix();
+		GL11.glScalef(1.125F, 1.125F, 1.125F);
+		this.leftarm.render(par7);
+		this.aimedBow = false;
+		GL11.glPopMatrix();
+	}
+
+	public void renderRight(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) {
+		setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
+		GL11.glPushMatrix();
+		GL11.glScalef(1.125F, 1.125F, 1.125F);
+		this.rightarm.render(par7);
+		this.aimedBow = false;
+		GL11.glPopMatrix();
+	}
+
+	// Jabelar, you saved my time! I was about to redo all this crap if you can
+	// simply use this method!!
+	protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild) {
+		// move child rotation point to be relative to parent
+		parChild.rotationPointX -= parParent.rotationPointX;
+		parChild.rotationPointY -= parParent.rotationPointY;
+		parChild.rotationPointZ -= parParent.rotationPointZ;
+		// make rotations relative to parent
+		parChild.rotateAngleX -= parParent.rotateAngleX;
+		parChild.rotateAngleY -= parParent.rotateAngleY;
+		parChild.rotateAngleZ -= parParent.rotateAngleZ;
+		// create relationship
+		parParent.addChild(parChild);
+	}
 
 }

com/hbm/render/tileentity/RenderAMSBase.java

@@ -41,7 +41,8 @@ public class RenderAMSBase extends TileEntitySpecialRenderer {
     {
         GL11.glPushMatrix();
         GL11.glTranslated(x + 0.5D, y + 5.5, z + 0.5D);
-        GL11.glEnable(GL11.GL_LIGHTING);
+        //GL11.glEnable(GL11.GL_LIGHTING);
+        GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glRotatef(180, 0F, 1F, 0F);
 		
@@ -55,14 +56,18 @@ public class RenderAMSBase extends TileEntitySpecialRenderer {
 		scale += ((((double)base.tanks[2].getFill()) / ((double)base.tanks[2].getMaxFill())) + (((double)base.tanks[3].getFill()) / ((double)base.tanks[3].getMaxFill()))) * ((maxSize - minSize) / 2);
 		GL11.glScaled(scale, scale, scale);
 
-		bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/EMPBlast.png"));
+		//bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/EMPBlast.png"));
+		GL11.glDisable(GL11.GL_TEXTURE_2D);
 		
 		GL11.glRotatef(rot, 0F, 1F, 0F);
 		GL11.glScalef(1.1F, 1.1F, 1.1F);
+		GL11.glColor3ub((byte)(0x20), (byte)(0x20), (byte)(0x40));
 		ResourceManager.sphere_iuv.renderAll();
 		GL11.glScalef(1/1.1F, 1/1.1F, 1/1.1F);
 
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		GL11.glEnable(GL11.GL_TEXTURE_2D);
+        GL11.glEnable(GL11.GL_LIGHTING);
         GL11.glDisable(GL11.GL_CULL_FACE);
         GL11.glPopMatrix();
         
@@ -73,7 +78,8 @@ public class RenderAMSBase extends TileEntitySpecialRenderer {
     {
         GL11.glPushMatrix();
         GL11.glTranslated(x + 0.5D, y + 5.5, z + 0.5D);
-        GL11.glEnable(GL11.GL_LIGHTING);
+        //GL11.glEnable(GL11.GL_LIGHTING);
+        GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glRotatef(180, 0F, 1F, 0F);
 		
@@ -123,6 +129,7 @@ public class RenderAMSBase extends TileEntitySpecialRenderer {
 			ResourceManager.sphere_ruv.renderAll();
         
 		GL11.glDisable(GL11.GL_BLEND);
+        GL11.glEnable(GL11.GL_LIGHTING);
 		GL11.glEnable(GL11.GL_TEXTURE_2D);
         GL11.glDisable(GL11.GL_CULL_FACE);
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

com/hbm/render/tileentity/RenderAMSEmitter.java

@@ -31,7 +31,11 @@ public class RenderAMSEmitter extends TileEntitySpecialRenderer {
         GL11.glDisable(GL11.GL_CULL_FACE);
 		GL11.glRotatef(180, 0F, 1F, 0F);
 
-        bindTexture(ResourceManager.universal);
+
+        if(((TileEntityAMSEmitter)tileEntity).locked)
+        	bindTexture(ResourceManager.ams_destroyed_tex);
+        else
+        	bindTexture(ResourceManager.ams_emitter_tex);
 
         if(((TileEntityAMSEmitter)tileEntity).locked)
             ResourceManager.ams_emitter_destroyed.renderAll();
@@ -60,7 +64,7 @@ public class RenderAMSEmitter extends TileEntitySpecialRenderer {
 		
 		if(emitter.getWorldObj().getTileEntity(emitter.xCoord, emitter.yCoord - 9, emitter.zCoord) instanceof TileEntityAMSBase && !emitter.locked) {
 		
-			if(emitter.power > 0) {
+			if(emitter.efficiency > 0) {
 				
 				double lastPosX = 0;
 				double lastPosZ = 0;

com/hbm/render/tileentity/RenderAMSLimiter.java

@@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.machine.TileEntityAMSBase;
+import com.hbm.tileentity.machine.TileEntityAMSEmitter;
 import com.hbm.tileentity.machine.TileEntityAMSLimiter;
 
 import net.minecraft.client.renderer.RenderHelper;
@@ -36,7 +37,10 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer {
 			GL11.glRotatef(0, 0F, 1F, 0F); break;
 		}
 
-        bindTexture(ResourceManager.ams_limiter_tex);
+		if(((TileEntityAMSLimiter)tileEntity).locked)
+        	bindTexture(ResourceManager.ams_destroyed_tex);
+        else
+        	bindTexture(ResourceManager.ams_limiter_tex);
         
         if(((TileEntityAMSLimiter)tileEntity).locked)
             ResourceManager.ams_limiter_destroyed.renderAll();
@@ -119,39 +123,39 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer {
             GL11.glDepthMask(false);
         	Tessellator tessellator = Tessellator.instance;
 			tessellator.startDrawingQuads();
-			tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 			tessellator.addVertex(posX + length, posY - radius, posZ - radius);
 			tessellator.addVertex(posX + length, posY - radius, posZ + radius);
-			tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 			tessellator.addVertex(posX, posY - radius, posZ + radius);
 			tessellator.addVertex(posX, posY - radius, posZ - radius);
 			tessellator.draw();
 			tessellator.startDrawingQuads();
-			tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 			tessellator.addVertex(posX + length, posY + radius, posZ + radius);
 			tessellator.addVertex(posX + length, posY + radius, posZ - radius);
-			tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 			tessellator.addVertex(posX, posY + radius, posZ - radius);
 			tessellator.addVertex(posX, posY + radius, posZ + radius);
 			tessellator.draw();
 			tessellator.startDrawingQuads();
-			tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 			tessellator.addVertex(posX + length, posY - radius, posZ - radius);
 			tessellator.addVertex(posX + length, posY + radius, posZ - radius);
-			tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 			tessellator.addVertex(posX, posY + radius, posZ - radius);
 			tessellator.addVertex(posX, posY - radius, posZ - radius);
 			tessellator.draw();
 			tessellator.startDrawingQuads();
-			tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 			tessellator.addVertex(posX + length, posY - radius, posZ + radius);
 			tessellator.addVertex(posX + length, posY + radius, posZ + radius);
-			tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+			tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 			tessellator.addVertex(posX, posY + radius, posZ + radius);
 			tessellator.addVertex(posX, posY - radius, posZ + radius);
 			tessellator.draw();
 	        
-	        if(limiter.power > 0) {
+	        if(limiter.efficiency > 0) {
 
 	        	radius *= 2;
 	    		RenderHelper.disableStandardItemLighting();
@@ -163,34 +167,37 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer {
 		        GL11.glDisable(GL11.GL_CULL_FACE);
 	            GL11.glDepthMask(false);
 				tessellator.startDrawingQuads();
-				tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+				//tessellator.setColorRGBA_F(0.494F, 0.8F, 0.796F, 0f);
+				//tessellator.setColorRGBA_F(0, 0.627F, 0.627F, 0f);
+				//tessellator.setColorRGBA_F(0, 0.765F, 0.765F, 0f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 				tessellator.addVertex(posX + length, posY - radius, posZ - radius);
 				tessellator.addVertex(posX + length, posY - radius, posZ + radius);
-				tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 				tessellator.addVertex(posX, posY - radius, posZ + radius);
 				tessellator.addVertex(posX, posY - radius, posZ - radius);
 				tessellator.draw();
 				tessellator.startDrawingQuads();
-				tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 				tessellator.addVertex(posX + length, posY + radius, posZ + radius);
 				tessellator.addVertex(posX + length, posY + radius, posZ - radius);
-				tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 				tessellator.addVertex(posX, posY + radius, posZ - radius);
 				tessellator.addVertex(posX, posY + radius, posZ + radius);
 				tessellator.draw();
 				tessellator.startDrawingQuads();
-				tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 				tessellator.addVertex(posX + length, posY - radius, posZ - radius);
 				tessellator.addVertex(posX + length, posY + radius, posZ - radius);
-				tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 				tessellator.addVertex(posX, posY + radius, posZ - radius);
 				tessellator.addVertex(posX, posY - radius, posZ - radius);
 				tessellator.draw();
 				tessellator.startDrawingQuads();
-				tessellator.setColorRGBA_F(0, 0, 1F, 0f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 0f);
 				tessellator.addVertex(posX + length, posY - radius, posZ + radius);
 				tessellator.addVertex(posX + length, posY + radius, posZ + radius);
-				tessellator.setColorRGBA_F(0, 0, 1F, 1f);
+				tessellator.setColorRGBA_F(0.408F - 0.175F, 0.686F - 0.175F, 0.686F - 0.175F, 1);
 				tessellator.addVertex(posX, posY + radius, posZ + radius);
 				tessellator.addVertex(posX, posY - radius, posZ + radius);
 				tessellator.draw();

com/hbm/tileentity/machine/TileEntityAMSBase.java

@@ -13,6 +13,7 @@ import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.ISource;
 import com.hbm.inventory.FluidTank;
 import com.hbm.items.ModItems;
+import com.hbm.items.special.ItemAMSCore;
 import com.hbm.items.special.ItemCatalyst;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -296,9 +297,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS
 				
 				this.color = -1;
 				
-				if(slots[8] != null && slots[9] != null && slots[10] != null && slots[11] != null &&
+				if(slots[8] != null && slots[9] != null && slots[10] != null && slots[11] != null && slots[12] != null &&
 						slots[8].getItem() instanceof ItemCatalyst && slots[9].getItem() instanceof ItemCatalyst &&
-						slots[10].getItem() instanceof ItemCatalyst && slots[11].getItem() instanceof ItemCatalyst) {
+						slots[10].getItem() instanceof ItemCatalyst && slots[11].getItem() instanceof ItemCatalyst &&
+						slots[12].getItem() instanceof ItemAMSCore) {
 					int a = ((ItemCatalyst)slots[8].getItem()).getColor();
 					int b = ((ItemCatalyst)slots[9].getItem()).getColor();
 					int c = ((ItemCatalyst)slots[10].getItem()).getColor();
@@ -312,6 +314,21 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS
 					this.color = g;
 				}
 				
+				if(heat > 0 && tanks[0].getFill() > 0 && tanks[1].getFill() > 0) {
+					heat -= (this.getCoolingStrength(tanks[0].getTankType()) * this.getCoolingStrength(tanks[1].getTankType()));
+
+					tanks[0].setFill(tanks[0].getFill() - 10);
+					tanks[1].setFill(tanks[1].getFill() - 10);
+
+					if(tanks[0].getFill() < 0)
+						tanks[0].setFill(0);
+					if(tanks[1].getFill() < 0)
+						tanks[1].setFill(0);
+					
+					if(heat < 0)
+						heat = 0;
+				}
+				
 			} else {
 				field = 0;
 				efficiency = 0;
@@ -322,6 +339,34 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS
 			PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
 			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, locked ? 1 : 0, 0));
 			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, color, 1));
+			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, efficiency, 2));
+			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, field, 3));
+		}
+	}
+	
+	private int getCoolingStrength(FluidType type) {
+		switch(type) {
+		case WATER:
+			return 50;
+		case OIL:
+			return 150;
+		case COOLANT:
+			return this.heat / 50;
+		case CRYOGEL:
+			return this.heat > heat/2 ? 200 : 50;
+		default:
+			return 0;
+		}
+	}
+	
+	private int getFuelPower(FluidType type) {
+		switch(type) {
+		case DEUTERIUM:
+			return 50000;
+		case TRITIUM:
+			return 75000;
+		default:
+			return 0;
 		}
 	}
 	
@@ -338,8 +383,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS
 	}
 	
 	private float calcField(int a, int b, int c, int d) {
-		//return (float)Math.sqrt((Math.pow(a, 2) + Math.pow(b, 2) + Math.pow(c, 2) + Math.pow(d, 2)) / 4);
-		return (float)(a + b + c + d) / 4;
+		return (float)(a + b + c + d) * (a * 25 + b * 25 + c * 25 + d  * 25) / 40000;
 	}
 	
 	private int calcAvgHex(int h1, int h2) {

com/hbm/tileentity/machine/TileEntityAMSEmitter.java

@@ -29,7 +29,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 	private ItemStack slots[];
 
 	public long power = 0;
-	public static final long maxPower = 1000000;
+	public static final long maxPower = 100000000;
 	public int efficiency = 0;
 	public static final int maxEfficiency = 100;
 	public int heat = 0;
@@ -292,6 +292,16 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 					warning = 2;
 				}
 				
+				if(slots[2] != null) {
+					if(slots[2].getItem() != ModItems.ams_muzzle) {
+						this.efficiency = 0;
+						this.warning = 2;
+					}
+				} else {
+					this.efficiency = 0;
+					this.warning = 2;
+				}
+				
 				if(tank.getFill() <= 5 || heat > maxHeat * 0.9)
 					warning = 2;
 				
@@ -320,6 +330,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 
 			PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
 			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, locked ? 1 : 0, 0));
+			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, efficiency, 1));
 		}
 	}
 	

com/hbm/tileentity/machine/TileEntityAMSLimiter.java

@@ -34,7 +34,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 	private ItemStack slots[];
 
 	public long power = 0;
-	public static final long maxPower = 1000000;
+	public static final long maxPower = 10000000;
 	public int efficiency = 0;
 	public static final int maxEfficiency = 100;
 	public int heat = 0;
@@ -304,10 +304,14 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 						mode = 1;
 					else if(slots[2].getItem() == ModItems.ams_focus_booster)
 						mode = 2;
-					else
+					else {
 						this.efficiency = 0;
-				} else
+						this.warning = 2;
+					}
+				} else {
 					this.efficiency = 0;
+					this.warning = 2;
+				}
 				
 				if(tank.getFill() <= 5 || heat > maxHeat * 0.9)
 					warning = 2;
@@ -344,6 +348,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 
 			PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
 			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, locked ? 1 : 0, 0));
+			PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, efficiency, 1));
 		}
 	}
 	

com/hbm/tileentity/machine/TileEntityMachineTransformer.java

@@ -0,0 +1,100 @@
+package com.hbm.tileentity.machine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.hbm.interfaces.IConsumer;
+import com.hbm.interfaces.ISource;
+import com.hbm.items.ModItems;
+import com.hbm.lib.Library;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+
+public class TileEntityMachineTransformer extends TileEntity implements ISource, IConsumer {
+
+	public long power;
+	public static final long maxPower = 1000000000000000L;
+	public List<IConsumer> list = new ArrayList();
+	boolean tact;
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+
+		this.power = nbt.getLong("powerTime");
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+		nbt.setLong("powerTime", power);
+	}
+
+
+	@Override
+	public void updateEntity() {
+		tact = true;
+		ffgeuaInit();
+		tact = false;
+		ffgeuaInit();
+	}
+
+	@Override
+	public void ffgeua(int x, int y, int z, boolean newTact) {
+		
+		Library.ffgeua(x, y, z, newTact, this, worldObj);
+	}
+
+	@Override
+	public void ffgeuaInit() {
+		ffgeua(this.xCoord + 1, this.yCoord, this.zCoord, getTact());
+		ffgeua(this.xCoord - 1, this.yCoord, this.zCoord, getTact());
+		ffgeua(this.xCoord, this.yCoord + 1, this.zCoord, getTact());
+		ffgeua(this.xCoord, this.yCoord - 1, this.zCoord, getTact());
+		ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact());
+		ffgeua(this.xCoord, this.yCoord, this.zCoord - 1, getTact());
+	}
+
+	@Override
+	public long getSPower() {
+		return power;
+	}
+
+	@Override
+	public void setSPower(long i) {
+		this.power = i;
+	}
+
+	@Override
+	public List<IConsumer> getList() {
+		return list;
+	}
+
+	@Override
+	public void clearList() {
+		this.list.clear();
+	}
+
+	@Override
+	public boolean getTact() {
+		return this.tact;
+	}
+
+	@Override
+	public void setPower(long i) {
+		power = i;
+	}
+
+	@Override
+	public long getPower() {
+		return power;
+	}
+
+	@Override
+	public long getMaxPower() {
+		return maxPower;
+	}
+}

com/hbm/world/Meteorite.java

@@ -5,8 +5,12 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.entity.logic.EntityNukeExplosionMK3;
 import com.hbm.explosion.ExplosionLarge;
+import com.hbm.explosion.ExplosionParticle;
+import com.hbm.explosion.ExplosionParticleB;
 import com.hbm.lib.ModDamageSource;
+import com.hbm.main.MainRegistry;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
@@ -27,7 +31,7 @@ public class Meteorite {
 			e.attackEntityFrom(ModDamageSource.meteorite, 1000);
 		}
 		
-		switch(rand.nextInt(500)) {
+		switch(rand.nextInt(300)) {
 		case 0:
 			//Meteor-only tiny meteorite
 			List<ItemStack> list0 = new ArrayList<ItemStack>();
@@ -93,6 +97,46 @@ public class Meteorite {
 			generateSphere7x7(world, rand, x, y, z, list7);
 			generateSphere5x5(world, rand, x, y, z, list8);
 			return;
+		case 9:
+			//Giant ore meteorite
+			List<ItemStack> list9 = new ArrayList<ItemStack>();
+			list9.add(new ItemStack(ModBlocks.block_meteor_broken));
+			generateSphere9x9(world, rand, x, y, z, list9);
+			generateSphere7x7(world, rand, x, y, z, this.getRandomOre(rand));
+			return;
+		case 10:
+			//Tainted Meteorite
+			List<ItemStack> list10 = new ArrayList<ItemStack>();
+			list10.add(new ItemStack(ModBlocks.block_meteor_broken));
+			generateSphere5x5(world, rand, x, y, z, list10);
+			world.setBlock(x, y, z, ModBlocks.taint);
+			return;
+		case 11:
+			//Atomic meteorite
+    		EntityNukeExplosionMK3 entity0 = new EntityNukeExplosionMK3(world);
+    	    entity0.posX = x + 0.5D;
+    	    entity0.posY = y + 0.5D;
+    	    entity0.posZ = z + 0.5D;
+    	    entity0.destructionRange = MainRegistry.fatmanRadius;
+    	    entity0.speed = MainRegistry.blastSpeed;
+    	    entity0.coefficient = 10.0F;
+    	    	
+    	    world.spawnEntityInWorld(entity0);
+    	    if(MainRegistry.polaroidID == 11)
+    	    	if(rand.nextInt(100) >= 0)
+    	    	{
+    	    		ExplosionParticleB.spawnMush(world, x, y - 3, z);
+    	    	} else {
+    	    		ExplosionParticle.spawnMush(world, x, y - 3, z);
+    	    	}
+    	    else
+    	    	if(rand.nextInt(100) == 0)
+    	    	{
+    	    		ExplosionParticleB.spawnMush(world, x, y - 3, z);
+    	    	} else {
+    	    		ExplosionParticle.spawnMush(world, x, y - 3, z);
+    	    	}
+			return;
 		}
 		
 		switch(rand.nextInt(3)) {
@@ -542,6 +586,65 @@ public class Meteorite {
 					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
 				}
 	}
+	
+	public void generateSphere9x9(World world, Random rand, int x, int y, int z, List<ItemStack> set) {
+		for(int a = -4; a < 5; a++)
+			for(int b = -1; b < 2; b++)
+				for(int c = -1; c < 2; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+		for(int a = -1; a < 2; a++)
+			for(int b = -4; b < 5; b++)
+				for(int c = -1; c < 2; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+		for(int a = -1; a < 2; a++)
+			for(int b = -1; b < 2; b++)
+				for(int c = -4; c < 5; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+		
+		for(int a = -1; a < 2; a++)
+			for(int b = -3; b < 4; b++)
+				for(int c = -3; c < 4; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+		for(int a = -3; a < 4; a++)
+			for(int b = -1; b < 2; b++)
+				for(int c = -3; c < 4; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+		for(int a = -3; a < 4; a++)
+			for(int b = -3; b < 4; b++)
+				for(int c = -1; c < 2; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+
+		for(int a = -3; a < 4; a++)
+			for(int b = -2; b < 3; b++)
+				for(int c = -2; c < 3; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+		for(int a = -2; a < 3; a++)
+			for(int b = -3; b < 4; b++)
+				for(int c = -2; c < 3; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+		for(int a = -2; a < 3; a++)
+			for(int b = -2; b < 3; b++)
+				for(int c = -3; c < 4; c++) {
+					ItemStack stack = set.get(rand.nextInt(set.size()));
+					world.setBlock(x + a, y + b, z + c, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 2);
+				}
+	}
 
 	public void generateBox(World world, Random rand, int x, int y, int z, List<ItemStack> set) {
 		for(int a = -1; a < 2; a++)

com/hbm/world/OilSandBubble.java

@@ -0,0 +1,37 @@
+package com.hbm.world;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+
+public class OilSandBubble {
+	
+	private final static Random field_149933_a = new Random();
+
+	public static void spawnOil(World world, int x, int y, int z, int radius) {
+		int r = radius;
+		int r2 = r * r;
+		int r22 = r2 / 2;
+
+		for (int xx = -r; xx < r; xx++) {
+			int X = xx + x;
+			int XX = xx * xx;
+			for (int yy = -r; yy < r; yy++) {
+				int Y = yy + y;
+				int YY = XX + yy * yy * 3;
+				for (int zz = -r; zz < r; zz++) {
+					int Z = zz + z;
+					int ZZ = YY + zz * zz;
+					if (ZZ < r22 + field_149933_a.nextInt(r22 / 3)) {
+						if(world.getBlock(X, Y, Z) == Blocks.sand)
+							world.setBlock(X, Y, Z, ModBlocks.ore_oil_sand);
+					}
+				}
+			}
+		}
+	}
+	
+}