Merge remote-tracking branch 'upstream/master' into machine-configs

build.gradle

@@ -71,6 +71,10 @@ repositories {
 		name = 'ModMaven'
 		url = 'https://modmaven.dev'
 	}
+	maven {
+		name = "gt"
+		url = "https://gregtech.mechaenetia.com/"
+	}
 	//maven {
 	//	name = "CurseForge"
 	//	url = "https://minecraft.curseforge.com/api/maven/"
@@ -87,7 +91,8 @@ dependencies {
 	implementation 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev'
 	compileOnly 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:src'
 
-	//compileOnly 'inventory-tweaks:InventoryTweaks:1.62+beta.84:api'
+	compileOnly "inventorytweaks:InventoryTweaks:1.59-dev:deobf"
+
 	implementation "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api"
 }
 

changelog

@@ -1,29 +1,3 @@
-## Added
-* Plushies
-
-## Changed
-* The fluid burner, heat exchanging heater and cooling tower now use the single steel pipe items instead of the larger steel pipes
-* Reduced the amount of condensers needed for crafting the cooling towers
-* Liquefactors and solidifiers now have a base processing time of 5 seconds per operation (instead of 10)
-* Added some info to the coltass about how the coltan deposit works
-* Moved some NEI handlers around, fluid containers are now listed last and radiolysis is now listed right after cracking, since they have the same recipes
-* The autocrafter's inputs are now limited to 4 items per slot
-* Autocrafters can now receive stacked items again (except for items with containers), if they do not exceed the 4 item threshold
-* Bedrock ores now produce bedrock ore fragments instead of straight outputs, one fragment is equivalent to a nugget
-  * Fragments also differ in stack size when produced, most primary fractions yield 9 (equal to the previous full powder), but things with lower demands/higher value like bismuth now yield substantially less
-* The base speed of the large mining drill when mining bedrock has been reduced by 80%, it is now advisable to either invest in upgrades early on or use multiple drills
-* The bedrock ore processor now has a base speed of 30 seconds
-* Standard, special, HE artillery shells and most missiles now use updated explosion animations
-* Decreased hardness of slag blocks
-* Removed legacy circuits
-
 ## Fixed
-* Fixed crash caused by decontaminating items with the radiolysis machine
+* Fixed pumpjack gauges not syncing properly
-* Fixed ICFs not forming correctly depending on the orientation
+* Fixed some concrete variants not being revertable into uncolored concrete
-* Fixed electrolyzer metal recipe config not working
-* Fixed the meteor charms not working when used on helmets
-* Fixed NEI handler for the ICF's consturction showing inconsistent values
-* Fixed radiolysis recipes not showing up in NEI unless the usage recipes are loaded first
-* Fixed autocrafter's grid not properly updating when using NEI drag and drop for the filter
-* Fixed all carbon-based crucible materials having the wrong ID, this fix will shift IDs but prevent collisions with silicon
-* Fixed primary bedrock ore fraction roasing yielding one extra pile of crumbs

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5036
+mod_build_number=5061
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\
@@ -11,7 +11,7 @@ credits=HbMinecraft,\
   \ Alcater (GUI textures, porting),\
   \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, better particle diodes),\
   \ Pheo (textures, various machines, models, weapons),\
-  \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide),\
+  \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron),\
   \ LePeep (coilgun model, BDCL QC),\
   \ Adam29 (liquid petroleum, ethanol, electric furnace),\
   \ Pvndols (thorium fuel recipe, gas turbine),\
@@ -19,15 +19,16 @@ credits=HbMinecraft,\
   \ Doctor17 (russian localization)),\
   \ Pashtet (russian localization),\
   \ Bismarck (chinese localization),\
+  \ Creeper-banner (chinese localization),\
   \ Maksymisio (polish localization)\
   \ el3ctro4ndre (italian localization),\
   \ Pu-238 (Tom impact effects),\
-  \ UFFR (RTGs, guns, casings, euphemium capacitor),\
+  \ UFFR (RTG pellets, guns, casings, euphemium capacitor),\
-  \ Frooz (models),\
+  \ Frooz (gun models),\
   \ VT-6/24 (models, textures),\
   \ Nos (models),\
   \ Minecreep (models),\
-  \ 70k (textures, glyphid AI, strand caster),\
+  \ 70k (textures, glyphid AI, strand caster, electrolyzer changes),\
   \ haru315 (spiral point algorithm),\
   \ Sten89 (models),\
   \ Pixelguru26 (textures),\
@@ -37,13 +38,14 @@ credits=HbMinecraft,\
   \ Silly541 (config for safe ME drives),\
   \ Voxelstice (OpenComputers integration, turbine spinup),\
   \ BallOfEnergy1 (OpenComputers integration),\
-  \ martemen (project settings),\
   \ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\
   \ SuperCraftAlex (tooltips)\
   \ Ice-Arrow (research reactor tweaks),\
   \ 245tt (anvil GUI improvements),\
   \ KoblizekXD (doors),\
   \ FOlkvangrField (custom machine parts),\
+  \ RosaTryp (centrifuge config),\
   \ Toshayo (satellite loot system, project settings, gradle curse task),\
+  \ martemen (project settings),\
   \ OvermindDL1 (project settings),\
-  \ impbk2002 (project settings),\
+  \ impbk2002 (project settings)\

src/main/java/api/hbm/energymk2/IBatteryItem.java

@@ -10,7 +10,7 @@ public interface IBatteryItem {
 	public void setCharge(ItemStack stack, long i);
 	public void dischargeBattery(ItemStack stack, long i);
 	public long getCharge(ItemStack stack);
-	public long getMaxCharge();
+	public long getMaxCharge(ItemStack stack);
 	public long getChargeRate();
 	public long getDischargeRate();
 	

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

@@ -4,6 +4,7 @@ import com.hbm.lib.RefStrings;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
@@ -12,6 +13,7 @@ import net.minecraft.world.World;
 public class BlockBase extends Block {
 	
 	private boolean beaconable = false;
+	private boolean canSpawn = true;
 
 	public BlockBase() {
 		super(Material.rock);
@@ -36,6 +38,16 @@ public class BlockBase extends Block {
 		this.beaconable = true;
 		return this;
 	}
+	
+	public BlockBase noMobSpawn() {
+		this.canSpawn = false;
+		return this;
+	}
+
+	@Override
+	public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
+		return this.canSpawn ? super.canCreatureSpawn(type, world, x, y, z) : false;
+	}
 
 	@Override
 	public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) {

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

@@ -148,11 +148,6 @@ public class ModBlocks {
 
 	public static Block ore_tikite;
 
-	public static Block crystal_power;
-	public static Block crystal_energy;
-	public static Block crystal_robust;
-	public static Block crystal_trixite;
-
 	public static Block block_thorium;
 	public static Block block_thorium_fuel;
 	public static Block block_uranium;
@@ -273,8 +268,6 @@ public class ModBlocks {
 	public static Block snowglobe;
 	public static Block plushie;
 
-	public static Block hazmat;
-
 	public static Block gravel_obsidian;
 	public static Block gravel_diamond;
 	public static Block asphalt;
@@ -501,6 +494,7 @@ public class ModBlocks {
 	public static Block oil_spill;
 
 	public static Block sellafield_slaked;
+	public static Block sellafield_bedrock;
 	public static Block sellafield;
 	public static Block ore_sellafield_diamond;
 	public static Block ore_sellafield_emerald;
@@ -763,8 +757,6 @@ public class ModBlocks {
 	public static Block cable_detector;
 	public static Block cable_diode;
 	public static Block machine_detector;
-	public static Block fluid_duct;
-	public static Block fluid_duct_solid;
 	public static Block fluid_duct_neo;
 	public static Block fluid_duct_box;
 	public static Block fluid_duct_paintable;
@@ -1328,14 +1320,9 @@ public class ModBlocks {
 		ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil");
 		ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty");
 		ore_oil_sand = new BlockFalling(Material.sand).setBlockName("ore_oil_sand").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeSand).setHardness(0.5F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_sand_alt");
-		ore_bedrock_oil = new BlockGeneric(Material.rock).setBlockName("ore_bedrock_oil").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(1_000_000).setBlockTextureName(RefStrings.MODID + ":ore_bedrock_oil");
+		ore_bedrock_oil = new BlockGeneric(Material.rock).noMobSpawn().setBlockName("ore_bedrock_oil").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(1_000_000).setBlockTextureName(RefStrings.MODID + ":ore_bedrock_oil");
 		
 		ore_tikite = new BlockDragonProof(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt");
-
-		crystal_power = new BlockCrystal(Material.glass).setBlockName("crystal_power").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_power");
-		crystal_energy = new BlockCrystal(Material.glass).setBlockName("crystal_energy").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_energy");
-		crystal_robust = new BlockCrystal(Material.glass).setBlockName("crystal_robust").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(10.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":crystal_robust");
-		crystal_trixite = new BlockCrystal(Material.glass).setBlockName("crystal_trixite").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_trixite");
 		
 		block_uranium = new BlockHazard().makeBeaconable().setBlockName("block_uranium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(50.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium");
 		block_u233 = new BlockHazard().makeBeaconable().setDisplayEffect(ExtDisplayEffect.RADFOG).setBlockName("block_u233").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(50.0F).setBlockTextureName(RefStrings.MODID + ":block_u233");
@@ -1456,7 +1443,6 @@ public class ModBlocks {
 		bobblehead = new BlockBobble().setBlockName("bobblehead").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		snowglobe = new BlockSnowglobe().setBlockName("snowglobe").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":glass_boron");
 		plushie = new BlockPlushie().setBlockName("plushie").setStepSound(Block.soundTypeCloth).setResistance(50_0000.0F).setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_fiberglass_side");
-		hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":hazmat");
 		
 		gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(240.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");
 		gravel_diamond = new BlockFalling(Material.sand).setBlockName("gravel_diamond").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":gravel_diamond");
@@ -1680,6 +1666,7 @@ public class ModBlocks {
 		stone_cracked = new BlockFalling(Material.rock).setBlockName("stone_cracked").setStepSound(Block.soundTypeStone).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setBlockTextureName(RefStrings.MODID + ":stone_cracked");
 		
 		sellafield_slaked = new BlockSellafieldSlaked(Material.rock).setBlockName("sellafield_slaked").setStepSound(Block.soundTypeStone).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setBlockTextureName(RefStrings.MODID + ":sellafield_slaked");
+		sellafield_bedrock = new BlockSellafieldSlaked(Material.rock).setBlockName("sellafield_bedrock").setBlockUnbreakable().setResistance(6000000.0F).setStepSound(Block.soundTypeStone).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":sellafield_slaked");
 		sellafield = new BlockSellafield(Material.rock).setBlockName("sellafield").setStepSound(Block.soundTypeStone).setHardness(5.0F).setBlockTextureName(RefStrings.MODID + ":sellafield_0");
 		ore_sellafield_diamond = new BlockSellafieldOre(Material.rock).setBlockName("ore_sellafield_diamond").setStepSound(Block.soundTypeStone).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setBlockTextureName(RefStrings.MODID + ":ore_overlay_diamond");
 		ore_sellafield_emerald = new BlockSellafieldOre(Material.rock).setBlockName("ore_sellafield_emerald").setStepSound(Block.soundTypeStone).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setBlockTextureName(RefStrings.MODID + ":ore_overlay_emerald");
@@ -1881,8 +1868,6 @@ public class ModBlocks {
 		cable_detector = new CableDetector(Material.iron).setBlockName("cable_detector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		cable_diode = new CableDiode(Material.iron).setBlockName("cable_diode").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cable_diode");
 		machine_detector = new PowerDetector(Material.iron).setBlockName("machine_detector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_detector_off");
-		fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon");
-		fluid_duct_solid = new BlockFluidDuctSolid(Material.iron).setBlockName("fluid_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":fluid_duct_solid");
 		fluid_duct_neo = new FluidDuctStandard(Material.iron).setBlockName("fluid_duct_neo").setStepSound(ModSoundTypes.pipe).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pipe_neo");
 		fluid_duct_box = new FluidDuctBox(Material.iron).setBlockName("fluid_duct_box").setStepSound(ModSoundTypes.pipe).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_box");
 		fluid_duct_exhaust = new FluidDuctBoxExhaust(Material.iron).setBlockName("fluid_duct_exhaust").setStepSound(ModSoundTypes.pipe).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_box");
@@ -2167,9 +2152,9 @@ public class ModBlocks {
 		boxcar = new DecoBlock(Material.iron).setBlockName("boxcar").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boxcar");
 		boat = new DecoBlock(Material.iron).setBlockName("boat").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boat");
 
-		machine_well = new MachineOilWell().setBlockName("machine_well").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_well");
+		machine_well = new MachineOilWell().setBlockName("machine_well").setHardness(5.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_well");
-		machine_pumpjack = new MachinePumpjack().setBlockName("machine_pumpjack").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_pumpjack");
+		machine_pumpjack = new MachinePumpjack().setBlockName("machine_pumpjack").setHardness(5.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_pumpjack");
-		machine_fracking_tower = new MachineFrackingTower().setBlockName("machine_fracking_tower").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
+		machine_fracking_tower = new MachineFrackingTower().setBlockName("machine_fracking_tower").setHardness(5.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		oil_pipe = new BlockNoDrop(Material.iron).setBlockName("oil_pipe").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":oil_pipe");
 		machine_flare = new MachineGasFlare(Material.iron).setBlockName("machine_flare").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		chimney_brick = new MachineChimneyBrick(Material.iron).setBlockName("chimney_brick").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":brick_fire");
@@ -2455,12 +2440,6 @@ public class ModBlocks {
 		//Secret
 		register(stone_keyhole);
 		
-		//Crystals
-		GameRegistry.registerBlock(crystal_power, crystal_power.getUnlocalizedName());
-		GameRegistry.registerBlock(crystal_energy, crystal_energy.getUnlocalizedName());
-		GameRegistry.registerBlock(crystal_robust, crystal_robust.getUnlocalizedName());
-		GameRegistry.registerBlock(crystal_trixite, crystal_trixite.getUnlocalizedName());
-		
 		//Resource-bearing Stones
 		register(stone_resource);
 		register(stalagmite);
@@ -2603,7 +2582,6 @@ public class ModBlocks {
 		GameRegistry.registerBlock(bobblehead, ItemBlockMeta.class, bobblehead.getUnlocalizedName());
 		GameRegistry.registerBlock(snowglobe, ItemBlockMeta.class, snowglobe.getUnlocalizedName());
 		GameRegistry.registerBlock(plushie, ItemBlockBase.class, plushie.getUnlocalizedName());
-		GameRegistry.registerBlock(hazmat, hazmat.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_rbmk, deco_rbmk.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_rbmk_smooth, deco_rbmk_smooth.getUnlocalizedName());
 		
@@ -2822,6 +2800,7 @@ public class ModBlocks {
 		
 		//RAD
 		register(sellafield_slaked);
+		register(sellafield_bedrock);
 		register(ore_sellafield_diamond);
 		register(ore_sellafield_emerald);
 		register(ore_sellafield_uranium_scorched);
@@ -3131,13 +3110,11 @@ public class ModBlocks {
 		GameRegistry.registerBlock(cable_detector, cable_detector.getUnlocalizedName());
 		GameRegistry.registerBlock(cable_diode, ItemBlockBase.class, cable_diode.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_detector, machine_detector.getUnlocalizedName());
-		GameRegistry.registerBlock(fluid_duct, fluid_duct.getUnlocalizedName());
 		register(fluid_duct_neo);
 		register(fluid_duct_box);
 		register(fluid_duct_exhaust);
 		register(fluid_duct_paintable);
 		register(fluid_duct_gauge);
-		GameRegistry.registerBlock(fluid_duct_solid, fluid_duct_solid.getUnlocalizedName());
 		register(fluid_valve);
 		register(fluid_switch);
 		register(machine_drain);

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

@@ -25,6 +25,7 @@ import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
@@ -48,6 +49,11 @@ public class BlockBedrockOreTE extends BlockContainer implements ILookOverlay, I
 		this.setResistance(1_000_000);
 	}
 
+	@Override
+	public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
+		return false;
+	}
+
 	@Override
 	public TileEntity createNewTileEntity(World world, int meta) {
 		return new TileEntityBedrockOre();

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

@@ -1,34 +0,0 @@
-package com.hbm.blocks.generic;
-
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import net.minecraft.block.material.Material;
-import net.minecraft.world.World;
-
-public class BlockCrystal extends BlockDragonProof {
-
-	public BlockCrystal(Material mat) {
-		super(mat);
-	}
-
-	public static int renderID = RenderingRegistry.getNextAvailableRenderId();
-
-	@Override
-	public int getRenderType() {
-		return renderID;
-	}
-
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
-
-	@Override
-	public int onBlockPlaced(World world, int x, int y, int z, int side, float hX, float hY, float hZ, int meta) {
-		return side;
-	}
-}

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

@@ -2,6 +2,7 @@ package com.hbm.blocks.generic;
 
 import java.awt.Color;
 
+import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 
 import cpw.mods.fml.relauncher.Side;
@@ -9,6 +10,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
@@ -50,4 +52,9 @@ public class BlockSellafieldSlaked extends Block {
 		int meta = world.getBlockMetadata(x, y, z);
 		return Color.HSBtoRGB(0F, 0F, 1F - meta / 15F);
 	}
+	
+	@Override
+	public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
+		return this == ModBlocks.sellafield_bedrock ? false : super.canCreatureSpawn(type, world, x, y, z);
+	}
 }

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

@@ -67,7 +67,7 @@ public class HEVBattery extends Block {
 
 					if(st.getItem() instanceof IBatteryItem) {
 
-						long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge();
+						long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(st);
 						long charge = ((IBatteryItem) st.getItem()).getCharge(st);
 						long newcharge = Math.min(charge + 150000, maxcharge);
 

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

@@ -5,11 +5,17 @@ import java.util.List;
 
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.IPersistentInfoProvider;
+import com.hbm.explosion.vanillant.ExplosionVNT;
+import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard;
+import com.hbm.explosion.vanillant.standard.BlockProcessorStandard;
+import com.hbm.explosion.vanillant.standard.EntityProcessorStandard;
+import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
+import com.hbm.handler.MultiblockHandlerXR;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.main.MainRegistry;
+import com.hbm.particle.helper.ExplosionCreator;
 import com.hbm.tileentity.IPersistentNBT;
-import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineOilWell;
 import com.hbm.util.BobMathUtil;
 
@@ -20,6 +26,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -31,15 +38,13 @@ public class MachineOilWell extends BlockDummyable implements IPersistentInfoPro
 
 	@Override
 	public TileEntity createNewTileEntity(World world, int meta) {
-		
 		if(meta >= 12) return new TileEntityMachineOilWell();
-		if(meta >= 6) return new TileEntityProxyCombo(false, true, true);
 		return null;
 	}
 
 	@Override
 	public int[] getDimensions() {
-		return new int[] {5, 0, 1, 1, 1, 1};
+		return new int[] {9, 0, 1, 1, 1, 1};
 	}
 
 	@Override
@@ -47,13 +52,24 @@ public class MachineOilWell extends BlockDummyable implements IPersistentInfoPro
 		return 0;
 	}
 
+	@Override
+	protected boolean checkRequirement(World world, int x, int y, int z, ForgeDirection dir, int o) {
+		return MultiblockHandlerXR.checkSpace(world, x, y, z, new int[] {1, -1, 0, 0, 0, 0}, x, y, z, dir) &&
+				MultiblockHandlerXR.checkSpace(world, x, y + 1, z, new int[] {8, 0, 1, 1, 1, 1}, x, y, z, dir) &&
+				MultiblockHandlerXR.checkSpace(world, x + 1, y + 1, z + 1, new int[] {-1, 1, 0, 0, 0, 0}, x, y, z, dir) &&
+				MultiblockHandlerXR.checkSpace(world, x + 1, y + 1, z - 1, new int[] {-1, 1, 0, 0, 0, 0}, x, y, z, dir) &&
+				MultiblockHandlerXR.checkSpace(world, x - 1, y + 1, z + 1, new int[] {-1, 1, 0, 0, 0, 0}, x, y, z, dir) &&
+				MultiblockHandlerXR.checkSpace(world, x - 1, y + 1, z - 1, new int[] {-1, 1, 0, 0, 0, 0}, x, y, z, dir);
+	}
+
 	@Override
 	public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) {
-		super.fillSpace(world, x, y, z, dir, o);
+		MultiblockHandlerXR.fillSpace(world, x, y, z, new int[] {1, -1, 0, 0, 0, 0}, this, dir);
-		this.makeExtra(world, x + dir.offsetX * o + 1, y, z + dir.offsetZ * o);
+		MultiblockHandlerXR.fillSpace(world, x, y + 1, z, new int[] {8, 0, 1, 1, 1, 1}, this, dir);
-		this.makeExtra(world, x + dir.offsetX * o - 1, y, z + dir.offsetZ * o);
+		MultiblockHandlerXR.fillSpace(world, x + 1, y + 1, z + 1, new int[] {-1, 1, 0, 0, 0, 0}, this, dir);
-		this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o + 1);
+		MultiblockHandlerXR.fillSpace(world, x + 1, y + 1, z - 1, new int[] {-1, 1, 0, 0, 0, 0}, this, dir);
-		this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o - 1);
+		MultiblockHandlerXR.fillSpace(world, x - 1, y + 1, z + 1, new int[] {-1, 1, 0, 0, 0, 0}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x - 1, y + 1, z - 1, new int[] {-1, 1, 0, 0, 0, 0}, this, dir);
 	}
 	
 	@Override
@@ -89,4 +105,31 @@ public class MachineOilWell extends BlockDummyable implements IPersistentInfoPro
 			list.add(EnumChatFormatting.YELLOW + "" + tank.getFill() + "/" + tank.getMaxFill() + "mB " + tank.getTankType().getLocalizedName());
 		}
 	}
+
+	@Override
+	public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) {
+
+		int[] pos = this.findCore(world, x, y, z);
+		if(pos == null) return;
+		TileEntity core = world.getTileEntity(pos[0], pos[1], pos[2]);
+		if(!(core instanceof TileEntityMachineOilWell)) return;
+		
+		world.setBlockToAir(x, y, z);
+		onBlockDestroyedByExplosion(world, x, y, z, explosion);
+		
+		TileEntityMachineOilWell well = (TileEntityMachineOilWell) core;
+		if(well.tanks[0].getFill() > 0 || well.tanks[1].getFill() > 0) {
+			well.tanks[0].setFill(0);
+			well.tanks[1].setFill(0);
+
+			ExplosionVNT xnt = new ExplosionVNT(world, pos[0] + 0.5, pos[1] + 0.5, pos[2] + 0.5, 15F);
+			xnt.setBlockAllocator(new BlockAllocatorStandard(24));
+			xnt.setBlockProcessor(new BlockProcessorStandard().setNoDrop());
+			xnt.setEntityProcessor(new EntityProcessorStandard());
+			xnt.setPlayerProcessor(new PlayerProcessorStandard());
+			xnt.explode();
+			
+			ExplosionCreator.composeEffect(world, pos[0] + 0.5, pos[1] + 0.5, pos[2] + 0.5, 10, 2F, 0.5F, 25F, 5, 8, 20, 0.75F, 1F, -2F, 150);
+		}
+	}
 }

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

@@ -12,44 +12,38 @@ import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 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.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
 public class MachinePuF6Tank extends BlockContainer implements IMultiblock {
-	
-    private final Random field_149933_a = new Random();
-	private static boolean keepInventory;
 
 	public MachinePuF6Tank(Material p_i45386_1_) {
 		super(p_i45386_1_);
 	}
-	
+
 	@Override
-	public int getRenderType(){
+	public int getRenderType() {
 		return -1;
 	}
-	
+
 	@Override
 	public boolean isOpaqueCube() {
 		return false;
 	}
-	
+
 	@Override
 	public boolean renderAsNormalBlock() {
 		return false;
 	}
-	
+
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister iconregister) {
@@ -62,101 +56,41 @@ public class MachinePuF6Tank extends BlockContainer implements IMultiblock {
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
-    {
+		return Item.getItemFromBlock(ModBlocks.machine_puf6_tank);
-        return Item.getItemFromBlock(ModBlocks.machine_puf6_tank);
+	}
-    }
+
-	
 	@Override
 	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
 		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-		
+
-		if(i == 0)
+		if(i == 0) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
 		}
-		if(i == 1)
+		if(i == 1) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
 		}
-		if(i == 2)
+		if(i == 2) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
 		}
-		if(i == 3)
+		if(i == 3) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
 		}
-		
+
 		if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.uf6Dimension)) {
 			MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.uf6Dimension, ModBlocks.dummy_block_puf6);
-			
+
 		} else
 			world.func_147480_a(x, y, z, true);
 	}
-	
-	@Override
-	public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_)
-    {		
-        if (!keepInventory)
-        {
-        	TileEntityMachinePuF6Tank tileentityfurnace = (TileEntityMachinePuF6Tank)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_);
 
-            if (tileentityfurnace != null)
-            {
-                for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1)
-                {
-                    ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
-
-                    if (itemstack != null)
-                    {
-                        float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
-                        float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
-                        float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
-
-                        while (itemstack.stackSize > 0)
-                        {
-                            int j1 = this.field_149933_a.nextInt(21) + 10;
-
-                            if (j1 > itemstack.stackSize)
-                            {
-                                j1 = itemstack.stackSize;
-                            }
-
-                            itemstack.stackSize -= j1;
-                            EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
-
-                            if (itemstack.hasTagCompound())
-                            {
-                                entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy());
-                            }
-
-                            float f3 = 0.05F;
-                            entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3;
-                            entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F;
-                            entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3;
-                            p_149749_1_.spawnEntityInWorld(entityitem);
-                        }
-                    }
-                }
-
-                p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_);
-            }
-        }
-
-        super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
-    }
-	
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
-		if(world.isRemote)
+		if(world.isRemote) {
-		{
 			return true;
-		} else if(!player.isSneaking())
+		} else if(!player.isSneaking()) {
-		{
 			TileEntityMachinePuF6Tank entity = (TileEntityMachinePuF6Tank) world.getTileEntity(x, y, z);
-			if(entity != null)
+			if(entity != null) {
-			{
 				FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z);
 			}
 			return true;

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

@@ -12,44 +12,38 @@ import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 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.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
 public class MachineUF6Tank extends BlockContainer implements IMultiblock {
-	
-    private final Random field_149933_a = new Random();
-	private static boolean keepInventory;
 
 	public MachineUF6Tank(Material p_i45386_1_) {
 		super(p_i45386_1_);
 	}
-	
+
 	@Override
-	public int getRenderType(){
+	public int getRenderType() {
 		return -1;
 	}
-	
+
 	@Override
 	public boolean isOpaqueCube() {
 		return false;
 	}
-	
+
 	@Override
 	public boolean renderAsNormalBlock() {
 		return false;
 	}
-	
+
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister iconregister) {
@@ -62,101 +56,41 @@ public class MachineUF6Tank extends BlockContainer implements IMultiblock {
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
-    {
+		return Item.getItemFromBlock(ModBlocks.machine_uf6_tank);
-        return Item.getItemFromBlock(ModBlocks.machine_uf6_tank);
+	}
-    }
+
-	
 	@Override
 	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
 		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-		
+
-		if(i == 0)
+		if(i == 0) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
 		}
-		if(i == 1)
+		if(i == 1) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
 		}
-		if(i == 2)
+		if(i == 2) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
 		}
-		if(i == 3)
+		if(i == 3) {
-		{
 			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
 		}
-		
+
 		if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.uf6Dimension)) {
 			MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.uf6Dimension, ModBlocks.dummy_block_uf6);
-			
+
 		} else
 			world.func_147480_a(x, y, z, true);
 	}
-	
-	@Override
-	public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_)
-    {
-        if (!keepInventory)
-        {
-        	TileEntityMachineUF6Tank tileentityfurnace = (TileEntityMachineUF6Tank)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_);
 
-            if (tileentityfurnace != null)
-            {
-                for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1)
-                {
-                    ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
-
-                    if (itemstack != null)
-                    {
-                        float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
-                        float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
-                        float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
-
-                        while (itemstack.stackSize > 0)
-                        {
-                            int j1 = this.field_149933_a.nextInt(21) + 10;
-
-                            if (j1 > itemstack.stackSize)
-                            {
-                                j1 = itemstack.stackSize;
-                            }
-
-                            itemstack.stackSize -= j1;
-                            EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
-
-                            if (itemstack.hasTagCompound())
-                            {
-                                entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy());
-                            }
-
-                            float f3 = 0.05F;
-                            entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3;
-                            entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F;
-                            entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3;
-                            p_149749_1_.spawnEntityInWorld(entityitem);
-                        }
-                    }
-                }
-
-                p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_);
-            }
-        }
-
-        super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
-    }
-	
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
-		if(world.isRemote)
+		if(world.isRemote) {
-		{
 			return true;
-		} else if(!player.isSneaking())
+		} else if(!player.isSneaking()) {
-		{
 			TileEntityMachineUF6Tank entity = (TileEntityMachineUF6Tank) world.getTileEntity(x, y, z);
-			if(entity != null)
+			if(entity != null) {
-			{
 				FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z);
 			}
 			return true;

src/main/java/com/hbm/blocks/network/BlockFluidDuct.java

@@ -1,103 +0,0 @@
-package com.hbm.blocks.network;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.hbm.blocks.ILookOverlay;
-import com.hbm.tileentity.conductor.TileEntityFluidDuct;
-import com.hbm.tileentity.conductor.TileEntityFluidDuctSimple;
-import com.hbm.util.I18nUtil;
-
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
-
-public class BlockFluidDuct extends BlockContainer implements ILookOverlay {
-
-	public BlockFluidDuct(Material p_i45386_1_) {
-		super(p_i45386_1_);
-		float p = 1F/16F;
-		this.setBlockBounds(11 * p / 2, 11 * p / 2, 11 * p / 2, 1 - 11 * p / 2, 1 - 11 * p / 2, 1 - 11 * p / 2);
-		this.useNeighborBrightness = true;
-	}
-	
-	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-		if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) {
-			TileEntityFluidDuct cable = (TileEntityFluidDuct)world.getTileEntity(x, y, z);
-
-		if(cable != null)
-		{
-			float p = 1F/16F;
-			float minX = 11 * p / 2 - (cable.connections[5] != null ? (11 * p / 2) : 0);
-			float minY = 11 * p / 2 - (cable.connections[1] != null ? (11 * p / 2) : 0);
-			float minZ = 11 * p / 2 - (cable.connections[2] != null ? (11 * p / 2) : 0);
-			float maxX = 1 - 11 * p / 2 + (cable.connections[3] != null ? (11 * p / 2) : 0);
-			float maxY = 1 - 11 * p / 2 + (cable.connections[0] != null ? (11 * p / 2) : 0);
-			float maxZ = 1 - 11 * p / 2 + (cable.connections[4] != null ? (11 * p / 2) : 0);
-			
-			this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
-		}
-		}
-		return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
-	}
-	
-	@Override
-	public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
-		if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) {
-			TileEntityFluidDuct cable = (TileEntityFluidDuct)world.getTileEntity(x, y, z);
-
-		if(cable != null)
-		{
-			float p = 1F/16F;
-			float minX = 11 * p / 2 - (cable.connections[5] != null ? (11 * p / 2) : 0);
-			float minY = 11 * p / 2 - (cable.connections[1] != null ? (11 * p / 2) : 0);
-			float minZ = 11 * p / 2 - (cable.connections[2] != null ? (11 * p / 2) : 0);
-			float maxX = 1 - 11 * p / 2 + (cable.connections[3] != null ? (11 * p / 2) : 0);
-			float maxY = 1 - 11 * p / 2 + (cable.connections[0] != null ? (11 * p / 2) : 0);
-			float maxZ = 1 - 11 * p / 2 + (cable.connections[4] != null ? (11 * p / 2) : 0);
-			
-			this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
-		}
-		}
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
-		return new TileEntityFluidDuct();
-	}
-	
-	@Override
-	public int getRenderType(){
-		return -1;
-	}
-	
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-	
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
-
-	@Override
-	public void printHook(Pre event, World world, int x, int y, int z) {
-		
-		TileEntity te = world.getTileEntity(x, y, z);
-		
-		if(!(te instanceof TileEntityFluidDuctSimple))
-			return;
-		
-		TileEntityFluidDuctSimple duct = (TileEntityFluidDuctSimple) te;
-		
-		List<String> text = new ArrayList();
-		text.add("&[" + duct.getType().getColor() + "&]" + duct.getType().getLocalizedName());
-		ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text);
-	}
-}

src/main/java/com/hbm/blocks/network/BlockFluidDuctSolid.java

@@ -1,88 +0,0 @@
-package com.hbm.blocks.network;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.hbm.blocks.IBlockMultiPass;
-import com.hbm.blocks.ILookOverlay;
-import com.hbm.render.block.RenderBlockMultipass;
-import com.hbm.tileentity.conductor.TileEntityFluidDuctSimple;
-import com.hbm.util.I18nUtil;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-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.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
-
-public class BlockFluidDuctSolid extends BlockContainer implements IBlockMultiPass, ILookOverlay {
-
-	public BlockFluidDuctSolid(Material mat) {
-		super(mat);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
-		return new TileEntityFluidDuctSimple();
-	}
-
-	@SideOnly(Side.CLIENT)
-	private IIcon overlay;
-
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister p_149651_1_) {
-		this.blockIcon = p_149651_1_.registerIcon(this.getTextureName());
-		this.overlay = p_149651_1_.registerIcon(this.getTextureName() + "_overlay");
-	}
-
-	@Override
-	public int getPasses() {
-		return 2;
-	}
-	
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int meta) {
-		return RenderBlockMultipass.currentPass == 0 ? this.blockIcon : this.overlay;
-	}
-	
-	@Override
-	public int getRenderType(){
-		return IBlockMultiPass.getRenderType();
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		
-		if(RenderBlockMultipass.currentPass == 0)
-			return 0xffffff;
-		
-		TileEntityFluidDuctSimple te = (TileEntityFluidDuctSimple) world.getTileEntity(x, y, z);
-		
-		if(te != null) {
-			return te.getType().getColor();
-		}
-		
-		return 0xffffff;
-	}
-
-	@Override
-	public void printHook(Pre event, World world, int x, int y, int z) {
-		
-		TileEntity te = world.getTileEntity(x, y, z);
-		
-		if(!(te instanceof TileEntityFluidDuctSimple))
-			return;
-		
-		TileEntityFluidDuctSimple duct = (TileEntityFluidDuctSimple) te;
-		
-		List<String> text = new ArrayList();
-		text.add("&[" + duct.getType().getColor() + "&]" + duct.getType().getLocalizedName());
-		ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text);
-	}
-}

src/main/java/com/hbm/config/FalloutConfigJSON.java

@@ -87,6 +87,10 @@ public class FalloutConfigJSON {
 			if(m > 4) entries.add(new FalloutEntry().prim(new Triplet(ModBlocks.ore_sellafield_schrabidium, m, 1),	new Triplet(ModBlocks.ore_sellafield_uranium_scorched, m, 9))		.max(i * 5).sol(true).mB(ModBlocks.ore_uranium));
 			if(m > 4) entries.add(new FalloutEntry().prim(new Triplet(ModBlocks.ore_sellafield_schrabidium, m, 1),	new Triplet(ModBlocks.ore_sellafield_uranium_scorched, m, 9))		.max(i * 5).sol(true).mB(ModBlocks.ore_gneiss_uranium));
 			entries.add(new FalloutEntry().prim(new Triplet(ModBlocks.ore_sellafield_radgem, m, 1))																						.max(i * 5).sol(true).mB(Blocks.diamond_ore));
+			entries.add(new FalloutEntry()							.prim(new Triplet(ModBlocks.sellafield_bedrock, m, 1)).max(i * 5).sol(true).mB(Blocks.bedrock));
+			entries.add(new FalloutEntry()							.prim(new Triplet(ModBlocks.sellafield_bedrock, m, 1)).max(i * 5).sol(true).mB(ModBlocks.ore_bedrock));
+			entries.add(new FalloutEntry()							.prim(new Triplet(ModBlocks.sellafield_bedrock, m, 1)).max(i * 5).sol(true).mB(ModBlocks.ore_bedrock_oil));
+			entries.add(new FalloutEntry()							.prim(new Triplet(ModBlocks.sellafield_bedrock, m, 1)).max(i * 5).sol(true).mB(ModBlocks.sellafield_bedrock));
 			entries.add(new FalloutEntry()							.prim(new Triplet(ModBlocks.sellafield_slaked, m, 1)).max(i * 5).sol(true).mMa(Material.iron));
 			entries.add(new FalloutEntry()							.prim(new Triplet(ModBlocks.sellafield_slaked, m, 1)).max(i * 5).sol(true).mMa(Material.rock));
 			entries.add(new FalloutEntry()							.prim(new Triplet(ModBlocks.sellafield_slaked, m, 1)).max(i * 5).sol(true).mMa(Material.sand));
@@ -96,7 +100,6 @@ public class FalloutConfigJSON {
 			if(stone != null)		entries.add(new FalloutEntry()	.prim(new Triplet(ModBlocks.sellafield_slaked, m, 1)).max(i * 5).sol(true).mB(stone));
 		}
 		
-		//entries.add(new FalloutEntry().mB(Blocks.grass).prim(new Triplet(ModBlocks.waste_earth, 0, 1)));
 		entries.add(new FalloutEntry()
 				.mB(Blocks.mycelium)
 				.prim(new Triplet(ModBlocks.waste_mycelium, 0, 1)));
@@ -209,31 +212,23 @@ public class FalloutConfigJSON {
 			if(matchesOpaque && !b.isOpaqueCube()) return false;
 			if(dist > maxDist * falloffStart && Math.abs(world.rand.nextGaussian()) < Math.pow((dist - maxDist * falloffStart) / (maxDist - maxDist * falloffStart), 2D) * 3D) return false;
 
-			if(primaryChance == 1D || rand.nextDouble() < primaryChance) {
+			MetaBlock conversion = chooseRandomOutcome((primaryChance == 1D || rand.nextDouble() < primaryChance) ? primaryBlocks : secondaryBlocks);
+			
+			if(conversion != null) {
+				if(conversion.block == ModBlocks.sellafield_slaked && originalBlock == ModBlocks.sellafield_slaked && conversion.meta <= originalMeta) return false;
+				if(conversion.block == ModBlocks.sellafield_bedrock && originalBlock == ModBlocks.sellafield_bedrock && conversion.meta <= originalMeta) return false;
+				if(originalBlock == ModBlocks.sellafield_bedrock && conversion.block != ModBlocks.sellafield_bedrock) return false;
+				if(y == 0 && conversion.block != ModBlocks.sellafield_bedrock) return false;
 				
-				if(primaryBlocks == null) return false;
+				world.setBlock(x, y, z, conversion.block, conversion.meta, 3);
-				
-				MetaBlock block = chooseRandomOutcome(primaryBlocks);
-				if(block.block == ModBlocks.sellafield_slaked && originalBlock == ModBlocks.sellafield_slaked) {
-					if(block.meta <= originalMeta) return false;
-				}
-				world.setBlock(x, y, z, block.block, block.meta, 3);
-				return true;
-				
-			} else {
-				
-				if(secondaryBlocks == null) return false;
-				
-				MetaBlock block = chooseRandomOutcome(secondaryBlocks);
-				if(block.block == ModBlocks.sellafield_slaked && originalBlock == ModBlocks.sellafield_slaked) {
-					if(block.meta <= originalMeta) return false;
-				}
-				world.setBlock(x, y, z, block.block, block.meta, 3);
 				return true;
 			}
+			
+			return false;
 		}
 		
 		private MetaBlock chooseRandomOutcome(Triplet<Block, Integer, Integer>[] blocks) {
+			if(blocks == null) return null;
 			
 			int weight = 0;
 			

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

@@ -423,8 +423,6 @@ public class MineralRecipes {
 		add1To9Pair(ModItems.powder_paleogenite, ModItems.powder_paleogenite_tiny);
 		add1To9Pair(ModItems.ingot_osmiridium, ModItems.nugget_osmiridium);
 
-		GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth });
-		GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat });
 		GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire_shard, 1), new Object[] { "##", "##", '#', ModItems.powder_balefire });
 		add9To1(ModItems.cell_balefire, ModItems.egg_balefire_shard);
 		

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

@@ -101,7 +101,7 @@ public class PowderRecipes {
 		CraftingManager.addShapelessAuto(DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.PINK, 2),			new Object[] { DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.RED),		DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.WHITE) });
 		CraftingManager.addShapelessAuto(DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.GREEN, 2),		new Object[] { DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.BLUE),		DictFrame.fromOne(ModItems.chemical_dye, EnumChemDye.YELLOW) });
 		
-		for(int i = 0; i < 15; i++) CraftingManager.addShapelessAuto(new ItemStack(ModItems.crayon, 4, i), new Object[] { new ItemStack(ModItems.chemical_dye, 1, i), ANY_TAR.any() });
+		for(int i = 0; i < 15; i++) CraftingManager.addShapelessAuto(new ItemStack(ModItems.crayon, 4, i), new Object[] { new ItemStack(ModItems.chemical_dye, 1, i), ANY_TAR.any(), Items.paper });
 
 	}
 }

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

@@ -95,7 +95,6 @@ public class ToolRecipes {
 		CraftingManager.addRecipeAuto(ItemToolAbilityFueled.getEmptyTool(ModItems.chainsaw), new Object[] { "CCH", "BBP", "CCE", 'H', STEEL.shell(), 'B', ModItems.blades_steel, 'P', ModItems.piston_selenium, 'C', ModBlocks.chain, 'E', ModItems.canister_empty });
 
 		//Misc
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.euphemium_stopper, 1), new Object[] { "I", "S", "S", 'I', EUPH.ingot(), 'S', KEY_STICK });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.crowbar, 1), new Object[] { "II", " I", " I", 'I', STEEL.ingot() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.bottle_opener, 1), new Object[] { "S", "P", 'S', STEEL.plate(), 'P', KEY_PLANKS });
 		CraftingManager.addRecipeAuto(new ItemStack(Items.saddle, 1), new Object[] { "LLL", "LRL", " S ", 'S', STEEL.ingot(), 'L', Items.leather, 'R', DictFrame.fromOne(ModItems.plant_item, EnumPlantType.ROPE) });
@@ -147,7 +146,7 @@ public class ToolRecipes {
 
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.mirror_tool), new Object[] { " A ", " IA", "I  ", 'A', AL.ingot(), 'I', IRON.ingot() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.rbmk_tool), new Object[] { " A ", " IA", "I  ", 'A', PB.ingot(), 'I', IRON.ingot() });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.power_net_tool), new Object[] { "WRW", " I ", " B ", 'W', MINGRADE.wireFine(), 'R', REDSTONE.dust(), 'I', IRON.ingot(), 'B', ModItems.battery_su });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.power_net_tool), new Object[] { "WRW", " I ", " B ", 'W', MINGRADE.wireFine(), 'R', REDSTONE.dust(), 'I', IRON.ingot(), 'B', ModItems.battery_generic });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.analysis_tool), new Object[] { "  G", " S ", "S  ", 'G', KEY_ANYPANE, 'S', STEEL.ingot() });
 
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.kit_toolbox_empty), new Object[] { "CCC", "CIC", 'C', CU.plate(), 'I', IRON.ingot() });

src/main/java/com/hbm/entity/EntityMappings.java

@@ -73,13 +73,11 @@ public class EntityMappings {
 		addEntity(EntityMissileDrill.class, "entity_missile_drill", 1000);
 		addEntity(EntityMissileMirv.class, "entity_missile_mirv", 1000);
 		addEntity(EntityMIRV.class, "entity_mirvlet", 1000);
-		addEntity(EntitySmokeFX.class, "entity_smoke_fx", 1000);
 		addEntity(EntityGrenadeNuclear.class, "entity_grenade_nuclear", 1000);
 		addEntity(EntityBSmokeFX.class, "entity_b_smoke_fx", 1000);
 		addEntity(EntityGrenadePlasma.class, "entity_grenade_plasma", 500);
 		addEntity(EntityGrenadeTau.class, "entity_grenade_tau", 500);
 		addEntity(EntityChopperMine.class, "entity_chopper_mine", 1000);
-		addEntity(EntityCombineBall.class, "entity_combine_ball", 1000);
 		addEntity(EntityRainbow.class, "entity_rainbow", 1000);
 		addEntity(EntityGrenadeLemon.class, "entity_grenade_lemon", 500);
 		addEntity(EntityCloudFleija.class, "entity_cloud_fleija", 500);
@@ -96,20 +94,14 @@ public class EntityMappings {
 		addEntity(EntityLaserBeam.class, "entity_laser_beam", 1000);
 		addEntity(EntityMinerBeam.class, "entity_miner_beam", 1000);
 		addEntity(EntityRubble.class, "entity_rubble", 1000);
-		addEntity(EntityDSmokeFX.class, "entity_d_smoke_fx", 1000);
-		addEntity(EntitySSmokeFX.class, "entity_s_smoke_fx", 1000);
 		addEntity(EntityShrapnel.class, "entity_shrapnel", 1000);
 		addEntity(EntityGrenadeShrapnel.class, "entity_grenade_shrapnel", 250);
 		addEntity(EntityBlackHole.class, "entity_black_hole", 250);
 		addEntity(EntityGrenadeBlackHole.class, "entity_grenade_black_hole", 250);
-		addEntity(EntityOilSpillFX.class, "entity_spill_fx", 1000);
-		addEntity(EntityOilSpill.class, "entity_oil_spill", 1000);
-		addEntity(EntityGasFX.class, "entity_spill_fx", 1000);
 		addEntity(EntityMinecartTest.class, "entity_minecart_test", 1000);
 		addEntity(EntitySparkBeam.class, "entity_spark_beam", 1000);
 		addEntity(EntityMissileDoomsday.class, "entity_missile_doomsday", 1000);
 		addEntity(EntityMissileDoomsdayRusted.class, "entity_missile_doomsday_rusted", 1000);
-		addEntity(EntityTSmokeFX.class, "entity_t_smoke_fx", 1000);
 		addEntity(EntityNukeExplosionMK3.class, "entity_nuke_mk3", 1000);
 		addEntity(EntityVortex.class, "entity_vortex", 250);
 		addEntity(EntityMeteor.class, "entity_meteor", 250);

src/main/java/com/hbm/entity/effect/EntityFalloutRain.java

@@ -64,8 +64,8 @@ public class EntityFalloutRain extends EntityExplosionChunkloading {
 						int chunkPosX = (int) (chunkPos & Integer.MAX_VALUE);
 						int chunkPosZ = (int) (chunkPos >> 32 & Integer.MAX_VALUE);
 						boolean biomeModified = false;
-						for(int x = chunkPosX << 4; x <= (chunkPosX << 4) + 16; x++) {
+						for(int x = chunkPosX << 4; x < (chunkPosX << 4) + 16; x++) {
-							for(int z = chunkPosZ << 4; z <= (chunkPosZ << 4) + 16; z++) {
+							for(int z = chunkPosZ << 4; z < (chunkPosZ << 4) + 16; z++) {
 								double percent = Math.hypot(x - posX, z - posZ) * 100 / getScale();
 								stomp(x, z, percent);
 								BiomeGenBase biome = getBiomeChange(percent, getScale(), worldObj.getBiomeGenForCoords(x, z));
@@ -82,8 +82,8 @@ public class EntityFalloutRain extends EntityExplosionChunkloading {
 						int chunkPosX = (int) (chunkPos & Integer.MAX_VALUE);
 						int chunkPosZ = (int) (chunkPos >> 32 & Integer.MAX_VALUE);
 						boolean biomeModified = false;
-						for(int x = chunkPosX << 4; x <= (chunkPosX << 4) + 16; x++) {
+						for(int x = chunkPosX << 4; x < (chunkPosX << 4) + 16; x++) {
-							for(int z = chunkPosZ << 4; z <= (chunkPosZ << 4) + 16; z++) {
+							for(int z = chunkPosZ << 4; z < (chunkPosZ << 4) + 16; z++) {
 								double distance = Math.hypot(x - posX, z - posZ);
 								if(distance <= getScale()) {
 									double percent = distance * 100 / getScale();
@@ -165,14 +165,13 @@ public class EntityFalloutRain extends EntityExplosionChunkloading {
 
 		int depth = 0;
 
-		for(int y = 255; y >= 1; y--) {
+		for(int y = 255; y >= 0; y--) {
 			
 			if(depth >= 3) return;
 
 			Block b = worldObj.getBlock(x, y, z);
 
 			if(b.getMaterial() == Material.air || b == ModBlocks.fallout) continue;
-			if(b == Blocks.bedrock) return;
 			
 			if(b == ModBlocks.volcano_core) {
 				worldObj.setBlock(x, y, z, ModBlocks.volcano_rad_core, worldObj.getBlockMetadata(x, y, z), 3);
@@ -211,7 +210,7 @@ public class EntityFalloutRain extends EntityExplosionChunkloading {
 			}
 			
 			float hardness = b.getBlockHardness(worldObj, x, y, z);
-			if(dist < 65 && hardness <= Blocks.stonebrick.getExplosionResistance(null) && hardness >= 0/* && !b.hasTileEntity(worldObj.getBlockMetadata(x, y, z))*/) {
+			if(y > 0 && dist < 65 && hardness <= Blocks.stonebrick.getExplosionResistance(null) && hardness >= 0/* && !b.hasTileEntity(worldObj.getBlockMetadata(x, y, z))*/) {
 				
 				if(worldObj.getBlock(x, y - 1, z) == Blocks.air) {
 					for(int i = 0; i <= depth; i++) {

src/main/java/com/hbm/entity/missile/EntityMIRV.java

@@ -3,7 +3,6 @@ package com.hbm.entity.missile;
 import com.hbm.config.BombConfig;
 import com.hbm.entity.effect.EntityNukeTorex;
 import com.hbm.entity.logic.EntityNukeExplosionMK5;
-import com.hbm.entity.particle.EntitySmokeFX;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -41,8 +40,6 @@ public class EntityMIRV extends EntityThrowable {
 			}
 			this.setDead();
 		}
-
-		this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
 	}
 
 	protected void rotation() {

src/main/java/com/hbm/entity/particle/EntityDSmokeFX.java

@@ -1,67 +0,0 @@
-package com.hbm.entity.particle;
-
-import net.minecraft.world.World;
-
-public class EntityDSmokeFX extends EntityModFX {
-	public EntityDSmokeFX(World world) {
-		super(world, 0, 0, 0);
-	}
-
-	public EntityDSmokeFX(World p_i1225_1_, double p_i1225_2_, double p_i1225_4_, double p_i1225_6_, double p_i1225_8_,
-			double p_i1225_10_, double p_i1225_12_) {
-		this(p_i1225_1_, p_i1225_2_, p_i1225_4_, p_i1225_6_, p_i1225_8_, p_i1225_10_, p_i1225_12_, 1.0F);
-	}
-
-	public EntityDSmokeFX(World p_i1226_1_, double p_i1226_2_, double p_i1226_4_, double p_i1226_6_, double p_i1226_8_,
-			double p_i1226_10_, double p_i1226_12_, float p_i1226_14_) {
-		super(p_i1226_1_, p_i1226_2_, p_i1226_4_, p_i1226_6_, 0.0D, 0.0D, 0.0D);
-		this.motionX *= 0.10000000149011612D;
-		this.motionY *= 0.10000000149011612D;
-		this.motionZ *= 0.10000000149011612D;
-		this.motionX += p_i1226_8_;
-		this.motionY += p_i1226_10_;
-		this.motionZ += p_i1226_12_;
-		this.particleRed = this.particleGreen = this.particleBlue = (float) (Math.random() * 0.30000001192092896D);
-		this.particleScale *= 0.75F;
-		this.particleScale *= p_i1226_14_;
-		this.smokeParticleScale = this.particleScale;
-		// this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D));
-		// this.particleMaxAge = (int)((float)this.particleMaxAge *
-		// p_i1226_14_);
-		this.noClip = false;
-	}
-
-	/**
-	 * Called to update the entity's position/logic.
-	 */
-
-	@Override
-	public void onUpdate() {
-		this.prevPosX = this.posX;
-		this.prevPosY = this.posY;
-		this.prevPosZ = this.posZ;
-
-		if (maxAge < 100) {
-			maxAge = rand.nextInt(21) + 65;
-		}
-
-		this.particleAge++;
-
-		if (this.particleAge >= maxAge) {
-			this.setDead();
-		}
-
-		this.motionX *= 0.7599999785423279D;
-		this.motionY *= 0.7599999785423279D;
-		this.motionZ *= 0.7599999785423279D;
-
-		if (this.onGround) {
-			this.motionX *= 0.699999988079071D;
-			this.motionZ *= 0.699999988079071D;
-		}
-
-		this.posX += this.motionX;
-		this.posY += this.motionY;
-		this.posZ += this.motionZ;
-	}
-}

src/main/java/com/hbm/entity/particle/EntityGasFX.java

@@ -1,79 +0,0 @@
-package com.hbm.entity.particle;
-
-import net.minecraft.world.World;
-
-public class EntityGasFX extends EntityModFX
-{
-    float smokeParticleScale;
-    public int particleAge;
-    public int maxAge;
-    public EntityGasFX(World world) {
-    	super(world, 0, 0, 0);
-    }
-
-    public EntityGasFX(World p_i1225_1_, double p_i1225_2_, double p_i1225_4_, double p_i1225_6_, double p_i1225_8_, double p_i1225_10_, double p_i1225_12_)
-    {
-        this(p_i1225_1_, p_i1225_2_, p_i1225_4_, p_i1225_6_, p_i1225_8_, p_i1225_10_, p_i1225_12_, 1.0F);
-    }
-
-    public EntityGasFX(World p_i1226_1_, double p_i1226_2_, double p_i1226_4_, double p_i1226_6_, double p_i1226_8_, double p_i1226_10_, double p_i1226_12_, float p_i1226_14_)
-    {
-        super(p_i1226_1_, p_i1226_2_, p_i1226_4_, p_i1226_6_, 0.0D, 0.0D, 0.0D);
-        this.motionX *= 0.10000000149011612D;
-        this.motionY *= 0.10000000149011612D;
-        this.motionZ *= 0.10000000149011612D;
-        this.motionX += p_i1226_8_;
-        this.motionY += p_i1226_10_;
-        this.motionZ += p_i1226_12_;
-        this.particleRed = this.particleGreen = this.particleBlue = (float)(Math.random() * 0.30000001192092896D);
-        this.particleScale *= 0.75F;
-        this.particleScale *= p_i1226_14_;
-        this.smokeParticleScale = this.particleScale;
-        //this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D));
-        //this.particleMaxAge = (int)((float)this.particleMaxAge * p_i1226_14_);
-        this.noClip = false;
-    }
-
-    /**
-     * Called to update the entity's position/logic.
-     */
-    
-    @Override
-    public void onUpdate()
-    {
-        this.prevPosX = this.posX;
-        this.prevPosY = this.posY;
-        this.prevPosZ = this.posZ;
-        
-        if(maxAge < 15)
-        {
-        	maxAge = rand.nextInt(4) + 15;
-        }
-
-        this.particleAge++;
-        
-        if (this.particleAge >= maxAge)
-        {
-            this.setDead();
-        }
-
-        this.motionX *= 0.7599999785423279D;
-        //this.motionY *= 0.7599999785423279D;
-        this.motionY += 0.1D;
-        this.motionZ *= 0.7599999785423279D;
-
-        if (this.onGround)
-        {
-            this.motionX *= 0.699999988079071D;
-            this.motionZ *= 0.699999988079071D;
-        }
-        if(this.isBurning()) {
-			this.setDead();
-			worldObj.createExplosion(null, posX, posY, posZ, 3F, true);
-		}
-
-        this.posX += this.motionX;
-        this.posY += this.motionY;
-        this.posZ += this.motionZ;
-    }
-}

src/main/java/com/hbm/entity/particle/EntityOilSpillFX.java

@@ -1,74 +0,0 @@
-package com.hbm.entity.particle;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-
-public class EntityOilSpillFX extends EntityModFX {
-	float smokeParticleScale;
-	public int particleAge;
-	public int maxAge;
-
-	public EntityOilSpillFX(World world) {
-		super(world, 0, 0, 0);
-	}
-
-	public EntityOilSpillFX(World p_i1225_1_, double p_i1225_2_, double p_i1225_4_, double p_i1225_6_, double p_i1225_8_, double p_i1225_10_, double p_i1225_12_) {
-		this(p_i1225_1_, p_i1225_2_, p_i1225_4_, p_i1225_6_, p_i1225_8_, p_i1225_10_, p_i1225_12_, 1.0F);
-	}
-
-	public EntityOilSpillFX(World p_i1226_1_, double p_i1226_2_, double p_i1226_4_, double p_i1226_6_, double p_i1226_8_, double p_i1226_10_, double p_i1226_12_, float p_i1226_14_) {
-		super(p_i1226_1_, p_i1226_2_, p_i1226_4_, p_i1226_6_, 0.0D, 0.0D, 0.0D);
-		this.motionX *= 0.10000000149011612D;
-		this.motionY *= 0.10000000149011612D;
-		this.motionZ *= 0.10000000149011612D;
-		this.motionX += p_i1226_8_;
-		this.motionY += p_i1226_10_;
-		this.motionZ += p_i1226_12_;
-		this.particleRed = this.particleGreen = this.particleBlue = (float) (Math.random() * 0.30000001192092896D);
-		this.particleScale *= 0.75F;
-		this.particleScale *= p_i1226_14_;
-		this.smokeParticleScale = this.particleScale;
-		this.noClip = false;
-	}
-
-	@Override
-	public void onUpdate() {
-		this.prevPosX = this.posX;
-		this.prevPosY = this.posY;
-		this.prevPosZ = this.posZ;
-
-		if(maxAge < 15) {
-			maxAge = rand.nextInt(4) + 15;
-		}
-
-		this.particleAge++;
-
-		if(this.particleAge >= maxAge) {
-			this.setDead();
-		}
-
-		this.motionX *= 0.7599999785423279D;
-		this.motionY *= 0.7599999785423279D;
-		this.motionZ *= 0.7599999785423279D;
-
-		if(this.onGround) {
-			this.motionX *= 0.699999988079071D;
-			this.motionZ *= 0.699999988079071D;
-		}
-
-		this.posX += this.motionX;
-		this.posY += this.motionY;
-		this.posZ += this.motionZ;
-	}
-
-	@Override
-	public boolean writeToNBTOptional(NBTTagCompound nbt) {
-		return false;
-	}
-
-	@Override
-	public void readEntityFromNBT(NBTTagCompound nbt) {
-		super.readEntityFromNBT(nbt);
-		this.setDead();
-	}
-}

src/main/java/com/hbm/entity/particle/EntitySSmokeFX.java

@@ -1,80 +0,0 @@
-package com.hbm.entity.particle;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.world.World;
-
-public class EntitySSmokeFX extends EntityModFX
-{
-    public EntitySSmokeFX(World world) {
-    	super(world, 0, 0, 0);
-    }
-
-    public EntitySSmokeFX(World p_i1225_1_, double p_i1225_2_, double p_i1225_4_, double p_i1225_6_, double p_i1225_8_, double p_i1225_10_, double p_i1225_12_)
-    {
-        this(p_i1225_1_, p_i1225_2_, p_i1225_4_, p_i1225_6_, p_i1225_8_, p_i1225_10_, p_i1225_12_, 1.0F);
-    }
-
-    public EntitySSmokeFX(World p_i1226_1_, double p_i1226_2_, double p_i1226_4_, double p_i1226_6_, double p_i1226_8_, double p_i1226_10_, double p_i1226_12_, float p_i1226_14_)
-    {
-        super(p_i1226_1_, p_i1226_2_, p_i1226_4_, p_i1226_6_, 0.0D, 0.0D, 0.0D);
-        this.motionX *= 0.10000000149011612D;
-        this.motionY *= 0.10000000149011612D;
-        this.motionZ *= 0.10000000149011612D;
-        this.motionX += p_i1226_8_;
-        this.motionY += p_i1226_10_;
-        this.motionZ += p_i1226_12_;
-        this.particleRed = this.particleGreen = this.particleBlue = (float)(Math.random() * 0.30000001192092896D);
-        this.particleScale *= 0.75F;
-        this.particleScale *= p_i1226_14_;
-        this.smokeParticleScale = this.particleScale;
-        //this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D));
-        //this.particleMaxAge = (int)((float)this.particleMaxAge * p_i1226_14_);
-        this.noClip = false;
-    }
-
-    /**
-     * Called to update the entity's position/logic.
-     */
-    
-    @Override
-    public void onUpdate()
-    {
-        this.prevPosX = this.posX;
-        this.prevPosY = this.posY;
-        this.prevPosZ = this.posZ;
-        
-        if(maxAge < 25)
-        {
-        	maxAge = rand.nextInt(6) + 25;
-        }
-
-        this.particleAge++;
-        
-        if (this.particleAge >= maxAge)
-        {
-            this.setDead();
-        }
-
-        this.motionX *= 0.7599999785423279D;
-        this.motionY *= 0.7599999785423279D;
-        this.motionZ *= 0.7599999785423279D;
-
-        if (this.onGround)
-        {
-            this.motionX *= 0.699999988079071D;
-            this.motionZ *= 0.699999988079071D;
-        }
-
-        this.posX += this.motionX;
-        this.posY += this.motionY;
-        this.posZ += this.motionZ;
-    }
-
-    @Override
-	@SideOnly(Side.CLIENT)
-    public int getBrightnessForRender(float p_70070_1_)
-    {
-        return 15728880;
-    }
-}

src/main/java/com/hbm/entity/particle/EntitySmokeFX.java

@@ -1,76 +0,0 @@
-package com.hbm.entity.particle;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.world.World;
-
-public class EntitySmokeFX extends EntityModFX
-{
-    public EntitySmokeFX(World world) {
-    	super(world, 0, 0, 0);
-    }
-
-    public EntitySmokeFX(World p_i1225_1_, double p_i1225_2_, double p_i1225_4_, double p_i1225_6_, double p_i1225_8_, double p_i1225_10_, double p_i1225_12_)
-    {
-        this(p_i1225_1_, p_i1225_2_, p_i1225_4_, p_i1225_6_, p_i1225_8_, p_i1225_10_, p_i1225_12_, 1.0F);
-    }
-
-    public EntitySmokeFX(World p_i1226_1_, double p_i1226_2_, double p_i1226_4_, double p_i1226_6_, double p_i1226_8_, double p_i1226_10_, double p_i1226_12_, float p_i1226_14_)
-    {
-        super(p_i1226_1_, p_i1226_2_, p_i1226_4_, p_i1226_6_, 0.0D, 0.0D, 0.0D);
-        this.motionX *= 0.10000000149011612D;
-        this.motionY *= 0.10000000149011612D;
-        this.motionZ *= 0.10000000149011612D;
-        this.motionX += p_i1226_8_;
-        this.motionY += p_i1226_10_;
-        this.motionZ += p_i1226_12_;
-        this.particleRed = this.particleGreen = this.particleBlue = (float)(Math.random() * 0.30000001192092896D);
-        this.particleScale *= 0.75F;
-        this.particleScale *= p_i1226_14_;
-        this.smokeParticleScale = this.particleScale;
-        //this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D));
-        //this.particleMaxAge = (int)((float)this.particleMaxAge * p_i1226_14_);
-        this.noClip = false;
-    }
-
-    /**
-     * Called to update the entity's position/logic.
-     */
-    
-    @Override
-    public void onUpdate()
-    {
-        this.prevPosX = this.posX;
-        this.prevPosY = this.posY;
-        this.prevPosZ = this.posZ;
-        
-        if(maxAge < 100)
-        {
-        	maxAge = rand.nextInt(21) + 65;
-        }
-
-        this.particleAge++;
-        
-        if (this.particleAge >= maxAge)
-        {
-            this.setDead();
-        }
-
-        this.motionX *= 0.9599999785423279D;
-        this.motionY *= 0.9599999785423279D;
-        this.motionZ *= 0.9599999785423279D;
-
-        if (this.onGround)
-        {
-            this.motionX *= 0.699999988079071D;
-            this.motionZ *= 0.699999988079071D;
-        }
-    }
-
-    @Override
-	@SideOnly(Side.CLIENT)
-    public int getBrightnessForRender(float p_70070_1_)
-    {
-        return 15728880;
-    }
-}

src/main/java/com/hbm/entity/particle/EntityTSmokeFX.java

@@ -1,71 +0,0 @@
-package com.hbm.entity.particle;
-
-import net.minecraft.world.World;
-
-public class EntityTSmokeFX extends EntityModFX
-{
-    public EntityTSmokeFX(World world) {
-    	super(world, 0, 0, 0);
-    }
-
-    public EntityTSmokeFX(World p_i1225_1_, double p_i1225_2_, double p_i1225_4_, double p_i1225_6_, double p_i1225_8_, double p_i1225_10_, double p_i1225_12_)
-    {
-        this(p_i1225_1_, p_i1225_2_, p_i1225_4_, p_i1225_6_, p_i1225_8_, p_i1225_10_, p_i1225_12_, 1.0F);
-    }
-
-    public EntityTSmokeFX(World p_i1226_1_, double p_i1226_2_, double p_i1226_4_, double p_i1226_6_, double p_i1226_8_, double p_i1226_10_, double p_i1226_12_, float p_i1226_14_)
-    {
-        super(p_i1226_1_, p_i1226_2_, p_i1226_4_, p_i1226_6_, 0.0D, 0.0D, 0.0D);
-        this.motionX *= 0.10000000149011612D;
-        this.motionY *= 0.10000000149011612D;
-        this.motionZ *= 0.10000000149011612D;
-        this.motionX += p_i1226_8_;
-        this.motionY += p_i1226_10_;
-        this.motionZ += p_i1226_12_;
-        this.particleRed = this.particleGreen = this.particleBlue = (float)(Math.random() * 0.30000001192092896D);
-        this.particleScale *= 0.75F;
-        this.particleScale *= p_i1226_14_;
-        this.smokeParticleScale = this.particleScale;
-        //this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D));
-        //this.particleMaxAge = (int)((float)this.particleMaxAge * p_i1226_14_);
-        this.noClip = false;
-    }
-
-    /**
-     * Called to update the entity's position/logic.
-     */
-    
-    @Override
-    public void onUpdate()
-    {
-        this.prevPosX = this.posX;
-        this.prevPosY = this.posY;
-        this.prevPosZ = this.posZ;
-        
-        if(maxAge < 25)
-        {
-        	maxAge = rand.nextInt(6) + 25;
-        }
-
-        this.particleAge++;
-        
-        if (this.particleAge >= maxAge)
-        {
-            this.setDead();
-        }
-
-        this.motionX *= 0.7599999785423279D;
-        this.motionY *= 0.7599999785423279D;
-        this.motionZ *= 0.7599999785423279D;
-
-        if (this.onGround)
-        {
-            this.motionX *= 0.699999988079071D;
-            this.motionZ *= 0.699999988079071D;
-        }
-
-        this.posX += this.motionX;
-        this.posY += this.motionY;
-        this.posZ += this.motionZ;
-    }
-}

src/main/java/com/hbm/entity/projectile/EntityCombineBall.java

@@ -1,571 +0,0 @@
-package com.hbm.entity.projectile;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import java.util.List;
-
-import com.hbm.lib.ModDamageSource;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.monster.EntityEnderman;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.play.server.S2BPacketChangeGameState;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
-
-public class EntityCombineBall extends Entity implements IProjectile
-{
-    private int field_145791_d = -1;
-    private int field_145792_e = -1;
-    private int field_145789_f = -1;
-    public double gravity = 0.0D;
-    private Block field_145790_g;
-    private int inData;
-    private boolean inGround;
-    /** 1 if the player can pick up the arrow */
-    public int canBePickedUp;
-    /** Seems to be some sort of timer for animating an arrow. */
-    public int arrowShake;
-    /** The owner of this arrow. */
-    public Entity shootingEntity;
-    private int ticksInGround;
-    private int ticksInAir;
-    private double damage = 2.0D;
-    /** The amount of knockback an arrow applies when it hits a mob. */
-    private int knockbackStrength;
-    public EntityCombineBall(World p_i1753_1_)
-    {
-        super(p_i1753_1_);
-        this.renderDistanceWeight = 10.0D;
-        this.setSize(0.5F, 0.5F);
-    }
-
-    public EntityCombineBall(World p_i1754_1_, double p_i1754_2_, double p_i1754_4_, double p_i1754_6_)
-    {
-        super(p_i1754_1_);
-        this.renderDistanceWeight = 10.0D;
-        this.setSize(0.5F, 0.5F);
-        this.setPosition(p_i1754_2_, p_i1754_4_, p_i1754_6_);
-        this.yOffset = 0.0F;
-    }
-
-    public EntityCombineBall(World p_i1755_1_, EntityLivingBase p_i1755_2_, EntityLivingBase p_i1755_3_, float p_i1755_4_, float p_i1755_5_)
-    {
-        super(p_i1755_1_);
-        this.renderDistanceWeight = 10.0D;
-        this.shootingEntity = p_i1755_2_;
-
-        if (p_i1755_2_ instanceof EntityPlayer)
-        {
-            this.canBePickedUp = 1;
-        }
-
-        this.posY = p_i1755_2_.posY + p_i1755_2_.getEyeHeight() - 0.10000000149011612D;
-        double d0 = p_i1755_3_.posX - p_i1755_2_.posX;
-        double d1 = p_i1755_3_.boundingBox.minY + p_i1755_3_.height / 3.0F - this.posY;
-        double d2 = p_i1755_3_.posZ - p_i1755_2_.posZ;
-        double d3 = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
-
-        if (d3 >= 1.0E-7D)
-        {
-            float f2 = (float)(Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F;
-            float f3 = (float)(-(Math.atan2(d1, d3) * 180.0D / Math.PI));
-            double d4 = d0 / d3;
-            double d5 = d2 / d3;
-            this.setLocationAndAngles(p_i1755_2_.posX + d4, this.posY, p_i1755_2_.posZ + d5, f2, f3);
-            this.yOffset = 0.0F;
-            float f4 = (float)d3 * 0.2F;
-            this.setThrowableHeading(d0, d1 + f4, d2, p_i1755_4_, p_i1755_5_);
-        }
-    }
-
-    public EntityCombineBall(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_)
-    {
-        super(p_i1756_1_);
-        this.renderDistanceWeight = 10.0D;
-        this.shootingEntity = p_i1756_2_;
-
-        if (p_i1756_2_ instanceof EntityPlayer)
-        {
-            this.canBePickedUp = 1;
-        }
-
-        this.setSize(0.5F, 0.5F);
-        this.setLocationAndAngles(p_i1756_2_.posX, p_i1756_2_.posY + p_i1756_2_.getEyeHeight(), p_i1756_2_.posZ, p_i1756_2_.rotationYaw, p_i1756_2_.rotationPitch);
-        this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F;
-        this.posY -= 0.10000000149011612D;
-        this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F;
-        this.setPosition(this.posX, this.posY, this.posZ);
-        this.yOffset = 0.0F;
-        this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI);
-        this.motionZ = MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI);
-        this.motionY = (-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI));
-        this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F);
-    }
-
-    public EntityCombineBall(World world, int x, int y, int z, double mx, double my, double mz, double grav) {
-        super(world);
-    	this.posX = x + 0.5F;
-    	this.posY = y + 0.5F;
-    	this.posZ = z + 0.5F;
-    	
-    	this.motionX = mx;
-    	this.motionY = my;
-    	this.motionZ = mz;
-    	
-    	this.gravity = grav;
-    }
-
-    @Override
-	protected void entityInit()
-    {
-        this.dataWatcher.addObject(16, Byte.valueOf((byte)0));
-    }
-
-    /**
-     * Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction.
-     */
-    @Override
-	public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_)
-    {
-        float f2 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_3_ * p_70186_3_ + p_70186_5_ * p_70186_5_);
-        p_70186_1_ /= f2;
-        p_70186_3_ /= f2;
-        p_70186_5_ /= f2;
-        p_70186_1_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_;
-        p_70186_3_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_;
-        p_70186_5_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_;
-        p_70186_1_ *= p_70186_7_;
-        p_70186_3_ *= p_70186_7_;
-        p_70186_5_ *= p_70186_7_;
-        this.motionX = p_70186_1_;
-        this.motionY = p_70186_3_;
-        this.motionZ = p_70186_5_;
-        float f3 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_5_ * p_70186_5_);
-        this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(p_70186_1_, p_70186_5_) * 180.0D / Math.PI);
-        this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(p_70186_3_, f3) * 180.0D / Math.PI);
-        this.ticksInGround = 0;
-    }
-
-    /**
-     * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX,
-     * posY, posZ, yaw, pitch
-     */
-    @Override
-	@SideOnly(Side.CLIENT)
-    public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_)
-    {
-        this.setPosition(p_70056_1_, p_70056_3_, p_70056_5_);
-        this.setRotation(p_70056_7_, p_70056_8_);
-    }
-
-    /**
-     * Sets the velocity to the args. Args: x, y, z
-     */
-    @Override
-	@SideOnly(Side.CLIENT)
-    public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_)
-    {
-        this.motionX = p_70016_1_;
-        this.motionY = p_70016_3_;
-        this.motionZ = p_70016_5_;
-
-        if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F)
-        {
-            float f = MathHelper.sqrt_double(p_70016_1_ * p_70016_1_ + p_70016_5_ * p_70016_5_);
-            this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(p_70016_1_, p_70016_5_) * 180.0D / Math.PI);
-            this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(p_70016_3_, f) * 180.0D / Math.PI);
-            this.prevRotationPitch = this.rotationPitch;
-            this.prevRotationYaw = this.rotationYaw;
-            this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch);
-            this.ticksInGround = 0;
-        }
-    }
-
-    /**
-     * Called to update the entity's position/logic.
-     */
-    //@Override
-    @Override
-	public void onUpdate()
-    {
-        super.onUpdate();
-
-        if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F)
-        {
-            MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
-            this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
-            //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI);
-        }
-
-        Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
-
-        if (block.getMaterial() != Material.air)
-        {
-            block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
-            AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
-
-            if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ)))
-            {
-                this.inGround = true;
-            }
-        }
-
-        if (this.arrowShake > 0)
-        {
-            --this.arrowShake;
-        }
-
-        if (this.inGround)
-        {
-        	this.setDead();
-        }
-        else
-        {
-            ++this.ticksInAir;
-            Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
-            Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
-            MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false);
-            vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
-            vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
-
-            if (movingobjectposition != null)
-            {
-                vec3 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord);
-            }
-
-            Entity entity = null;
-            List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D));
-            double d0 = 0.0D;
-            int i;
-            float f1;
-
-            for (i = 0; i < list.size(); ++i)
-            {
-                Entity entity1 = (Entity)list.get(i);
-
-                if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5))
-                {
-                    f1 = 0.3F;
-                    AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand(f1, f1, f1);
-                    MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3);
-
-                    if (movingobjectposition1 != null)
-                    {
-                        double d1 = vec31.distanceTo(movingobjectposition1.hitVec);
-
-                        if (d1 < d0 || d0 == 0.0D)
-                        {
-                            entity = entity1;
-                            d0 = d1;
-                        }
-                    }
-                }
-            }
-
-            if (entity != null)
-            {
-                movingobjectposition = new MovingObjectPosition(entity);
-            }
-
-            if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer)
-            {
-                EntityPlayer entityplayer = (EntityPlayer)movingobjectposition.entityHit;
-
-                if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer)this.shootingEntity).canAttackPlayer(entityplayer))
-                {
-                    movingobjectposition = null;
-                }
-            }
-
-            float f2;
-            float f4;
-
-            if (movingobjectposition != null)
-            {
-                if (movingobjectposition.entityHit != null)
-                {
-                    f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
-                    int k = MathHelper.ceiling_double_int(f2 * this.damage);
-
-                    if (this.getIsCritical())
-                    {
-                        k += this.rand.nextInt(k / 2 + 2);
-                    }
-
-                    DamageSource damagesource = null;
-
-                    if (this.shootingEntity == null)
-                    {
-                        damagesource = DamageSource.generic;
-                    }
-                    else
-                    {
-                        damagesource = ModDamageSource.causeCombineDamage(this, this);
-                    }
-
-                    if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman))
-                    {
-                        movingobjectposition.entityHit.setFire(5);
-                    }
-
-                    if (movingobjectposition.entityHit.attackEntityFrom(damagesource, k))
-                    {
-                        if (movingobjectposition.entityHit instanceof EntityLivingBase)
-                        {
-                            EntityLivingBase entitylivingbase = (EntityLivingBase)movingobjectposition.entityHit;
-
-                            if (this.knockbackStrength > 0)
-                            {
-                                f4 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
-
-                                if (f4 > 0.0F)
-                                {
-                                    movingobjectposition.entityHit.addVelocity(this.motionX * this.knockbackStrength * 0.6000000238418579D / f4, 0.1D, this.motionZ * this.knockbackStrength * 0.6000000238418579D / f4);
-                                }
-                            }
-
-                            if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase)
-                            {
-                                EnchantmentHelper.func_151384_a(entitylivingbase, this.shootingEntity);
-                                EnchantmentHelper.func_151385_b((EntityLivingBase)this.shootingEntity, entitylivingbase);
-                            }
-
-                            if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP)
-                            {
-                                ((EntityPlayerMP)this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F));
-                            }
-                        }
-
-                        if (!(movingobjectposition.entityHit instanceof EntityEnderman))
-                        {
-                            if (!this.worldObj.isRemote && movingobjectposition.entityHit instanceof EntityLivingBase)
-                            {
-                            	movingobjectposition.entityHit.attackEntityFrom(damagesource, 1000F);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    this.field_145791_d = movingobjectposition.blockX;
-                    this.field_145792_e = movingobjectposition.blockY;
-                    this.field_145789_f = movingobjectposition.blockZ;
-                    this.field_145790_g = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
-                    this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
-                    this.motionX = ((float)(movingobjectposition.hitVec.xCoord - this.posX));
-                    this.motionY = ((float)(movingobjectposition.hitVec.yCoord - this.posY));
-                    this.motionZ = ((float)(movingobjectposition.hitVec.zCoord - this.posZ));
-                    f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
-                    this.posX -= this.motionX / f2 * 0.05000000074505806D;
-                    this.posY -= this.motionY / f2 * 0.05000000074505806D;
-                    this.posZ -= this.motionZ / f2 * 0.05000000074505806D;
-                    this.inGround = true;
-                    this.arrowShake = 7;
-                    this.setIsCritical(false);
-
-                    if (this.field_145790_g.getMaterial() != Material.air)
-                    {
-                        this.field_145790_g.onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this);
-                    }
-                }
-            }
-
-            this.posX += this.motionX;
-            this.posY += this.motionY;
-            this.posZ += this.motionZ;
-            f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
-            this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
-
-            float f3 = 0.99F;
-            f1 = 0.05F;
-
-            if (this.isInWater())
-            {
-                for (int l = 0; l < 4; ++l)
-                {
-                    f4 = 0.25F;
-                    this.worldObj.spawnParticle("bubble", this.posX - this.motionX * f4, this.posY - this.motionY * f4, this.posZ - this.motionZ * f4, this.motionX, this.motionY, this.motionZ);
-                }
-
-                f3 = 0.8F;
-            }
-
-            if (this.isWet())
-            {
-                this.extinguish();
-            }
-
-            this.motionX *= f3;
-            this.motionY *= f3;
-            this.motionZ *= f3;
-            this.motionY -= gravity;
-            this.setPosition(this.posX, this.posY, this.posZ);
-            this.func_145775_I();
-        }
-
-		if (this.ticksExisted > 250)
-			this.setDead();
-    }
-
-    /**
-     * (abstract) Protected helper method to write subclass entity data to NBT.
-     */
-    @Override
-	public void writeEntityToNBT(NBTTagCompound p_70014_1_)
-    {
-        p_70014_1_.setShort("xTile", (short)this.field_145791_d);
-        p_70014_1_.setShort("yTile", (short)this.field_145792_e);
-        p_70014_1_.setShort("zTile", (short)this.field_145789_f);
-        p_70014_1_.setShort("life", (short)this.ticksInGround);
-        p_70014_1_.setByte("inTile", (byte)Block.getIdFromBlock(this.field_145790_g));
-        p_70014_1_.setByte("inData", (byte)this.inData);
-        p_70014_1_.setByte("shake", (byte)this.arrowShake);
-        p_70014_1_.setByte("inGround", (byte)(this.inGround ? 1 : 0));
-        p_70014_1_.setByte("pickup", (byte)this.canBePickedUp);
-        p_70014_1_.setDouble("damage", this.damage);
-    }
-
-    /**
-     * (abstract) Protected helper method to read subclass entity data from NBT.
-     */
-    @Override
-	public void readEntityFromNBT(NBTTagCompound p_70037_1_)
-    {
-        this.field_145791_d = p_70037_1_.getShort("xTile");
-        this.field_145792_e = p_70037_1_.getShort("yTile");
-        this.field_145789_f = p_70037_1_.getShort("zTile");
-        this.ticksInGround = p_70037_1_.getShort("life");
-        this.field_145790_g = Block.getBlockById(p_70037_1_.getByte("inTile") & 255);
-        this.inData = p_70037_1_.getByte("inData") & 255;
-        this.arrowShake = p_70037_1_.getByte("shake") & 255;
-        this.inGround = p_70037_1_.getByte("inGround") == 1;
-
-        if (p_70037_1_.hasKey("damage", 99))
-        {
-            this.damage = p_70037_1_.getDouble("damage");
-        }
-
-        if (p_70037_1_.hasKey("pickup", 99))
-        {
-            this.canBePickedUp = p_70037_1_.getByte("pickup");
-        }
-        else if (p_70037_1_.hasKey("player", 99))
-        {
-            this.canBePickedUp = p_70037_1_.getBoolean("player") ? 1 : 0;
-        }
-    }
-
-    /**
-     * Called by a player entity when they collide with an entity
-     */
-    @Override
-	public void onCollideWithPlayer(EntityPlayer p_70100_1_)
-    {
-        if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0)
-        {
-            boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode;
-
-            if (flag)
-            {
-                p_70100_1_.onItemPickup(this, 1);
-                this.setDead();
-            }
-        }
-    }
-
-    /**
-     * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to
-     * prevent them from trampling crops
-     */
-    @Override
-	protected boolean canTriggerWalking()
-    {
-        return false;
-    }
-
-    @Override
-	@SideOnly(Side.CLIENT)
-    public float getShadowSize()
-    {
-        return 0.0F;
-    }
-
-    public void setDamage(double p_70239_1_)
-    {
-        this.damage = p_70239_1_;
-    }
-
-    public double getDamage()
-    {
-        return this.damage;
-    }
-
-    /**
-     * Sets the amount of knockback the arrow applies when it hits a mob.
-     */
-    public void setKnockbackStrength(int p_70240_1_)
-    {
-        this.knockbackStrength = p_70240_1_;
-    }
-
-    /**
-     * If returns false, the item will not inflict any damage against entities.
-     */
-    @Override
-	public boolean canAttackWithItem()
-    {
-        return false;
-    }
-
-    /**
-     * Whether the arrow has a stream of critical hit particles flying behind it.
-     */
-    public void setIsCritical(boolean p_70243_1_)
-    {
-        byte b0 = this.dataWatcher.getWatchableObjectByte(16);
-
-        if (p_70243_1_)
-        {
-            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 1)));
-        }
-        else
-        {
-            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -2)));
-        }
-    }
-
-    /**
-     * Whether the arrow has a stream of critical hit particles flying behind it.
-     */
-    public boolean getIsCritical()
-    {
-        byte b0 = this.dataWatcher.getWatchableObjectByte(16);
-        return (b0 & 1) != 0;
-    }
-
-    @Override
-	@SideOnly(Side.CLIENT)
-    public int getBrightnessForRender(float p_70070_1_)
-    {
-        return 15728880;
-    }
-
-    @Override
-	public float getBrightness(float p_70013_1_)
-    {
-        return 1.0F;
-    }
-}

src/main/java/com/hbm/entity/projectile/EntityOilSpill.java

@@ -1,56 +0,0 @@
-package com.hbm.entity.projectile;
-
-import com.hbm.entity.particle.EntityOilSpillFX;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.projectile.EntityThrowable;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
-public class EntityOilSpill extends EntityThrowable {
-
-	public EntityOilSpill(World p_i1773_1_) {
-		super(p_i1773_1_);
-	}
-
-	public EntityOilSpill(World p_i1774_1_, EntityLivingBase p_i1774_2_) {
-		super(p_i1774_1_, p_i1774_2_);
-	}
-
-	@Override
-	public void entityInit() { }
-
-	public EntityOilSpill(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) {
-		super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
-	}
-
-	@Override
-	public void onUpdate() {
-		super.onUpdate();
-		if(!worldObj.isRemote) {
-			worldObj.spawnEntityInWorld(new EntityOilSpillFX(worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
-			if(this.isBurning()) {
-				this.setDead();
-				worldObj.createExplosion(null, posX, posY, posZ, 1.5F, true);
-			}
-		}
-	}
-
-	@Override
-	protected void onImpact(MovingObjectPosition p_70184_1_) {
-		if(this.ticksExisted > 5) {
-			this.setDead();
-		}
-	}
-
-	@Override
-	public boolean writeToNBTOptional(NBTTagCompound nbt) {
-		return false;
-	}
-
-	@Override
-	public void readEntityFromNBT(NBTTagCompound nbt) {
-		super.readEntityFromNBT(nbt);
-		this.setDead();
-	}
-}

src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java

@@ -7,7 +7,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.hbm.entity.particle.EntityTSmokeFX;
 import com.hbm.explosion.ExplosionLarge;
 import com.hbm.explosion.ExplosionNukeSmall;
 import com.hbm.handler.radiation.ChunkRadiationManager;
@@ -448,16 +447,6 @@ public class EntityRocketHoming extends Entity implements IProjectile
                 }
             }
 
-            if (true)
-            {
-                //for (i = 0; i < 4; ++i)
-                {
-                	//this.worldObj.spawnParticle("cloud", this.posX, this.posY, this.posZ, /*0, 0, 0 this.posX + this.motionX * (double)i / 4.0D, this.posY + this.motionY * (double)i / 4.0D, this.posZ + this.motionZ * (double)i / 4.0D,*/ -this.motionX/4, -this.motionY/4, -this.motionZ/4);
-                	if(!worldObj.isRemote && this.ticksExisted > 1)
-                		this.worldObj.spawnEntityInWorld(new EntityTSmokeFX(worldObj, this.posX, this.posY, this.posZ, 0, 0, 0));
-                }
-            }
-
             this.posX += this.motionX;
             this.posY += this.motionY;
             this.posZ += this.motionZ;

src/main/java/com/hbm/explosion/ExplosionLarge.java

@@ -3,7 +3,6 @@ package com.hbm.explosion;
 import java.util.List;
 import java.util.Random;
 
-import com.hbm.entity.projectile.EntityOilSpill;
 import com.hbm.entity.projectile.EntityRubble;
 import com.hbm.entity.projectile.EntityShrapnel;
 import com.hbm.packet.AuxParticlePacketNT;
@@ -154,20 +153,6 @@ public class ExplosionLarge {
 		}
 	}
 	
-	public static void spawnOilSpills(World world, double x, double y, double z, int count) {
-		
-		for(int i = 0; i < count; i++) {
-			EntityOilSpill shrapnel = new EntityOilSpill(world);
-			shrapnel.posX = x;
-			shrapnel.posY = y;
-			shrapnel.posZ = z;
-			shrapnel.motionY = ((rand.nextFloat() * 0.5) + 0.5) * (1 + (count / (15 + rand.nextInt(21)))) + (rand.nextFloat() / 50 * count) * 0.25F;
-			shrapnel.motionX = rand.nextGaussian() * 1	* (1 + (count / 50)) * 0.15F;
-			shrapnel.motionZ = rand.nextGaussian() * 1	* (1 + (count / 50)) * 0.15F;
-			world.spawnEntityInWorld(shrapnel);
-		}
-	}
-	
 	public static void explode(World world, double x, double y, double z, float strength, boolean cloud, boolean rubble, boolean shrapnel, Entity exploder) {
 		world.createExplosion(exploder, x, y, z, strength, true);
 		if(cloud)

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

@@ -18,6 +18,9 @@ public class ArmorModHandler {
 	public static final int cladding = 5;
 	public static final int kevlar = 6;
 	public static final int extra = 7;
+	public static final int battery = 8;
+	
+	public static final int MOD_SLOTS = 9;
 	
 	public static final UUID[] UUIDs = new UUID[] {
 			UUID.fromString("8d6e5c77-133e-4056-9c80-a9e42a1a0b65"),
@@ -131,7 +134,7 @@ public class ArmorModHandler {
 	}
 	
 	/**
-	 * Does what the name implies
+	 * Does what the name implies. Returns true if the stack has NBT and that NBT has the MOD_COMPOUND_KEY tag.
 	 * @param armor
 	 * @return
 	 */
@@ -146,7 +149,7 @@ public class ArmorModHandler {
 	
 	public static ItemStack[] pryMods(ItemStack armor) {
 		
-		ItemStack[] slots = new ItemStack[8];
+		ItemStack[] slots = new ItemStack[MOD_SLOTS];
 
 		if(!hasMods(armor))
 			return slots;
@@ -154,7 +157,7 @@ public class ArmorModHandler {
 		NBTTagCompound nbt = armor.getTagCompound();
 		NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY);
 		
-		for(int i = 0; i < 8; i++) {
+		for(int i = 0; i < MOD_SLOTS; i++) {
 			
 			NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + i);
 			
@@ -168,4 +171,22 @@ public class ArmorModHandler {
 		
 		return slots;
 	}
+	
+	public static ItemStack pryMod(ItemStack armor, int slot) {
+		
+		if(!hasMods(armor))
+			return null;
+		
+		NBTTagCompound nbt = armor.getTagCompound();
+		NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY);
+		NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + slot);
+		ItemStack stack = ItemStack.loadItemStackFromNBT(cmp);
+		
+		if(stack != null)
+			return stack;
+		
+		removeMod(armor, slot);
+		
+		return null;
+	}
 }

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

@@ -1,21 +1,30 @@
 package com.hbm.handler;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.inventory.RecipesCommon;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
-import com.hbm.tileentity.TileEntityProxyCombo;
+import com.hbm.lib.RefStrings;
+import com.hbm.main.MainRegistry;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Optional;
+import li.cil.oc.api.Items;
+import li.cil.oc.api.fs.FileSystem;
 import li.cil.oc.api.machine.Arguments;
 import li.cil.oc.api.machine.Context;
 import li.cil.oc.api.network.*;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.lang.reflect.Array;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.Callable;
 
+import static com.hbm.main.CraftingManager.addShapelessAuto;
+import static li.cil.oc.api.FileSystem.asReadOnly;
+import static li.cil.oc.api.FileSystem.fromClass;
 
 /**
  * General handler for OpenComputers compatibility.
@@ -23,13 +32,29 @@ import java.lang.reflect.Array;
  */
 public class CompatHandler {
 
+    /**
+     * Used for converting a steam type to an integer (compression levels).
+     * @param type Steam type.
+     * @return Object[] array containing an int with the "compression level"
+     */
     public static Object[] steamTypeToInt(FluidType type) {
-        if(type == Fluids.STEAM) {return new Object[] {0};}
+        switch(type.getID()) {
-        else if(type == Fluids.HOTSTEAM) {return new Object[] {1};}
+            default:
-        else if(type == Fluids.SUPERHOTSTEAM) {return new Object[] {2};}
+                return new Object[] {0};
-        return new Object[] {3};
+            case(4): // Fluids.HOTSTEAM
+                return new Object[] {1};
+            case(5): // Fluids.SUPERHOTSTEAM
+                return new Object[] {2};
+            case(6): // Fluids.ULTRAHOTSTEAM
+                return new Object[] {3};
+        }
     }
 
+    /**
+     * Used for converting a compression level to a steam type.
+     * @param arg Steam compression level.
+     * @return FluidType of the steam type based on the compression level.
+     */
     public static FluidType intToSteamType(int arg) {
         switch(arg) {
             default:
@@ -43,6 +68,134 @@ public class CompatHandler {
         }
     }
 
+    /**
+     * Allows for easy creation of read-only filesystems. Primarily for floppy disks.
+     * (Though maybe reading directly from VOTV drives as filesystems could be implemented. :3)
+     **/
+    private static class ReadOnlyFileSystem implements Callable<FileSystem> {
+
+        private final String name;
+
+        ReadOnlyFileSystem(String name) {
+            this.name = name;
+        }
+
+        @Override
+        @Optional.Method(modid = "OpenComputers")
+        public li.cil.oc.api.fs.FileSystem call() throws Exception {
+            return asReadOnly(fromClass(MainRegistry.class, RefStrings.MODID, "disks/" + FloppyDisk.sanitizeName(name)));
+        }
+    }
+
+    // Floppy disk class.
+    public static class FloppyDisk {
+        // Specifies the callable ReadOnlyFileSystem to allow OC to access the floppy.
+        public final ReadOnlyFileSystem fs;
+        // Specifies the color of the floppy disk (0-16 colors defined by OC).
+        public final Byte color;
+        // Set after loading the disk; allows for adding a recipe to the item.
+        public ItemStack item;
+
+        FloppyDisk(String name, int color) {
+            this.fs = new ReadOnlyFileSystem(FloppyDisk.sanitizeName(name));
+            this.color = (byte) color;
+        }
+
+        // Disk names will be sanitized before the FileSystem is created.
+        // This only affects the location/directory, not the display name.
+        // (Prevents filesystems from breaking/crashing due to having file separators, wildcards, etc.
+        public static String sanitizeName(String input) {
+            return input.toLowerCase().replaceAll("\\W", "");
+        }
+    }
+
+    /**
+     * Simple enum for mapping OC color ordinals to a nicer format for adding new disks.
+     */
+    public enum OCColors {
+        BLACK, //0x444444
+        RED, //0xB3312C
+        GREEN, //0x339911
+        BROWN, //0x51301A
+        BLUE, //0x6666FF
+        PURPLE, //0x7B2FBE
+        CYAN, //0x66FFFF
+        LIGHTGRAY, //0xABABAB
+        GRAY, //0x666666
+        PINK, //0xD88198
+        LIME, //0x66FF66
+        YELLOW, //0xFFFF66
+        LIGHTBLUE, //0xAAAAFF
+        MAGENTA, //0xC354CD
+        ORANGE, //0xEB8844
+        WHITE //0xF0F0F0
+    }
+
+    // Where all disks are stored with their name and `FloppyDisk` class.
+    public static HashMap<String, FloppyDisk> disks = new HashMap<>();
+
+    /**
+     * Called in the FML PostLoad stage, after the OC API loads.
+     * <br>
+     * Loads various parts of OC compatibility.
+     */
+    public static void init() {
+        if(Loader.isModLoaded("OpenComputers")) {
+            /*
+            For anyone wanting to add their own floppy disks,
+            read the README found in assets.hbm.disks.
+            */
+
+            // Idea/Code by instantnootles
+            disks.put("PWRangler", new FloppyDisk("PWRangler", OCColors.CYAN.ordinal()));
+
+            // begin registering disks
+            Logger logger = LogManager.getLogger("HBM");
+            logger.info("Loading OpenComputers disks...");
+            if(disks.size() == 0) {
+                logger.info("No disks registered; see com.hbm.handler.CompatHandler.disks");
+                return;
+            }
+            disks.forEach((s, disk) -> {
+
+                // Test if the disk path even exists.
+                FileSystem fs = fromClass(MainRegistry.class, RefStrings.MODID, "disks/" + disk.fs.name);
+
+                if (fs == null) { // Disk path does NOT exist, and it should not be loaded.
+
+                    logger.error("Error loading disk: " + s + " at /assets/" + RefStrings.MODID + "/disks/" + disk.fs.name);
+                    logger.error("This is likely due to the path to the disk being non-existent.");
+
+                } else { // Disk path DOES exist, and it should be loaded.
+
+                    disk.item = Items.registerFloppy(s, disk.color, disk.fs); // The big part, actually registering the floppies!
+                    logger.info("Registered disk: " + s + " at /assets/" + RefStrings.MODID + "/disks/" + disk.fs.name);
+
+                }
+            });
+            logger.info("OpenComputers disks registered.");
+
+            // OC disk recipes!
+            List<ItemStack> floppyDisks = new RecipesCommon.OreDictStack("oc:floppy").toStacks();
+
+            if(floppyDisks.size() > 0) { //check that floppy disks even exist in oredict.
+
+                // Recipes must be initialized here, since if they were initialized in `CraftingManager` then the disk item would not be created yet.
+                addShapelessAuto(disks.get("PWRangler").item, new Object[] {"oc:floppy", new ItemStack(ModBlocks.pwr_casing)});
+
+                logger.info("OpenComputers disk recipe added for PWRangler.");
+            } else {
+                logger.info("OpenComputers floppy disk oredict not found, recipes cannot be loaded!");
+            }
+
+            // boom, OC disks loaded
+            logger.info("OpenComputers disks loaded.");
+        }
+    }
+
+    // Null component name, default to this if broken to avoid NullPointerExceptions.
+    public static final String nullComponent = "ntm_null";
+
     /**
      * This is an interface made specifically for adding OC compatibility to NTM machines. The {@link li.cil.oc.api.network.SimpleComponent} interface must also be implemented in the TE.
      * <br>
@@ -54,11 +207,10 @@ public class CompatHandler {
     @Optional.InterfaceList({
             @Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers"),
             @Optional.Interface(iface = "li.cil.oc.api.network.SidedComponent", modid = "OpenComputers"),
-            @Optional.Interface(iface = "li.cil.oc.api.network.Analyzable", modid = "OpenComputers"),
             @Optional.Interface(iface = "li.cil.oc.api.network.ManagedPeripheral", modid = "OpenComputers"),
     })
     @SimpleComponent.SkipInjection // make sure OC doesn't inject this shit into the interface and crash
-    public interface OCComponent extends SimpleComponent, SidedComponent, Analyzable, ManagedPeripheral {
+    public interface OCComponent extends SimpleComponent, SidedComponent, ManagedPeripheral {
 
         /**
          * Must be overridden in the implemented TE, or it will default to "ntm_null".
@@ -69,7 +221,7 @@ public class CompatHandler {
         @Override
         @Optional.Method(modid = "OpenComputers")
         default String getComponentName() {
-            return "ntm_null";
+            return nullComponent;
         }
 
         /**
@@ -83,31 +235,6 @@ public class CompatHandler {
             return true;
         }
 
-        /**
-         * Function to give more information when analyzing the block. Multiple entries in the array will be sent to the user in the order of the array.
-         * @return Additional text to add in the form of lang entries (ex: "analyze.basic2").
-         */
-        @Optional.Method(modid = "OpenComputers")
-        default String[] getExtraInfo() {return new String[] {"analyze.noInfo"};}
-
-        @Override
-        @Optional.Method(modid = "OpenComputers")
-        default Node[] onAnalyze(EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
-            player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic1").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD)));
-            player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic2").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
-            player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic3").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD)));
-            player.addChatComponentMessage(new ChatComponentTranslation("analyze.name", this.getComponentName()).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD)));
-            String[] extraInfo = getExtraInfo();
-            for (String info : extraInfo) {
-                if(!info.equals(""))
-                    player.addChatComponentMessage(new ChatComponentTranslation(info).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
-            }
-            TileEntity te = (TileEntity) this;
-            if((Array.getLength(this.methods()) == 0 && te instanceof TileEntityProxyCombo) || this.getComponentName().equals("ntm_null"))
-                player.addChatComponentMessage(new ChatComponentTranslation("analyze.error").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
-            return null;
-        }
-
         /**
          * Standard methods array from {@link li.cil.oc.api.network.ManagedPeripheral} extending {@link li.cil.oc.api.network.SimpleComponent}.
          * @return Array of methods to expose to the computer.

src/main/java/com/hbm/handler/nei/RefineryRecipeHandler.java

@@ -162,7 +162,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler implements ICom
 		guiGui = new LinkedList<Class<? extends GuiContainer>>();
 
 		transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27, 23, 36, 18), "refinery"));
-		transferRectsGui.add(new RecipeTransferRect(new Rectangle(18 * 2 + 2 + 36, 89 - 7 - 11 - 11, 18 * 4, 18), "refinery"));
+		transferRectsGui.add(new RecipeTransferRect(new Rectangle(48, 5, 31, 101), "refinery"));
 		guiGui.add(GUIMachineRefinery.class);
 		RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects);
 		RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui);

src/main/java/com/hbm/interfaces/IFluidAcceptor.java

@@ -1,29 +0,0 @@
-package com.hbm.interfaces;
-
-import com.hbm.inventory.fluid.FluidType;
-
-@Deprecated
-public interface IFluidAcceptor extends IFluidContainer {
-
-	@Deprecated int getMaxFluidFill(FluidType type);
-	
-	@Deprecated
-	public default void setFluidFillForReceive(int fill, FluidType type) {
-		this.setFluidFill(fill, type);
-	}
-
-	@Deprecated
-	public default int getFluidFillForReceive(FluidType type) {
-		return this.getFluidFill(type);
-	}
-
-	@Deprecated
-	public default int getMaxFluidFillForReceive(FluidType type) {
-		return this.getMaxFluidFill(type);
-	}
-
-	@Deprecated
-	public default void receiveFluid(int amount, FluidType type) {
-		this.setFluidFill(this.getFluidFill(type) + amount, type);
-	}
-}

src/main/java/com/hbm/interfaces/IFluidContainer.java

@@ -1,20 +0,0 @@
-package com.hbm.interfaces;
-
-import com.hbm.inventory.fluid.FluidType;
-
-@Deprecated
-public interface IFluidContainer {
-
-	//Args: fill, what the fill should be set to; index, index for array if there are multiple tanks
-	public void setFillForSync(int fill, int index);
-
-	//Args: fill: what the fill should be set to; type, what type the tank in question has
-	void setFluidFill(int fill, FluidType type);
-	
-	//Args: type, what the type should be set to; index, index for array if there are multiple tanks
-	public void setTypeForSync(FluidType type, int index);
-	
-	//Args: type, what type the tank in question has
-	int getFluidFill(FluidType type);
-
-}

src/main/java/com/hbm/interfaces/IFluidDuct.java

@@ -1,10 +0,0 @@
-package com.hbm.interfaces;
-
-import com.hbm.inventory.fluid.FluidType;
-
-public interface IFluidDuct {
-
-	public FluidType getType();
-	public boolean setType(FluidType type);
-
-}

src/main/java/com/hbm/interfaces/IFluidSource.java

@@ -1,32 +0,0 @@
-package com.hbm.interfaces;
-
-import java.util.List;
-
-import com.hbm.inventory.fluid.FluidType;
-
-@Deprecated
-public interface IFluidSource extends IFluidContainer {
-	
-	@Deprecated void fillFluidInit(FluidType type);
-
-	@Deprecated void fillFluid(int x, int y, int z, boolean newTact, FluidType type);
-
-	@Deprecated boolean getTact();
-	@Deprecated List<IFluidAcceptor> getFluidList(FluidType type);
-	@Deprecated void clearFluidList(FluidType type);
-
-	@Deprecated
-	public default void setFluidFillForTransfer(int fill, FluidType type) {
-		this.setFluidFill(fill, type);
-	}
-
-	@Deprecated
-	public default int getFluidFillForTransfer(FluidType type) {
-		return this.getFluidFill(type);
-	}
-
-	@Deprecated
-	public default void transferFluid(int amount, FluidType type) {
-		this.setFluidFillForTransfer(this.getFluidFillForTransfer(type) - amount, type);
-	}
-}

src/main/java/com/hbm/interfaces/IGasAcceptor.java

@@ -1,11 +0,0 @@
-package com.hbm.interfaces;
-
-public interface IGasAcceptor {
-	
-	void setGasFill(int i);
-	
-	int getGasFill();
-	
-	int getMaxGasFill();
-
-}

src/main/java/com/hbm/interfaces/IGasDuct.java

@@ -1,5 +0,0 @@
-package com.hbm.interfaces;
-
-public interface IGasDuct {
-
-}

src/main/java/com/hbm/interfaces/IGasSource.java

@@ -1,17 +0,0 @@
-package com.hbm.interfaces;
-
-import java.util.List;
-
-public interface IGasSource {
-	
-	void fillGasInit();
-
-	void fillGas(int x, int y, int z, boolean newTact);
-
-	boolean getTact();
-	int getGasFill();
-	void setGasFill(int i);
-	List<IGasAcceptor> getGasList();
-	void clearGasList();
-
-}

src/main/java/com/hbm/interfaces/IOilAcceptor.java

@@ -1,11 +0,0 @@
-package com.hbm.interfaces;
-
-public interface IOilAcceptor {
-	
-	void setFill(int i);
-	
-	int getFill();
-	
-	int getMaxFill();
-
-}

src/main/java/com/hbm/interfaces/IOilDuct.java

@@ -1,5 +0,0 @@
-package com.hbm.interfaces;
-
-public interface IOilDuct {
-
-}

src/main/java/com/hbm/interfaces/IOilSource.java

@@ -1,17 +0,0 @@
-package com.hbm.interfaces;
-
-import java.util.List;
-
-public interface IOilSource {
-	
-	void fillInit();
-
-	void fill(int x, int y, int z, boolean newTact);
-
-	boolean getTact();
-	int getSFill();
-	void setSFill(int i);
-	List<IOilAcceptor> getList();
-	void clearList();
-
-}

src/main/java/com/hbm/interfaces/IReactor.java

@@ -1,21 +0,0 @@
-package com.hbm.interfaces;
-
-import net.minecraft.world.World;
-
-public interface IReactor {
-	
-	boolean isStructureValid(World world);
-	
-	boolean isCoatingValid(World world);
-
-	boolean hasFuse();
-	
-	int getWaterScaled(int i);
-	
-	int getCoolantScaled(int i);
-	
-	long getPowerScaled(long i);
-
-	int getHeatScaled(int i);
-
-}

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

@@ -117,6 +117,7 @@ public class RecipesCommon {
 				return;
 			}
 			this.item = stack.getItem();
+			if(this.item == null) this.item = ModItems.nothing; //i'm going to bash some fuckard's head in
 			this.stacksize = stack.stackSize;
 			this.meta = stack.getItemDamage();
 		}
@@ -128,6 +129,7 @@ public class RecipesCommon {
 		
 		public ComparableStack(Item item) {
 			this.item = item;
+			if(this.item == null) this.item = ModItems.nothing;
 			this.stacksize = 1;
 			this.meta = 0;
 		}

src/main/java/com/hbm/inventory/container/ContainerArmorTable.java

@@ -19,20 +19,21 @@ import net.minecraft.util.IIcon;
 
 public class ContainerArmorTable extends Container {
 	
-	public InventoryBasic upgrades = new InventoryBasic("Upgrades", false, 8);
+	public InventoryBasic upgrades = new InventoryBasic("Upgrades", false, ArmorModHandler.MOD_SLOTS);
 	public IInventory armor = new InventoryCraftResult();
 
 	public ContainerArmorTable(InventoryPlayer inventory) {
 		EntityPlayer player = inventory.player;
 		
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.helmet_only, 26 + 22, 27));	// helmet only
-		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.plate_only, 62 + 22, 27));		// chestplate only
+		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.plate_only, 62 + 22, 27));	// chestplate only
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.legs_only, 98 + 22, 27));		// leggins only
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.boots_only, 134 + 22, 45));	// boots only
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.servos, 134 + 22, 81));		//servos/frame
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.cladding, 98 + 22, 99));		//radiation cladding
-		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.kevlar, 62 + 22, 99));			//kevlar/sapi/(ERA? :) )
+		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.kevlar, 62 + 22, 99));		//kevlar/sapi/(ERA? :) )
 		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.extra, 26 + 22, 99));			//special parts
+		this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.battery, 8 + 22, 63));		//special parts
 
 		this.addSlotToContainer(new Slot(armor, 0, 44 + 22, 63) {
 
@@ -48,7 +49,7 @@ public class ContainerArmorTable extends Container {
 				if(stack != null) {
 					ItemStack[] mods = ArmorModHandler.pryMods(stack);
 					
-					for(int i = 0; i < 8; i++) {
+					for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) {
 						
 						if(mods != null)
 							upgrades.setInventorySlotContents(i, mods[i]);
@@ -65,7 +66,7 @@ public class ContainerArmorTable extends Container {
 				
 				//if the armor piece is taken, absorb all armor pieces
 				
-				for(int i = 0; i < 8; i++) {
+				for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) {
 					
 					ItemStack mod = upgrades.getStackInSlot(i);
 					
@@ -126,19 +127,19 @@ public class ContainerArmorTable extends Container {
 			ItemStack var5 = var4.getStack();
 			var3 = var5.copy();
 
-			if(par2 <= 8) {
+			if(par2 <= ArmorModHandler.MOD_SLOTS) {
-				if(par2 != 8 || !InventoryUtil.mergeItemStack(this.inventorySlots, var5, 9, 13, false))
+				if(par2 != ArmorModHandler.MOD_SLOTS || !InventoryUtil.mergeItemStack(this.inventorySlots, var5, ArmorModHandler.MOD_SLOTS + 1, ArmorModHandler.MOD_SLOTS + 5, false))
-					if(!this.mergeItemStack(var5, 13, this.inventorySlots.size(), true))
+					if(!this.mergeItemStack(var5, ArmorModHandler.MOD_SLOTS + 5, this.inventorySlots.size(), true))
 						return null;
 					
 				var4.onPickupFromSlot(p_82846_1_, var5);
 			} else {
 				
 				if(var5.getItem() instanceof ItemArmor) {
-					if(!this.mergeItemStack(var5, 8, 9, false))
+					if(!this.mergeItemStack(var5, ArmorModHandler.MOD_SLOTS, ArmorModHandler.MOD_SLOTS + 1, false))
 						return null;
 					
-				} else if(this.inventorySlots.get(8) != null && var5.getItem() instanceof ItemArmorMod) {
+				} else if(this.inventorySlots.get(ArmorModHandler.MOD_SLOTS) != null && var5.getItem() instanceof ItemArmorMod) {
 					
 					ItemArmorMod mod = (ItemArmorMod)var5.getItem();
 					int slot = mod.type;

src/main/java/com/hbm/inventory/container/ContainerCrateDesh.java

@@ -4,6 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 
+@invtweaks.api.container.ChestContainer(rowSize = 13, isLargeChest = false)
 public class ContainerCrateDesh extends ContainerCrateBase {
 
 	public ContainerCrateDesh(InventoryPlayer invPlayer, IInventory tedf) {
@@ -15,7 +16,7 @@ public class ContainerCrateDesh extends ContainerCrateBase {
 			}
 		}
 
-		this.playerInv(invPlayer,44, 174, 232);
+		this.playerInv(invPlayer, 44, 174, 232);
 
 	}
 }

src/main/java/com/hbm/inventory/container/ContainerCrateIron.java

@@ -5,7 +5,7 @@ import com.hbm.tileentity.machine.storage.TileEntityCrateIron;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 
-//@invtweaks.api.container.ChestContainer
+@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false)
 public class ContainerCrateIron extends ContainerCrateBase {
 	
 	public ContainerCrateIron(InventoryPlayer invPlayer, TileEntityCrateIron tedf) {

src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 
-//@invtweaks.api.container.ChestContainer
+@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false)
 public class ContainerCrateSteel extends ContainerCrateBase {
 
 	public ContainerCrateSteel(InventoryPlayer invPlayer, IInventory tedf) {
@@ -16,6 +16,6 @@ public class ContainerCrateSteel extends ContainerCrateBase {
 			}
 		}
 
-		this.playerInv(invPlayer,8, 84 + (18 * 3) + 2, 142 + (18 * 3) + 2);
+		this.playerInv(invPlayer, 8, 84 + (18 * 3) + 2, 142 + (18 * 3) + 2);
 	}
 }

src/main/java/com/hbm/inventory/container/ContainerCrateTemplate.java

@@ -5,6 +5,7 @@ import com.hbm.tileentity.machine.storage.TileEntityCrateTemplate;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 
+@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false)
 public class ContainerCrateTemplate extends ContainerCrateBase {
 	
 	public ContainerCrateTemplate(InventoryPlayer invPlayer, TileEntityCrateTemplate tedf) {
@@ -16,6 +17,6 @@ public class ContainerCrateTemplate extends ContainerCrateBase {
 			}
 		}
 
-		this.playerInv(invPlayer,8, 86, 144);
+		this.playerInv(invPlayer, 8, 86, 144);
 	}
 }

src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java

@@ -5,7 +5,7 @@ import com.hbm.tileentity.machine.storage.TileEntityCrateTungsten;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 
-//@invtweaks.api.container.ChestContainer
+@invtweaks.api.container.ChestContainer(rowSize = 9, isLargeChest = false)
 public class ContainerCrateTungsten extends ContainerCrateBase {
 
 	public ContainerCrateTungsten(InventoryPlayer invPlayer, TileEntityCrateTungsten te) {
@@ -17,6 +17,6 @@ public class ContainerCrateTungsten extends ContainerCrateBase {
 			}
 		}
 
-		this.playerInv(invPlayer,8, 32 + 18 * 3, 90 + (18 * 3));
+		this.playerInv(invPlayer, 8, 32 + 18 * 3, 90 + (18 * 3));
 	}
 }

src/main/java/com/hbm/inventory/container/ContainerMachineRefinery.java

@@ -19,40 +19,40 @@ public class ContainerMachineRefinery extends Container {
 		testNuke = tedf;
 
 		//Battery
-		this.addSlotToContainer(new Slot(tedf, 0, 8, 90));
+		this.addSlotToContainer(new Slot(tedf, 0, 186, 72));
 		//Canister Input
-		this.addSlotToContainer(new Slot(tedf, 1, 35, 90));
+		this.addSlotToContainer(new Slot(tedf, 1, 8, 99));
 		//Canister Output
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 35, 108));
+		this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 8, 119));
 		//Heavy Oil Input
-		this.addSlotToContainer(new Slot(tedf, 3, 80, 90));
+		this.addSlotToContainer(new Slot(tedf, 3, 86, 99));
 		//Heavy Oil Output
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 80, 108));
+		this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 86, 119));
 		//Naphtha Input
-		this.addSlotToContainer(new Slot(tedf, 5, 98, 90));
+		this.addSlotToContainer(new Slot(tedf, 5, 106, 99));
 		//Naphtha Output
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 98, 108));
+		this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 106, 119));
 		//Light Oil Input
-		this.addSlotToContainer(new Slot(tedf, 7, 116, 90));
+		this.addSlotToContainer(new Slot(tedf, 7, 126, 99));
 		//Light Oil Output
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 116, 108));
+		this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 126, 119));
 		//Petroleum Input
-		this.addSlotToContainer(new Slot(tedf, 9, 134, 90));
+		this.addSlotToContainer(new Slot(tedf, 9, 146, 99));
 		//Petroleum Output
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 134, 108));
+		this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 146, 119));
 		//Sulfur Output
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 152, 36));
+		this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 58, 119));
 		//Fluid ID
-		this.addSlotToContainer(new Slot(tedf, 12, 8, 108));
+		this.addSlotToContainer(new Slot(tedf, 12, 186, 106));
 		
 		for(int i = 0; i < 3; i++) {
 			for(int j = 0; j < 9; j++) {
-				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 56));
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 150 + i * 18));
 			}
 		}
 
 		for(int i = 0; i < 9; i++) {
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 56));
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 208));
 		}
 	}
 	

src/main/java/com/hbm/inventory/container/ContainerPuF6Tank.java

@@ -1,85 +0,0 @@
-package com.hbm.inventory.container;
-
-import com.hbm.inventory.SlotTakeOnly;
-import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class ContainerPuF6Tank extends Container {
-
-	private TileEntityMachinePuF6Tank testNuke;
-	
-	public ContainerPuF6Tank(InventoryPlayer invPlayer, TileEntityMachinePuF6Tank tedf) {
-		testNuke = tedf;
-		
-		this.addSlotToContainer(new Slot(tedf, 0, 44, 17));
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 1, 44, 53));
-		this.addSlotToContainer(new Slot(tedf, 2, 116, 17));
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 3, 116, 53));
-		
-		for(int i = 0; i < 3; i++)
-		{
-			for(int j = 0; j < 9; j++)
-			{
-				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-		
-		for(int i = 0; i < 9; i++)
-		{
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
-		}
-	}
-	
-	@Override
-	public void addCraftingToCrafters(ICrafting crafting) {
-		super.addCraftingToCrafters(crafting);
-	}
-	
-	@Override
-    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
-    {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
-		
-		if (var4 != null && var4.getHasStack())
-		{
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
-			
-            if (par2 <= 3) {
-				if (!this.mergeItemStack(var5, 4, this.inventorySlots.size(), true))
-				{
-					return null;
-				}
-			}
-			else if (!this.mergeItemStack(var5, 0, 1, false))
-			{
-				if (!this.mergeItemStack(var5, 2, 3, false))
-					return null;
-			}
-			
-			if (var5.stackSize == 0)
-			{
-				var4.putStack((ItemStack) null);
-			}
-			else
-			{
-				var4.onSlotChanged();
-			}
-		}
-		
-		return var3;
-    }
-
-	@Override
-	public boolean canInteractWith(EntityPlayer player) {
-		return testNuke.isUseableByPlayer(player);
-	}
-
-}

src/main/java/com/hbm/inventory/container/ContainerUF6Tank.java

@@ -1,85 +0,0 @@
-package com.hbm.inventory.container;
-
-import com.hbm.inventory.SlotTakeOnly;
-import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class ContainerUF6Tank extends Container {
-
-	private TileEntityMachineUF6Tank testNuke;
-	
-	public ContainerUF6Tank(InventoryPlayer invPlayer, TileEntityMachineUF6Tank tedf) {
-		testNuke = tedf;
-		
-		this.addSlotToContainer(new Slot(tedf, 0, 44, 17));
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 1, 44, 53));
-		this.addSlotToContainer(new Slot(tedf, 2, 116, 17));
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 3, 116, 53));
-		
-		for(int i = 0; i < 3; i++)
-		{
-			for(int j = 0; j < 9; j++)
-			{
-				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-		
-		for(int i = 0; i < 9; i++)
-		{
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
-		}
-	}
-	
-	@Override
-	public void addCraftingToCrafters(ICrafting crafting) {
-		super.addCraftingToCrafters(crafting);
-	}
-	
-	@Override
-    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
-    {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
-		
-		if (var4 != null && var4.getHasStack())
-		{
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
-			
-            if (par2 <= 3) {
-				if (!this.mergeItemStack(var5, 4, this.inventorySlots.size(), true))
-				{
-					return null;
-				}
-			}
-			else if (!this.mergeItemStack(var5, 0, 1, false))
-			{
-				if (!this.mergeItemStack(var5, 2, 3, false))
-					return null;
-			}
-			
-			if (var5.stackSize == 0)
-			{
-				var4.putStack((ItemStack) null);
-			}
-			else
-			{
-				var4.onSlotChanged();
-			}
-		}
-		
-		return var3;
-    }
-
-	@Override
-	public boolean canInteractWith(EntityPlayer player) {
-		return testNuke.isUseableByPlayer(player);
-	}
-
-}

src/main/java/com/hbm/inventory/fluid/tank/FluidTank.java

@@ -12,17 +12,13 @@ import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.gui.GuiInfoContainer;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.IItemFluidIdentifier;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.TEFluidPacket;
 
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 
@@ -40,7 +36,6 @@ public class FluidTank {
 	FluidType type;
 	int fluid;
 	int maxFluid;
-	@Deprecated public int index = 0;
 	int pressure = 0;
 	
 	public FluidTank(FluidType type, int maxFluid) {
@@ -56,13 +51,6 @@ public class FluidTank {
 		return this;
 	}
 	
-	@Deprecated // indices are no longer needed
-	public FluidTank(FluidType type, int maxFluid, int index) {
-		this.type = type;
-		this.maxFluid = maxFluid;
-		this.index = index;
-	}
-	
 	public void setFill(int i) {
 		fluid = i;
 	}
@@ -108,20 +96,6 @@ public class FluidTank {
 		return 0;
 	}
 	
-	//Called on TE update
-	@Deprecated public void updateTank(TileEntity te) {
-		updateTank(te, 100);
-	}
-	@Deprecated public void updateTank(TileEntity te, int range) {
-		updateTank(te.xCoord, te.yCoord, te.zCoord, te.getWorldObj().provider.dimensionId, range);
-	}
-	@Deprecated public void updateTank(int x, int y, int z, int dim) {
-		updateTank(x, y, z, dim, 100);
-	}
-	@Deprecated public void updateTank(int x, int y, int z, int dim, int range) {
-		PacketDispatcher.wrapper.sendToAllAround(new TEFluidPacket(x, y, z, fluid, index, type), new TargetPoint(dim, x, y, z, range));
-	}
-	
 	//Fills tank from canisters
 	public boolean loadTank(int in, int out, ItemStack[] slots) {
 		

src/main/java/com/hbm/inventory/gui/GUIArmorTable.java

@@ -46,15 +46,16 @@ public class GUIArmorTable extends GuiInfoContainer {
 					"armorMod.type.cladding",
 					"armorMod.type.insert",
 					"armorMod.type.special",
+					"armorMod.type.battery",
 					"armorMod.insertHere"
 			};
 			
-			for(int i = 0; i < 9; ++i) {
+			for(int i = 0; i < ArmorModHandler.MOD_SLOTS + 1; ++i) {
 				Slot slot = (Slot) this.inventorySlots.inventorySlots.get(i);
 				
 				if(this.isMouseOverSlot(slot, x, y) && !slot.getHasStack()) {
 					
-					this.drawCreativeTabHoveringText((i < 8 ? EnumChatFormatting.LIGHT_PURPLE : EnumChatFormatting.YELLOW) + I18nUtil.resolveKey(unloc[i]), x, y);
+					this.drawCreativeTabHoveringText((i < ArmorModHandler.MOD_SLOTS ? EnumChatFormatting.LIGHT_PURPLE : EnumChatFormatting.YELLOW) + I18nUtil.resolveKey(unloc[i]), x, y);
 				}
 			}
 		}
@@ -75,7 +76,7 @@ public class GUIArmorTable extends GuiInfoContainer {
 		this.drawTexturedModalRect(guiLeft + 22, guiTop, 0, 0, this.xSize - 22, this.ySize);
 		this.drawTexturedModalRect(guiLeft, guiTop + 31, 176, 96, 22, 100);
 
-		ItemStack armor = this.inventorySlots.getSlot(8).getStack();
+		ItemStack armor = this.inventorySlots.getSlot(ArmorModHandler.MOD_SLOTS).getStack();
 
 		if(armor != null) {
 
@@ -89,7 +90,7 @@ public class GUIArmorTable extends GuiInfoContainer {
 				this.drawTexturedModalRect(guiLeft + 41 + 22, guiTop + 60, 176, 52, 22, 22);
 		}
 		
-		for(int i = 0; i < 8; i++) {
+		for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) {
 			Slot slot = this.inventorySlots.getSlot(i);
 			drawIndicator(i, slot.xDisplayPosition - 1, slot.yDisplayPosition - 1);
 		}
@@ -98,7 +99,7 @@ public class GUIArmorTable extends GuiInfoContainer {
 	private void drawIndicator(int index, int x, int y) {
 
 		ItemStack mod = this.inventorySlots.getSlot(index).getStack();
-		ItemStack armor = this.inventorySlots.getSlot(8).getStack();
+		ItemStack armor = this.inventorySlots.getSlot(ArmorModHandler.MOD_SLOTS).getStack();
 
 		if(mod == null)
 			return;

src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java

@@ -1,50 +0,0 @@
-package com.hbm.inventory.gui;
-
-import org.lwjgl.opengl.GL11;
-
-import com.hbm.inventory.container.ContainerPuF6Tank;
-import com.hbm.lib.RefStrings;
-import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-public class GUIMachinePuF6Tank extends GuiInfoContainer {
-
-	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/puf6Tank.png");
-	private TileEntityMachinePuF6Tank tank;
-	
-	public GUIMachinePuF6Tank(InventoryPlayer invPlayer, TileEntityMachinePuF6Tank tedf) {
-		super(new ContainerPuF6Tank(invPlayer, tedf));
-		tank = tedf;
-		
-		this.xSize = 176;
-		this.ySize = 166;
-	}
-	
-	@Override
-	public void drawScreen(int mouseX, int mouseY, float f) {
-		super.drawScreen(mouseX, mouseY, f);
-		
-		tank.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 69 - 52, 16, 52);
-	}
-
-	@Override
-	protected void drawGuiContainerForegroundLayer( int i, int j) {
-		String name = this.tank.hasCustomInventoryName() ? this.tank.getInventoryName() : I18n.format(this.tank.getInventoryName());
-		
-		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
-		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
-	}
-	
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
-		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
-		
-		tank.tank.renderTank(guiLeft + 80, guiTop + 69, this.zLevel, 16, 52);
-	}
-}

src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java

@@ -1,9 +1,14 @@
 package com.hbm.inventory.gui;
 
+import com.hbm.inventory.FluidStack;
+import com.hbm.inventory.fluid.tank.FluidTank;
+import com.hbm.inventory.recipes.RefineryRecipes;
+import com.hbm.util.Tuple;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.item.ItemStack;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMachineRefinery;
-import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.oil.TileEntityMachineRefinery;
 
@@ -12,6 +17,8 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 
+import java.awt.Color;
+
 public class GUIMachineRefinery extends GuiInfoContainer {
 	
 	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_refinery.png");
@@ -21,46 +28,100 @@ public class GUIMachineRefinery extends GuiInfoContainer {
 		super(new ContainerMachineRefinery(invPlayer, tedf));
 		refinery = tedf;
 		
-		this.xSize = 176;
+		this.xSize = 210;
-		this.ySize = 222;
+		this.ySize = 231;
 	}
 	
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float f) {
 		super.drawScreen(mouseX, mouseY, f);
 
-		refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 70 - 52, 34, 52);
+		refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 30, guiTop + 27, 21, 104);    // Render tooltip for column.
-		refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 70 - 52, 16, 52);
+		refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 86, guiTop + 42, 16, 52);
-		refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 98, guiTop + 70 - 52, 16, 52);
+		refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 106, guiTop + 42, 16, 52);
-		refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 116, guiTop + 70 - 52, 16, 52);
+		refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 126, guiTop + 42, 16, 52);
-		refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 70 - 52, 16, 52);
+		refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 146, guiTop + 42, 16, 52);
-		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 70 - 52, 16, 52, refinery.power, refinery.maxPower);
+		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 186, guiTop + 18, 16, 52, refinery.power, refinery.maxPower);
 	}
 	
 	@Override
 	protected void drawGuiContainerForegroundLayer(int i, int j) {
 		String name = this.refinery.hasCustomInventoryName() ? this.refinery.getInventoryName() : I18n.format(this.refinery.getInventoryName());
 		
-		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
+		this.fontRendererObj.drawString(name, this.xSize / 2 - 34/2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
-		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 4, 4210752);
 	}
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
-		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+		func_146110_a(guiLeft, guiTop, 0, 0, xSize, ySize, 350, 256);
-		
-		if(refinery.tanks[0].getTankType() == Fluids.HOTCRACKOIL)
-			drawTexturedModalRect(guiLeft + 64, guiTop + 20, 192, 0, 12, 26);
 
-		int j = (int)refinery.getPowerScaled(52);
+		// power
-		drawTexturedModalRect(guiLeft + 8, guiTop + 70 - j, 176, 52 - j, 16, j);
+		int j = (int)refinery.getPowerScaled(50);
-		
+		func_146110_a(guiLeft + 186, guiTop + 69 - j, 210, 52 - j, 16, j, 350, 256);
-		refinery.tanks[0].renderTank(guiLeft + 26, guiTop + 70, this.zLevel, 34, 52);
+
-		refinery.tanks[1].renderTank(guiLeft + 80, guiTop + 70, this.zLevel, 16, 52);
+		OpenGlHelper.glBlendFunc(770, 771, 1, 0); // default
-		refinery.tanks[2].renderTank(guiLeft + 98, guiTop + 70, this.zLevel, 16, 52);
+
-		refinery.tanks[3].renderTank(guiLeft + 116, guiTop + 70, this.zLevel, 16, 52);
+		// input tank
-		refinery.tanks[4].renderTank(guiLeft + 134, guiTop + 70, this.zLevel, 16, 52);
+		FluidTank inputOil = refinery.tanks[0];
+		if (inputOil.getFill() != 0) {
+
+			int targetHeight = inputOil.getFill() * 101 / inputOil.getMaxFill();
+			Color color = new Color(inputOil.getTankType().getColor());
+
+			GL11.glEnable(GL11.GL_BLEND);
+			GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
+			func_146110_a(guiLeft + 33, guiTop + 130 - targetHeight, 226, 101 - targetHeight, 16, targetHeight, 350, 256);
+			GL11.glDisable(GL11.GL_BLEND);
+		}
+
+		// fucking kgjhgdfjgdhjfg
+		// func_146110_a lets you set the resolution of the source texture !!!!
+		// 350x256 texture by behated (the pipes wouldn't fit)
+
+		// pipes
+
+		Tuple.Quintet<FluidStack, FluidStack, FluidStack, FluidStack, ItemStack> recipe = RefineryRecipes.getRefinery(inputOil.getTankType());
+
+		if(recipe == null) {
+			func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256);
+			func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256);
+			func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256);
+			func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256);
+		} else {
+
+			// Heavy Oil Products
+			Color color = new Color(recipe.getV().type.getColor());
+
+			GL11.glEnable(GL11.GL_BLEND);
+			GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
+			func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256);
+
+			// Naphtha Oil Products
+			color = new Color(recipe.getW().type.getColor());
+			GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
+			func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256);
+
+			// Light Oil Products
+			color = new Color(recipe.getX().type.getColor());
+			GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
+			func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256);
+
+			// Gaseous Products
+			color = new Color(recipe.getY().type.getColor());
+			GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
+			func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256);
+      
+			GL11.glDisable(GL11.GL_BLEND);
+			GL11.glColor4f(1F, 1F, 1F, 1F);
+		}
+
+		// output tanks
+		refinery.tanks[1].renderTank(guiLeft + 86, guiTop + 95, this.zLevel, 16, 52);
+		refinery.tanks[2].renderTank(guiLeft + 106, guiTop + 95, this.zLevel, 16, 52);
+		refinery.tanks[3].renderTank(guiLeft + 126, guiTop + 95, this.zLevel, 16, 52);
+		refinery.tanks[4].renderTank(guiLeft + 146, guiTop + 95, this.zLevel, 16, 52);
 	}
 }

src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java

@@ -1,50 +0,0 @@
-package com.hbm.inventory.gui;
-
-import org.lwjgl.opengl.GL11;
-
-import com.hbm.inventory.container.ContainerUF6Tank;
-import com.hbm.lib.RefStrings;
-import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-public class GUIMachineUF6Tank extends GuiInfoContainer {
-
-	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/uf6Tank.png");
-	private TileEntityMachineUF6Tank tank;
-	
-	public GUIMachineUF6Tank(InventoryPlayer invPlayer, TileEntityMachineUF6Tank tedf) {
-		super(new ContainerUF6Tank(invPlayer, tedf));
-		tank = tedf;
-		
-		this.xSize = 176;
-		this.ySize = 166;
-	}
-	
-	@Override
-	public void drawScreen(int mouseX, int mouseY, float f) {
-		super.drawScreen(mouseX, mouseY, f);
-		
-		tank.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 69 - 52, 16, 52);
-	}
-
-	@Override
-	protected void drawGuiContainerForegroundLayer( int i, int j) {
-		String name = this.tank.hasCustomInventoryName() ? this.tank.getInventoryName() : I18n.format(this.tank.getInventoryName());
-		
-		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
-		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
-	}
-	
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
-		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
-		
-		tank.tank.renderTank(guiLeft + 80, guiTop + 69, this.zLevel, 16, 52);
-	}
-}

src/main/java/com/hbm/inventory/material/Mats.java

@@ -47,24 +47,24 @@ public class Mats {
 	public static final int _ES = 20_000;
 	
 	//Vanilla and vanilla-like
-	public static final NTMMaterial MAT_STONE			= makeSmeltable(_VS + 00,	df("Stone"), 0x7F7F7F, 0x353535, 0x4D2F23).n();
+	public static final NTMMaterial MAT_STONE			= makeSmeltable(_VS + 00,	df("Stone"),		0x7F7F7F, 0x353535, 0x4D2F23).n();
-	public static final NTMMaterial MAT_CARBON			= makeAdditive(	699, 		CARBON,		0x363636, 0x030303, 0x404040).setShapes(WIRE, INGOT, BLOCK).n();
+	public static final NTMMaterial MAT_CARBON			= makeAdditive(	699,		CARBON,				0x363636, 0x030303, 0x404040).setShapes(WIRE, INGOT, BLOCK).n();
-	public static final NTMMaterial MAT_COAL			= makeNonSmeltable(600, 	COAL, 		0x363636, 0x030303, 0x404040).setConversion(MAT_CARBON,  2, 1).setShapes(FRAGMENT).n();
+	public static final NTMMaterial MAT_COAL			= makeNonSmeltable(600,		COAL, 				0x363636, 0x030303, 0x404040).setConversion(MAT_CARBON,  2, 1).setShapes(FRAGMENT).n();
-	public static final NTMMaterial MAT_LIGNITE			= makeNonSmeltable(601, 	LIGNITE,	0x542D0F, 0x261508, 0x472913).setConversion(MAT_CARBON,  3, 1).setShapes(FRAGMENT).n();
+	public static final NTMMaterial MAT_LIGNITE			= makeNonSmeltable(601,		LIGNITE,			0x542D0F, 0x261508, 0x472913).setConversion(MAT_CARBON,  3, 1).setShapes(FRAGMENT).n();
-	public static final NTMMaterial MAT_COALCOKE		= make(			610, 		COALCOKE)	.setConversion(MAT_CARBON,  4, 3).n();
+	public static final NTMMaterial MAT_COALCOKE		= make(			610,		COALCOKE)			.setConversion(MAT_CARBON,  4, 3).n();
-	public static final NTMMaterial MAT_PETCOKE			= make(			611, 		PETCOKE)	.setConversion(MAT_CARBON,  4, 3).n();
+	public static final NTMMaterial MAT_PETCOKE			= make(			611,		PETCOKE)			.setConversion(MAT_CARBON,  4, 3).n();
-	public static final NTMMaterial MAT_LIGCOKE			= make(			612, 		LIGCOKE)	.setConversion(MAT_CARBON,  4, 3).n();
+	public static final NTMMaterial MAT_LIGCOKE			= make(			612,		LIGCOKE)			.setConversion(MAT_CARBON,  4, 3).n();
-	public static final NTMMaterial MAT_GRAPHITE		= make(			620, 		GRAPHITE)	.setConversion(MAT_CARBON,  1, 1).n();
+	public static final NTMMaterial MAT_GRAPHITE		= make(			620,		GRAPHITE)			.setConversion(MAT_CARBON,  1, 1).n();
-	public static final NTMMaterial MAT_DIAMOND			= makeNonSmeltable(1430, 	DIAMOND,	0xFFFFFF, 0x1B7B6B, 0x8CF4E2).setConversion(MAT_CARBON,  1, 1).setShapes(FRAGMENT).n();
+	public static final NTMMaterial MAT_DIAMOND			= makeNonSmeltable(1430,	DIAMOND,			0xFFFFFF, 0x1B7B6B, 0x8CF4E2).setConversion(MAT_CARBON,  1, 1).setShapes(FRAGMENT).n();
-	public static final NTMMaterial MAT_IRON			= makeSmeltable(2600,		IRON,		0xFFFFFF, 0x353535, 0xFFA259).setShapes(FRAGMENT, INGOT, DUST, PIPE, CASTPLATE, WELDEDPLATE, BLOCK).m();
+	public static final NTMMaterial MAT_IRON			= makeSmeltable(2600,		IRON,				0xFFFFFF, 0x353535, 0xFFA259).setShapes(FRAGMENT, INGOT, DUST, PIPE, CASTPLATE, WELDEDPLATE, BLOCK).m();
-	public static final NTMMaterial MAT_GOLD			= makeSmeltable(7900,		GOLD,		0xFFFF8B, 0xC26E00, 0xE8D754).setShapes(FRAGMENT, WIRE, NUGGET, INGOT, DUST, DENSEWIRE, CASTPLATE, BLOCK).m();
+	public static final NTMMaterial MAT_GOLD			= makeSmeltable(7900,		GOLD,				0xFFFF8B, 0xC26E00, 0xE8D754).setShapes(FRAGMENT, WIRE, NUGGET, INGOT, DUST, DENSEWIRE, CASTPLATE, BLOCK).m();
-	public static final NTMMaterial MAT_REDSTONE		= makeSmeltable(_VS + 01,	REDSTONE,	0xE3260C, 0x700E06, 0xFF1000).setShapes(FRAGMENT).n();
+	public static final NTMMaterial MAT_REDSTONE		= makeSmeltable(_VS + 01,	REDSTONE,			0xE3260C, 0x700E06, 0xFF1000).setShapes(FRAGMENT).n();
-	public static final NTMMaterial MAT_OBSIDIAN		= makeSmeltable(_VS + 02,	df("Obsidian"), 0x3D234D).n();
+	public static final NTMMaterial MAT_OBSIDIAN		= makeSmeltable(_VS + 02,	df("Obsidian"),		0x3D234D).n();
-	public static final NTMMaterial MAT_HEMATITE		= makeAdditive(	2601, 		HEMATITE,	0xDFB7AE, 0x5F372E, 0x6E463D).m();
+	public static final NTMMaterial MAT_HEMATITE		= makeAdditive(	2601,		HEMATITE,			0xDFB7AE, 0x5F372E, 0x6E463D).m();
 	public static final NTMMaterial MAT_WROUGHTIRON		= makeSmeltable(2602,		df("WroughtIron"),	0xFAAB89).m();
 	public static final NTMMaterial MAT_PIGIRON			= makeSmeltable(2603,		df("PigIron"),		0xFF8B59).m();
 	public static final NTMMaterial MAT_METEORICIRON	= makeSmeltable(2604,		df("MeteoricIron"),	0x715347).m();
-	public static final NTMMaterial MAT_MALACHITE		= makeAdditive(	2901, 		MALACHITE,	0xA2F0C8, 0x227048, 0x61AF87).m();
+	public static final NTMMaterial MAT_MALACHITE		= makeAdditive(	2901,		MALACHITE,			0xA2F0C8, 0x227048, 0x61AF87).m();
 
 	//Radioactive
 	public static final NTMMaterial MAT_URANIUM		= makeSmeltable(9200,		U,			0xC1C7BD, 0x2B3227, 0x9AA196).setShapes(FRAGMENT, NUGGET, BILLET, INGOT, DUST, BLOCK).m();
@@ -78,17 +78,17 @@ public class Mats {
 	public static final NTMMaterial MAT_PU239		= makeSmeltable(9439,		PU239,		0x9AA3A0, 0x111A17, 0x78817E).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
 	public static final NTMMaterial MAT_PU240		= makeSmeltable(9440,		PU240,		0x9AA3A0, 0x111A17, 0x78817E).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
 	public static final NTMMaterial MAT_PU241		= makeSmeltable(9441,		PU241,		0x9AA3A0, 0x111A17, 0x78817E).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
-	public static final NTMMaterial MAT_RGA			= makeSmeltable(9501,		AMRG,		0x93767B).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
+	public static final NTMMaterial MAT_RGA			= makeSmeltable(9501,		AMRG,		0xCEB3B9, 0x3A1C21, 0x93767B).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
-	public static final NTMMaterial MAT_AM241		= makeSmeltable(9541,		AM241,		0x93767B).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
+	public static final NTMMaterial MAT_AM241		= makeSmeltable(9541,		AM241,		0xCEB3B9, 0x3A1C21, 0x93767B).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
-	public static final NTMMaterial MAT_AM242		= makeSmeltable(9542,		AM242,		0x93767B).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
+	public static final NTMMaterial MAT_AM242		= makeSmeltable(9542,		AM242,		0xCEB3B9, 0x3A1C21, 0x93767B).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
-	public static final NTMMaterial MAT_NEPTUNIUM	= makeSmeltable(9337,		NP237,		0x647064).setShapes(NUGGET, BILLET, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_NEPTUNIUM	= makeSmeltable(9337,		NP237,		0xA6B2A6, 0x030F03, 0x647064).setShapes(NUGGET, BILLET, INGOT, DUST, BLOCK).m();
 	public static final NTMMaterial MAT_POLONIUM	= makeSmeltable(8410,		PO210,		0x968779, 0x3D1509, 0x715E4A).setShapes(FRAGMENT, NUGGET, BILLET, INGOT, DUST, BLOCK).m();
 	public static final NTMMaterial MAT_TECHNETIUM	= makeSmeltable(4399,		TC99,		0xFAFFFF, 0x576C6C, 0xCADFDF).setShapes(FRAGMENT, NUGGET, BILLET, INGOT, BLOCK).m();
-	public static final NTMMaterial MAT_RADIUM		= makeSmeltable(8826,		RA226,		0xE9FAF6).setShapes(FRAGMENT, NUGGET, BILLET, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_RADIUM		= makeSmeltable(8826,		RA226,		0xFCFCFC, 0xADBFBA, 0xE9FAF6).setShapes(FRAGMENT, NUGGET, BILLET, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_ACTINIUM	= makeSmeltable(8927,		AC227,		0x958989).setShapes(NUGGET, BILLET, INGOT).m();
+	public static final NTMMaterial MAT_ACTINIUM	= makeSmeltable(8927,		AC227,		0xECE0E0, 0x221616, 0x958989).setShapes(NUGGET, BILLET, INGOT).m();
 	public static final NTMMaterial MAT_CO60		= makeSmeltable(2760,		CO60,		0xC2D1EE, 0x353554, 0x8F72AE).setShapes(NUGGET, BILLET, INGOT, DUST).m();
 	public static final NTMMaterial MAT_AU198		= makeSmeltable(7998,		AU198,		0xFFFF8B, 0xC26E00, 0xE8D754).setShapes(NUGGET, BILLET, INGOT, DUST).m();
-	public static final NTMMaterial MAT_PB209		= makeSmeltable(8209,		PB209,		0x7B535D).setShapes(NUGGET, BILLET, INGOT, DUST).m();
+	public static final NTMMaterial MAT_PB209		= makeSmeltable(8209,		PB209,		0xB38A94, 0x12020E, 0x7B535D).setShapes(NUGGET, BILLET, INGOT, DUST).m();
 	public static final NTMMaterial MAT_SCHRABIDIUM	= makeSmeltable(12626,		SA326,		0x32FFFF, 0x005C5C, 0x32FFFF).setShapes(NUGGET, WIRE, BILLET, INGOT, DUST, DENSEWIRE, PLATE, CASTPLATE, BLOCK).m();
 	public static final NTMMaterial MAT_SOLINIUM	= makeSmeltable(12627,		SA327,		0xA2E6E0, 0x00433D, 0x72B6B0).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
 	public static final NTMMaterial MAT_SCHRABIDATE	= makeSmeltable(12600,		SBD,		0x77C0D7, 0x39005E, 0x6589B4).setShapes(INGOT, DUST, DENSEWIRE, CASTPLATE, BLOCK).m();
@@ -96,39 +96,39 @@ public class Mats {
 	public static final NTMMaterial MAT_GHIORSIUM	= makeSmeltable(12836,		GH336,		0xF4EFE1, 0x2A3306, 0xC6C6A1).setShapes(NUGGET, BILLET, INGOT, BLOCK).m();
 
 	//Base metals
-	public static final NTMMaterial MAT_TITANIUM		= makeSmeltable(2200,		TI,			0xF7F3F2, 0x4F4C4B, 0xA99E79).setShapes(FRAGMENT, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, BLOCK, HEAVY_COMPONENT).m();
+	public static final NTMMaterial MAT_TITANIUM		= makeSmeltable(2200,		TI,				0xF7F3F2, 0x4F4C4B, 0xA99E79).setShapes(FRAGMENT, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, BLOCK, HEAVY_COMPONENT).m();
-	public static final NTMMaterial MAT_COPPER			= makeSmeltable(2900,		CU,			0xFDCA88, 0x601E0D, 0xC18336).setShapes(FRAGMENT, WIRE, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT).m();
+	public static final NTMMaterial MAT_COPPER			= makeSmeltable(2900,		CU,				0xFDCA88, 0x601E0D, 0xC18336).setShapes(FRAGMENT, WIRE, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT).m();
-	public static final NTMMaterial MAT_TUNGSTEN		= makeSmeltable(7400,		W,			0x868686, 0x000000, 0x977474).setShapes(FRAGMENT, WIRE, BOLT, INGOT, DUST, DENSEWIRE, CASTPLATE, WELDEDPLATE, BLOCK, HEAVY_COMPONENT).m();
+	public static final NTMMaterial MAT_TUNGSTEN		= makeSmeltable(7400,		W,				0x868686, 0x000000, 0x977474).setShapes(FRAGMENT, WIRE, BOLT, INGOT, DUST, DENSEWIRE, CASTPLATE, WELDEDPLATE, BLOCK, HEAVY_COMPONENT).m();
-	public static final NTMMaterial MAT_ALUMINIUM		= makeSmeltable(1300,		AL,			0xFFFFFF, 0x344550, 0xD0B8EB).setShapes(FRAGMENT, WIRE, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT).m();
+	public static final NTMMaterial MAT_ALUMINIUM		= makeSmeltable(1300,		AL,				0xFFFFFF, 0x344550, 0xD0B8EB).setShapes(FRAGMENT, WIRE, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT).m();
-	public static final NTMMaterial MAT_LEAD			= makeSmeltable(8200,		PB,			0xA6A6B2, 0x03030F, 0x646470).setShapes(FRAGMENT, NUGGET, WIRE, INGOT, DUST, PLATE, CASTPLATE, PIPE, BLOCK, HEAVY_COMPONENT).m();
+	public static final NTMMaterial MAT_LEAD			= makeSmeltable(8200,		PB,				0xA6A6B2, 0x03030F, 0x646470).setShapes(FRAGMENT, NUGGET, WIRE, INGOT, DUST, PLATE, CASTPLATE, PIPE, BLOCK, HEAVY_COMPONENT).m();
-	public static final NTMMaterial MAT_BISMUTH			= makeSmeltable(8300,		BI, 		0xB200FF					).setShapes(FRAGMENT, NUGGET, BILLET, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_BISMUTH			= makeSmeltable(8300,		BI, 			0xB200FF, 0xB200FF, 0xB200FF).setShapes(FRAGMENT, NUGGET, BILLET, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_ARSENIC			= makeSmeltable(3300,		AS,			0x6CBABA, 0x242525, 0x558080).setShapes(NUGGET, INGOT).m();
+	public static final NTMMaterial MAT_ARSENIC			= makeSmeltable(3300,		AS,				0x6CBABA, 0x242525, 0x558080).setShapes(NUGGET, INGOT).m();
-	public static final NTMMaterial MAT_TANTALIUM		= makeSmeltable(7300,		TA,			0xFFFFFF, 0x1D1D36, 0xA89B74).setShapes(NUGGET, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_TANTALIUM		= makeSmeltable(7300,		TA,				0xFFFFFF, 0x1D1D36, 0xA89B74).setShapes(NUGGET, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_NEODYMIUM		= makeSmeltable(6000,		ND,			0xE6E6B6, 0x1C1C00, 0x8F8F5F).setShapes(FRAGMENT, NUGGET, DUSTTINY, INGOT, DUST, DENSEWIRE, BLOCK).m();
+	public static final NTMMaterial MAT_NEODYMIUM		= makeSmeltable(6000,		ND,				0xE6E6B6, 0x1C1C00, 0x8F8F5F).setShapes(FRAGMENT, NUGGET, DUSTTINY, INGOT, DUST, DENSEWIRE, BLOCK).m();
-	public static final NTMMaterial MAT_NIOBIUM			= makeSmeltable(4100,		NB,			0xB76EC9, 0x2F2D42, 0xD576B1).setShapes(FRAGMENT, NUGGET, DUSTTINY, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_NIOBIUM			= makeSmeltable(4100,		NB,				0xB76EC9, 0x2F2D42, 0xD576B1).setShapes(FRAGMENT, NUGGET, DUSTTINY, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_BERYLLIUM		= makeSmeltable(400,		BE,			0xB2B2A6, 0x0F0F03, 0xAE9572).setShapes(FRAGMENT, NUGGET, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_BERYLLIUM		= makeSmeltable(400,		BE,				0xB2B2A6, 0x0F0F03, 0xAE9572).setShapes(FRAGMENT, NUGGET, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_EMERALD			= make(			401,		EMERALD)	.setConversion(MAT_BERYLLIUM, 4, 3).n();
+	public static final NTMMaterial MAT_EMERALD			= makeNonSmeltable(401,		EMERALD,		0xBAFFD4, 0x003900, 0x17DD62).setConversion(MAT_BERYLLIUM, 4, 3).setShapes(FRAGMENT, DUST, GEM, BLOCK).n();
-	public static final NTMMaterial MAT_COBALT			= makeSmeltable(2700,		CO,			0xC2D1EE, 0x353554, 0x8F72AE).setShapes(FRAGMENT, NUGGET, DUSTTINY, BILLET, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_COBALT			= makeSmeltable(2700,		CO,				0xC2D1EE, 0x353554, 0x8F72AE).setShapes(FRAGMENT, NUGGET, DUSTTINY, BILLET, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_BORON			= makeSmeltable(500,		B,			0xBDC8D2, 0x29343E, 0xAD72AE).setShapes(FRAGMENT, DUSTTINY, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_BORON			= makeSmeltable(500,		B,				0xBDC8D2, 0x29343E, 0xAD72AE).setShapes(FRAGMENT, DUSTTINY, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_BORAX			= makeSmeltable(501,		BORAX,		0xFFFFFF, 0x946E23, 0xFFECC6).setShapes(FRAGMENT, DUST).n();
+	public static final NTMMaterial MAT_BORAX			= makeSmeltable(501,		BORAX,			0xFFFFFF, 0x946E23, 0xFFECC6).setShapes(FRAGMENT, DUST).n();
-	public static final NTMMaterial MAT_LANTHANIUM		= makeSmeltable(5700,		LA,			0xC8E0E0, 0x3B5353, 0xA1B9B9).setShapes(FRAGMENT, INGOT, BLOCK).m();
+	public static final NTMMaterial MAT_LANTHANIUM		= makeSmeltable(5700,		LA,				0xC8E0E0, 0x3B5353, 0xA1B9B9).setShapes(FRAGMENT, INGOT, BLOCK).m();
-	public static final NTMMaterial MAT_ZIRCONIUM		= makeSmeltable(4000,		ZR,			0xE3DCBE, 0x3E3719, 0xADA688).setShapes(FRAGMENT, NUGGET, WIRE, DUSTTINY, BILLET, INGOT, DUST, CASTPLATE, WELDEDPLATE, BLOCK).m();
+	public static final NTMMaterial MAT_ZIRCONIUM		= makeSmeltable(4000,		ZR,				0xE3DCBE, 0x3E3719, 0xADA688).setShapes(FRAGMENT, NUGGET, WIRE, DUSTTINY, BILLET, INGOT, DUST, CASTPLATE, WELDEDPLATE, BLOCK).m();
-	public static final NTMMaterial MAT_SODIUM			= makeSmeltable(1100,		NA,			0xD3BF9E, 0x3A5A6B, 0x7E9493).setShapes(FRAGMENT, DUST).m();
+	public static final NTMMaterial MAT_SODIUM			= makeSmeltable(1100,		NA,				0xD3BF9E, 0x3A5A6B, 0x7E9493).setShapes(FRAGMENT, DUST).m();
-	public static final NTMMaterial MAT_SODALITE		= makeNonSmeltable(1101,	SODALITE,	0xDCE5F6, 0x4927B4, 0x96A7E6).setShapes(FRAGMENT, GEM).n();
+	public static final NTMMaterial MAT_SODALITE		= makeNonSmeltable(1101,	SODALITE,		0xDCE5F6, 0x4927B4, 0x96A7E6).setShapes(FRAGMENT, GEM).n();
-	public static final NTMMaterial MAT_STRONTIUM		= makeSmeltable(3800,		SR,			0xF1E8BA, 0x271E00, 0xCAC193).setShapes(FRAGMENT, DUST).m();
+	public static final NTMMaterial MAT_STRONTIUM		= makeSmeltable(3800,		SR,				0xF1E8BA, 0x271E00, 0xCAC193).setShapes(FRAGMENT, DUST).m();
-	public static final NTMMaterial MAT_CALCIUM			= makeSmeltable(2000,		CA,			0xCFCFA6, 0x747F6E, 0xB7B784).setShapes(INGOT, DUST).m();
+	public static final NTMMaterial MAT_CALCIUM			= makeSmeltable(2000,		CA,				0xCFCFA6, 0x747F6E, 0xB7B784).setShapes(INGOT, DUST).m();
-	public static final NTMMaterial MAT_LITHIUM			= makeSmeltable(300,		LI,			0xFFFFFF, 0x818181, 0xD6D6D6).setShapes(FRAGMENT, INGOT, DUST, BLOCK).m();
+	public static final NTMMaterial MAT_LITHIUM			= makeSmeltable(300,		LI,				0xFFFFFF, 0x818181, 0xD6D6D6).setShapes(FRAGMENT, INGOT, DUST, BLOCK).m();
-	public static final NTMMaterial MAT_SULFUR			= makeNonSmeltable(1600,	S,			0xFCEE80, 0xBDA022, 0xF1DF68).setShapes(FRAGMENT, DUST, BLOCK).n();
+	public static final NTMMaterial MAT_SULFUR			= makeNonSmeltable(1600,	S,				0xFCEE80, 0xBDA022, 0xF1DF68).setShapes(FRAGMENT, DUST, BLOCK).n();
-	public static final NTMMaterial MAT_KNO				= makeNonSmeltable(700,		KNO,		0xD4D4D4, 0x969696, 0xC9C9C9).setShapes(FRAGMENT, DUST, BLOCK).n();
+	public static final NTMMaterial MAT_KNO				= makeNonSmeltable(700,		KNO,			0xD4D4D4, 0x969696, 0xC9C9C9).setShapes(FRAGMENT, DUST, BLOCK).n();
-	public static final NTMMaterial MAT_FLUORITE		= makeNonSmeltable(900,		F,			0xFFFFFF, 0xB0A192, 0xE1DBD4).setShapes(FRAGMENT, DUST, BLOCK).n();
+	public static final NTMMaterial MAT_FLUORITE		= makeNonSmeltable(900,		F,				0xFFFFFF, 0xB0A192, 0xE1DBD4).setShapes(FRAGMENT, DUST, BLOCK).n();
-	public static final NTMMaterial MAT_PHOSPHORUS		= makeNonSmeltable(1500,	P_RED,		0xCB0213, 0x600006, 0xBA0615).setShapes(FRAGMENT, DUST, BLOCK).n();
+	public static final NTMMaterial MAT_PHOSPHORUS		= makeNonSmeltable(1500,	P_RED,			0xCB0213, 0x600006, 0xBA0615).setShapes(FRAGMENT, DUST, BLOCK).n();
-	public static final NTMMaterial MAT_CHLOROCALCITE	= makeNonSmeltable(1701, 	CHLOROCALCITE, 0xF7E761, 0x475B46, 0xB8B963).setShapes(FRAGMENT, DUST).n();
+	public static final NTMMaterial MAT_CHLOROCALCITE	= makeNonSmeltable(1701, 	CHLOROCALCITE,	0xF7E761, 0x475B46, 0xB8B963).setShapes(FRAGMENT, DUST).n();
-	public static final NTMMaterial MAT_MOLYSITE		= makeNonSmeltable(1702, 	MOLYSITE, 	0xF9E97B, 0x216E00, 0xD0D264).setShapes(FRAGMENT, DUST).n();
+	public static final NTMMaterial MAT_MOLYSITE		= makeNonSmeltable(1702, 	MOLYSITE, 		0xF9E97B, 0x216E00, 0xD0D264).setShapes(FRAGMENT, DUST).n();
-	public static final NTMMaterial MAT_CINNABAR		= makeNonSmeltable(8001,	CINNABAR,	0xD87070, 0x993030, 0xBF4E4E).setShapes(FRAGMENT, GEM).n();
+	public static final NTMMaterial MAT_CINNABAR		= makeNonSmeltable(8001,	CINNABAR,		0xD87070, 0x993030, 0xBF4E4E).setShapes(FRAGMENT, GEM).n();
-	public static final NTMMaterial MAT_CADMIUM			= makeSmeltable(4800,		CD,			0xFFFADE, 0x350000, 0xA85600).setShapes(INGOT, DUST).m();
+	public static final NTMMaterial MAT_CADMIUM			= makeSmeltable(4800,		CD,				0xFFFADE, 0x350000, 0xA85600).setShapes(INGOT, DUST).m();
-	public static final NTMMaterial MAT_SILICON			= makeSmeltable(1400,		SI,			0xD1D7DF, 0x1A1A3D, 0x878B9E).setShapes(FRAGMENT, NUGGET, BILLET, INGOT).m();
+	public static final NTMMaterial MAT_SILICON			= makeSmeltable(1400,		SI,				0xD1D7DF, 0x1A1A3D, 0x878B9E).setShapes(FRAGMENT, NUGGET, BILLET, INGOT).m();
-	public static final NTMMaterial MAT_ASBESTOS		= makeSmeltable(1401,		ASBESTOS,	0xD8D9CF, 0x616258, 0xB0B3A8).setShapes(FRAGMENT, INGOT, BLOCK).n();
+	public static final NTMMaterial MAT_ASBESTOS		= makeSmeltable(1401,		ASBESTOS,		0xD8D9CF, 0x616258, 0xB0B3A8).setShapes(FRAGMENT, INGOT, BLOCK).n();
-	public static final NTMMaterial MAT_OSMIRIDIUM		= makeSmeltable(7699,		OSMIRIDIUM, 0xDBE3EF, 0x7891BE, 0xACBDD9).setShapes(NUGGET, INGOT, CASTPLATE, WELDEDPLATE).m();
+	public static final NTMMaterial MAT_OSMIRIDIUM		= makeSmeltable(7699,		OSMIRIDIUM, 	0xDBE3EF, 0x7891BE, 0xACBDD9).setShapes(NUGGET, INGOT, CASTPLATE, WELDEDPLATE).m();
 	
 	//Alloys
 	public static final NTMMaterial MAT_STEEL		= makeSmeltable(_AS + 0,	STEEL,		0xAFAFAF, 0x0F0F0F, 0x4A4A4A).setShapes(DUSTTINY, BOLT, WIRE, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT).m();
@@ -152,10 +152,9 @@ public class Mats {
 	public static final NTMMaterial MAT_MUD			= makeSmeltable(_AS + 14,	MUD,		0xBCB5A9, 0x481213, 0x96783B).setShapes(INGOT).n();
 	
 	//Extension
-	public static final NTMMaterial MAT_RAREEARTH		= makeNonSmeltable(_ES + 00, 		RAREEARTH,		0xC1BDBD, 0x384646, 0x7B7F7F).setShapes(FRAGMENT, INGOT).n();
+	public static final NTMMaterial MAT_RAREEARTH	= makeNonSmeltable(_ES + 00, 		RAREEARTH,		0xC1BDBD, 0x384646, 0x7B7F7F).setShapes(FRAGMENT, INGOT).n();
 	
-	@Deprecated public static NTMMaterial makeSmeltable(int id, DictFrame dict, int color) { return makeSmeltable(id, dict, color, color, color); }
+	public static NTMMaterial makeSmeltable(int id, DictFrame dict, int color) { return makeSmeltable(id, dict, color, color, color); }
-	@Deprecated public static NTMMaterial makeAdditive(int id, DictFrame dict, int color) { return makeAdditive(id, dict, color, color, color); }
 
 	public static NTMMaterial make(int id, DictFrame dict) {
 		return new NTMMaterial(id, dict);
@@ -246,9 +245,7 @@ public class Mats {
 	
 	public static String formatAmount(int amount, boolean showInMb) {
 		
-		if(showInMb) {
+		if(showInMb) return (amount * 2) + "mB";
-			return (amount * 2) + "mB";
-		}
 		
 		String format = "";
 		

src/main/java/com/hbm/inventory/recipes/ArcFurnaceRecipes.java

@@ -51,6 +51,7 @@ public class ArcFurnaceRecipes extends SerializableRecipe {
 		recipes.put(new OreDictStack(FIBER.ingot()),	new ArcFurnaceRecipe().solid(new ItemStack(ModItems.nugget_silicon, 4))		.fluid(new MaterialStack(Mats.MAT_SILICON, MaterialShapes.INGOT.q(1, 2))));
 		recipes.put(new OreDictStack(FIBER.block()),	new ArcFurnaceRecipe().solid(new ItemStack(ModItems.nugget_silicon, 40))	.fluid(new MaterialStack(Mats.MAT_SILICON, MaterialShapes.INGOT.q(9, 2))));
 		recipes.put(new OreDictStack(ASBESTOS.ingot()),	new ArcFurnaceRecipe().solid(new ItemStack(ModItems.nugget_silicon, 4))		.fluid(new MaterialStack(Mats.MAT_SILICON, MaterialShapes.INGOT.q(1, 2))));
+		recipes.put(new OreDictStack(ASBESTOS.dust()),	new ArcFurnaceRecipe().solid(new ItemStack(ModItems.nugget_silicon, 4))		.fluid(new MaterialStack(Mats.MAT_SILICON, MaterialShapes.INGOT.q(1, 2))));
 		recipes.put(new OreDictStack(ASBESTOS.block()),	new ArcFurnaceRecipe().solid(new ItemStack(ModItems.nugget_silicon, 40))	.fluid(new MaterialStack(Mats.MAT_SILICON, MaterialShapes.INGOT.q(9, 2))));
 
 		recipes.put(new ComparableStack(ModBlocks.sand_quartz), new ArcFurnaceRecipe().solid(new ItemStack(ModBlocks.glass_quartz)));

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

@@ -557,14 +557,6 @@ public class AssemblerRecipes extends SerializableRecipe {
 				new ComparableStack(ModItems.powder_chlorophyte, 1),
 				new OreDictStack(PB.nugget(), 12),
 			}, 50);
-		makeRecipe(new ComparableStack(ModItems.pellet_mercury, 2), new AStack[] {
-				new ComparableStack(ModItems.ingot_mercury, 1),
-				new OreDictStack(PB.nugget(), 12),
-			}, 50);
-		makeRecipe(new ComparableStack(ModItems.pellet_meteorite, 2), new AStack[] {
-				new ComparableStack(ModItems.powder_meteorite, 1),
-				new OreDictStack(PB.nugget(), 12),
-			}, 50);
 		makeRecipe(new ComparableStack(ModItems.pellet_canister, 2), new AStack[] {
 				new OreDictStack(IRON.ingot(), 3),
 			}, 50);
@@ -1261,7 +1253,7 @@ public class AssemblerRecipes extends SerializableRecipe {
 		makeRecipe(new ComparableStack(ModBlocks.qe_containment, 1), new AStack[]{new OreDictStack(STEEL.plateCast(), 4), new OreDictStack(ALLOY.plate(), 4), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.motor, 2), new OreDictStack(DURA.bolt(), 32), new OreDictStack("dyeBlack", 4)}, 400);
 		makeRecipe(new ComparableStack(ModBlocks.qe_sliding_door, 1), new AStack[]{new OreDictStack(STEEL.plate(), 4), new ComparableStack(ModItems.plate_polymer, 4), new ComparableStack(ModItems.motor, 2), new OreDictStack(DURA.bolt(), 4), new OreDictStack("dyeWhite", 4), new ComparableStack(Blocks.glass, 4)}, 200);
 		makeRecipe(new ComparableStack(ModBlocks.round_airlock_door, 1), new AStack[]{new OreDictStack(STEEL.plateCast(), 12), new OreDictStack(ALLOY.plate(), 8), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.motor, 4), new OreDictStack(DURA.bolt(), 16), new OreDictStack("dyeGreen", 4)}, 400);
-		makeRecipe(new ComparableStack(ModBlocks.secure_access_door, 1), new AStack[]{new OreDictStack(STEEL.plateCast(), 12), new OreDictStack(ALLOY.plate(), 16), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.motor, 4), new OreDictStack(DURA.bolt(), 32), new OreDictStack("dyeRed", 8)}, 4000);
+		makeRecipe(new ComparableStack(ModBlocks.secure_access_door, 1), new AStack[]{new OreDictStack(STEEL.plateCast(), 12), new OreDictStack(ALLOY.plate(), 16), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.motor, 4), new OreDictStack(DURA.bolt(), 32), new OreDictStack("dyeRed", 8)}, 400);
 		makeRecipe(new ComparableStack(ModBlocks.sliding_seal_door, 1), new AStack[]{new OreDictStack(STEEL.plate(), 12), new ComparableStack(ModItems.plate_polymer, 4), new ComparableStack(ModItems.motor, 2), new OreDictStack(DURA.bolt(), 4), new OreDictStack("dyeWhite", 2)}, 200);
 		makeRecipe(new ComparableStack(ModBlocks.silo_hatch, 1), new AStack[]{new OreDictStack(STEEL.plateWelded(), 4), new ComparableStack(ModItems.plate_polymer, 4), new ComparableStack(ModItems.motor, 2), new OreDictStack(STEEL.bolt(), 16), new OreDictStack(KEY_GREEN, 4)}, 200);
 		makeRecipe(new ComparableStack(ModBlocks.silo_hatch_large, 1), new AStack[]{new OreDictStack(STEEL.plateWelded(), 6), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.motor, 2), new OreDictStack(STEEL.bolt(), 16), new OreDictStack(KEY_GREEN, 8)}, 200);

src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java

@@ -74,7 +74,7 @@ public class ChemplantRecipes extends SerializableRecipe {
 		recipes.add(new ChemRecipe(92, "NITRIC_ACID", 50)
 				.inputItems(new OreDictStack(KNO.dust()))
 				.inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 500))
-				.outputFluids(new FluidStack(Fluids.NITRIC_ACID, 500)));
+				.outputFluids(new FluidStack(Fluids.NITRIC_ACID, 1_000)));
 		recipes.add(new ChemRecipe(93, "SOLVENT", 50)
 				.inputFluids(new FluidStack(Fluids.NAPHTHA, 500), new FluidStack(Fluids.AROMATICS, 500))
 				.outputFluids(new FluidStack(Fluids.SOLVENT, 1000)));
@@ -208,11 +208,10 @@ public class ChemplantRecipes extends SerializableRecipe {
 				.inputFluids(new FluidStack(Fluids.WATER, 2000))
 				.outputItems(new ItemStack(ModBlocks.ducrete_smooth, 8)));
 		recipes.add(new ChemRecipe(57, "SOLID_FUEL", 200)
-				.inputItems(
+				.inputItems(new ComparableStack(ModItems.solid_fuel, 2))
-						new ComparableStack(ModItems.solid_fuel, 2),
+				.inputFluids(
-						new OreDictStack(KNO.dust()),
+						new FluidStack(Fluids.PETROLEUM, 200, GeneralConfig.enable528 ? 1 : 0),
-						new OreDictStack(REDSTONE.dust()))
+						new FluidStack(Fluids.NITRIC_ACID, 100))
-				.inputFluids(new FluidStack(Fluids.PETROLEUM, 200, GeneralConfig.enable528 ? 1 : 0))
 				.outputItems(new ItemStack(ModItems.rocket_fuel, 4)));
 		recipes.add(new ChemRecipe(58, "ELECTROLYSIS", 150)
 				.inputFluids(new FluidStack(Fluids.WATER, 4000))

src/main/java/com/hbm/inventory/recipes/CokerRecipes.java

@@ -63,7 +63,7 @@ public class CokerRecipes extends SerializableRecipe {
 		registerRecipe(LUBRICANT, 12_000, DictFrame.fromOne(ModItems.coke, EnumCokeType.PETROLEUM), new FluidStack(OIL_COKER, 1_200));
 		registerRecipe(CALCIUM_SOLUTION, 125, new ItemStack(ModItems.powder_calcium), new FluidStack(SPENTSTEAM, 100));
 		//only cokable gas to extract sulfur content
-		registerRecipe(SOURGAS, 250, new ItemStack(ModItems.sulfur), new FluidStack(GAS_COKER, 150));
+		registerRecipe(SOURGAS, 1_000, new ItemStack(ModItems.sulfur), new FluidStack(GAS_COKER, 150));
 		registerRecipe(SLOP, 1000, new ItemStack(ModItems.powder_limestone), new FluidStack(COLLOID, 250));
 		registerRecipe(VITRIOL, 4000, new ItemStack(ModItems.powder_iron), new FluidStack(SULFURIC_ACID, 500));
 	}

src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java

@@ -41,7 +41,7 @@ public class LiquefactionRecipes extends SerializableRecipe {
 		recipes.put(KEY_CRACK_TAR,									new FluidStack(100, Fluids.BITUMEN));
 		recipes.put(KEY_COAL_TAR,									new FluidStack(50, Fluids.BITUMEN));
 		recipes.put(KEY_LOG,										new FluidStack(100, Fluids.MUG));
-		recipes.put(KNO.dust(),										new FluidStack(250, Fluids.NITRIC_ACID));
+		recipes.put(KNO.dust(),										new FluidStack(750, Fluids.NITRIC_ACID));
 		recipes.put(NA.dust(),										new FluidStack(100, Fluids.SODIUM));
 		//general utility recipes because why not
 		recipes.put(new ComparableStack(Blocks.netherrack),			new FluidStack(250, Fluids.LAVA));

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

@@ -59,8 +59,6 @@ public class MachineRecipes {
 		ArrayList<ItemStack> fuels = new ArrayList<ItemStack>();
 		fuels.add(new ItemStack(ModItems.battery_potato));
 		fuels.add(new ItemStack(ModItems.battery_potatos));
-		fuels.add(new ItemStack(ModItems.battery_su));
-		fuels.add(new ItemStack(ModItems.battery_su_l));
 		fuels.add(new ItemStack(ModItems.battery_generic));
 		fuels.add(new ItemStack(ModItems.battery_red_cell));
 		fuels.add(new ItemStack(ModItems.battery_red_cell_6));

src/main/java/com/hbm/inventory/recipes/MixerRecipes.java

@@ -56,7 +56,7 @@ public class MixerRecipes extends SerializableRecipe {
 				new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_DS, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)),
 				new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA_COKER, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500)));
 		register(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.PEROXIDE, 800)).setSolid(new OreDictStack(S.dust())));
-		register(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust())));
+		register(Fluids.NITRIC_ACID, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust())));
 		register(Fluids.RADIOSOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250)));
 		register(Fluids.SCHRABIDIC, new MixerRecipe(16_000, 100).setStack1(new FluidStack(Fluids.SAS3, 8_000)).setStack2(new FluidStack(Fluids.PEROXIDE, 6_000)).setSolid(new ComparableStack(ModItems.pellet_charged)));
 		

src/main/java/com/hbm/inventory/recipes/PressRecipes.java

@@ -64,7 +64,6 @@ public class PressRecipes extends SerializableRecipe {
 		makeRecipe(StampType.FLAT, new OreDictStack(LAPIS.dust()),							new ItemStack(Items.dye, 1, 4));
 		makeRecipe(StampType.FLAT, new OreDictStack(DIAMOND.dust()),						Items.diamond);
 		makeRecipe(StampType.FLAT, new OreDictStack(EMERALD.dust()),						Items.emerald);
-		makeRecipe(StampType.FLAT, new ComparableStack(ModItems.pellet_coal),				Items.diamond);
 		makeRecipe(StampType.FLAT, new ComparableStack(ModItems.biomass),					ModItems.biomass_compressed);
 		makeRecipe(StampType.FLAT, new OreDictStack(ANY_COKE.gem()),						ModItems.ingot_graphite);
 		makeRecipe(StampType.FLAT, new ComparableStack(ModItems.meteorite_sword_reforged),	ModItems.meteorite_sword_hardened);

src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java

@@ -170,13 +170,13 @@ public class AnvilRecipes {
 	
 	public static void registerConstructionRecipes() {
 
-		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(AL.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_aluminium))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
+		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(AL.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_aluminium, 4))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
-		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(BE.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_beryllium))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
+		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(BE.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_beryllium, 4))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
-		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(PB.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_lead))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
+		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(PB.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_lead, 4))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
-		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(MINGRADE.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_red_copper))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
+		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(MINGRADE.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_red_copper, 4))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
-		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(STEEL.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_steel))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
+		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(STEEL.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_steel, 4))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
-		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(TI.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_titanium))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
+		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(TI.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_titanium, 4))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
-		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(W.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_tungsten))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
+		constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(W.ingot(), 1), new AnvilOutput(new ItemStack(ModBlocks.deco_tungsten, 4))).setTier(1).setOverlay(OverlayType.CONSTRUCTION));
 
 		constructionRecipes.add(new AnvilConstructionRecipe(
 				new AStack[] {new OreDictStack(DNT.ingot(), 4), new ComparableStack(ModBlocks.depth_brick)},
@@ -425,12 +425,9 @@ public class AnvilRecipes {
 		
 		constructionRecipes.add(new AnvilConstructionRecipe(
 				new AStack[] {
-						new ComparableStack(ModItems.sulfur, 8),
+						new ComparableStack(ModItems.sulfur, 12),
-						new OreDictStack(STEEL.plate528(), 4),
-						new OreDictStack(AL.plate528(), 2),
 						new OreDictStack(STEEL.shell(), 4),
-						new OreDictStack(CU.plateCast(), 4),
+						new OreDictStack(CU.plateCast(), 6),
-						new ComparableStack(ModItems.turbine_titanium, 1),
 						new ComparableStack(ModItems.circuit, 2, EnumCircuitType.BASIC.ordinal())
 				},
 				new AnvilOutput(new ItemStack(ModBlocks.machine_deuterium_extractor))).setTier(2));
@@ -718,14 +715,14 @@ public class AnvilRecipes {
 				}
 		).setTier(2));
 
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_titanium), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_titanium, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_titanium, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_titanium, 1))}).setTier(1));
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_red_copper), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_red_copper, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_red_copper, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_red_copper, 1))}).setTier(1));
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_tungsten), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_tungsten, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_tungsten, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_tungsten, 1))}).setTier(1));
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_aluminium), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_aluminium, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_aluminium, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_aluminium, 1))}).setTier(1));
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_steel), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_steel, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_steel, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_steel, 1))}).setTier(1));
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_lead), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_lead, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_lead, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_lead, 1))}).setTier(1));
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_beryllium), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_beryllium, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_beryllium, 1))}).setTier(1));
-		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_asbestos), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_asbestos, 1), 0.25F)}).setTier(1));
+		constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModBlocks.deco_asbestos, 4), new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_asbestos, 1))}).setTier(1));
 
 		constructionRecipes.add(new AnvilConstructionRecipe(
 				new ComparableStack(ModBlocks.heater_firebox),

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

@@ -75,11 +75,6 @@ public class ModItems {
 	public static Item redstone_sword;
 	public static Item big_sword;
 
-	public static Item test_helmet;
-	public static Item test_chestplate;
-	public static Item test_leggings;
-	public static Item test_boots;
-
 	public static Item ingot_th232;
 	public static Item ingot_uranium;
 	public static Item ingot_u233;
@@ -502,7 +497,6 @@ public class ModItems {
 	public static Item powder_lithium;
 	public static Item powder_zirconium;
 	public static Item powder_sodium;
-	public static Item redstone_depleted;
 
 	public static Item powder_australium;
 	public static Item powder_weidanium;
@@ -664,7 +658,6 @@ public class ModItems {
 	public static Item turbine_titanium;
 	public static Item blade_tungsten;
 	public static Item turbine_tungsten;
-	public static Item pellet_coal;
 	public static Item ring_starmetal;
 	public static Item flywheel_beryllium;
 
@@ -1230,8 +1223,6 @@ public class ModItems {
 	public static Item pellet_buckshot;
 	public static Item pellet_flechette;
 	public static Item pellet_chlorophyte;
-	public static Item pellet_mercury;
-	public static Item pellet_meteorite;
 	public static Item pellet_canister;
 	public static Item pellet_claws;
 	public static Item pellet_charged;
@@ -1799,8 +1790,6 @@ public class ModItems {
 	public static Item battery_sc_lead;
 	public static Item battery_sc_americium;
 	
-	public static Item battery_su;
-	public static Item battery_su_l;
 	public static Item battery_potato;
 	public static Item battery_potatos;
 	public static Item hev_battery;
@@ -1871,7 +1860,6 @@ public class ModItems {
 	public static Item euphemium_boots;
 	public static Item apple_euphemium;
 	public static Item watch;
-	public static Item euphemium_stopper;
 
 	public static Item goggles;
 	public static Item ashglasses;
@@ -2186,6 +2174,9 @@ public class ModItems {
 	public static Item card_aos;
 	public static Item card_qos;
 	public static Item australium_iii;
+	public static Item armor_battery;
+	public static Item armor_battery_mk2;
+	public static Item armor_battery_mk3;
 
 	public static Item hazmat_helmet;
 	public static Item hazmat_plate;
@@ -2222,18 +2213,10 @@ public class ModItems {
 
 	public static Item rod_of_discord;
 
-	public static Item cape_test;
 	public static Item cape_radiation;
 	public static Item cape_gasmask;
 	public static Item cape_schrabidium;
 	public static Item cape_hidden;
-	/*public static Item cape_hbm;
-	public static Item cape_dafnik;
-	public static Item cape_lpkukin;
-	public static Item cape_vertice;
-	public static Item cape_codered_;
-	public static Item cape_ayy;
-	public static Item cape_nostalgia;*/
 
 	public static Item nuke_starter_kit;
 	public static Item nuke_advanced_kit;
@@ -2363,14 +2346,6 @@ public class ModItems {
 	public static Item book_lemegeton;
 	public static Item burnt_bark;
 
-	public static Item smoke1;
-	public static Item smoke2;
-	public static Item smoke3;
-	public static Item smoke4;
-	public static Item smoke5;
-	public static Item smoke6;
-	public static Item smoke7;
-	public static Item smoke8;
 	public static Item b_smoke1;
 	public static Item b_smoke2;
 	public static Item b_smoke3;
@@ -2379,30 +2354,6 @@ public class ModItems {
 	public static Item b_smoke6;
 	public static Item b_smoke7;
 	public static Item b_smoke8;
-	public static Item d_smoke1;
-	public static Item d_smoke2;
-	public static Item d_smoke3;
-	public static Item d_smoke4;
-	public static Item d_smoke5;
-	public static Item d_smoke6;
-	public static Item d_smoke7;
-	public static Item d_smoke8;
-	public static Item spill1;
-	public static Item spill2;
-	public static Item spill3;
-	public static Item spill4;
-	public static Item spill5;
-	public static Item spill6;
-	public static Item spill7;
-	public static Item spill8;
-	public static Item gas1;
-	public static Item gas2;
-	public static Item gas3;
-	public static Item gas4;
-	public static Item gas5;
-	public static Item gas6;
-	public static Item gas7;
-	public static Item gas8;
 	public static Item chlorine1;
 	public static Item chlorine2;
 	public static Item chlorine3;
@@ -2443,9 +2394,6 @@ public class ModItems {
 	public static Item gasflame6;
 	public static Item gasflame7;
 	public static Item gasflame8;*/
-	public static Item energy_ball;
-	public static Item discharge;
-	public static Item empblast;
 	public static Item flame_1;
 	public static Item flame_2;
 	public static Item flame_3;
@@ -2467,7 +2415,6 @@ public class ModItems {
 	public static Item ln2_9;
 	public static Item ln2_10;
 	public static Item nothing;
-	public static Item void_anim;
 
 	public static Item achievement_icon;
 	public static Item bob_metalworks;
@@ -2483,11 +2430,6 @@ public class ModItems {
 	{			
 		redstone_sword = new RedstoneSword(ToolMaterial.STONE).setUnlocalizedName("redstone_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":redstone_sword");
 		big_sword = new BigSword(ToolMaterial.EMERALD).setUnlocalizedName("big_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":big_sword");
-
-		test_helmet = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 0).setUnlocalizedName("test_helmet").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_helmet");
-		test_chestplate = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 1).setUnlocalizedName("test_chestplate").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_chestplate");
-		test_leggings = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 2).setUnlocalizedName("test_leggings").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_leggings");
-		test_boots = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 3).setUnlocalizedName("test_boots").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_boots");
 		
 		test_nuke_igniter = new Item().setUnlocalizedName("test_nuke_igniter").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_igniter");
 		test_nuke_propellant = new Item().setUnlocalizedName("test_nuke_propellant").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_propellant");
@@ -2706,11 +2648,10 @@ public class ModItems {
 		ore_nitrocrystalline = new ItemBedrockOre().setUnlocalizedName("ore_nitrocrystalline").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_nitrocrystalline");
 		ore_deepcleaned = new ItemBedrockOre().setUnlocalizedName("ore_deepcleaned").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_deepcleaned");
 		ore_seared = new ItemBedrockOre().setUnlocalizedName("ore_seared").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_seared");
-		//ore_radcleaned = new ItemBedrockOre().setUnlocalizedName("ore_radcleaned").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_radcleaned");
 		ore_enriched = new ItemBedrockOre().setUnlocalizedName("ore_enriched").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_enriched");
 		bedrock_ore_base = new ItemBedrockOreBase().setUnlocalizedName("bedrock_ore_base").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bedrock_ore_new");
 		bedrock_ore = new ItemBedrockOreNew().setUnlocalizedName("bedrock_ore").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bedrock_ore_new");
-		bedrock_ore_fragment = new ItemAutogen(MaterialShapes.FRAGMENT).setUnlocalizedName("bedrock_ore_fragment").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bedrock_ore_fragment");
+		bedrock_ore_fragment = new ItemAutogen(MaterialShapes.FRAGMENT).aot(Mats.MAT_BISMUTH, "bedrock_ore_fragment_bismuth").setUnlocalizedName("bedrock_ore_fragment").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bedrock_ore_fragment");
 
 		ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lanthanium");
 		ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_actinium");
@@ -2744,7 +2685,7 @@ public class ModItems {
 		cinnebar = new Item().setUnlocalizedName("cinnebar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cinnebar");
 		powder_ash = new ItemEnumMulti(EnumAshType.class, true, true).setUnlocalizedName("powder_ash").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ash");
 		powder_limestone = new Item().setUnlocalizedName("powder_limestone").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_limestone");
-		powder_cement = new Item().setUnlocalizedName("powder_cement").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cement");
+		powder_cement = new ItemLemon(2, 0.5F, false).setUnlocalizedName("powder_cement").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cement");
 		
 		ingot_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("ingot_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_gh336");
 		nugget_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("nugget_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_gh336");
@@ -2903,7 +2844,6 @@ public class ModItems {
 		powder_lithium = new Item().setUnlocalizedName("powder_lithium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lithium");
 		powder_zirconium = new Item().setUnlocalizedName("powder_zirconium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_zirconium");
 		powder_sodium = new Item().setUnlocalizedName("powder_sodium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_sodium");
-		redstone_depleted = new Item().setUnlocalizedName("redstone_depleted").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":redstone_depleted");
 		powder_power = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_energy_alt");
 		powder_iodine = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("powder_iodine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_iodine");
 		powder_thorium = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("powder_thorium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_thorium");
@@ -2998,7 +2938,6 @@ public class ModItems {
 		coil_gold = new Item().setUnlocalizedName("coil_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold");
 		coil_gold_torus = new Item().setUnlocalizedName("coil_gold_torus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold_torus");
 		magnet_circular = new Item().setUnlocalizedName("magnet_circular").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_circular");
-		pellet_coal = new Item().setUnlocalizedName("pellet_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_coal");
 		component_limiter = new Item().setUnlocalizedName("component_limiter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_limiter");
 		component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_emitter");
 		chlorine_pinwheel = new ItemInfiniteFluid(Fluids.CHLORINE, 1, 2).setUnlocalizedName("chlorine_pinwheel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":chlorine_pinwheel");
@@ -3417,6 +3356,9 @@ public class ModItems {
 		card_aos = new ItemModCard().setUnlocalizedName("card_aos").setTextureName(RefStrings.MODID + ":card_aos");
 		card_qos = new ItemModCard().setUnlocalizedName("card_qos").setTextureName(RefStrings.MODID + ":card_qos");
 		australium_iii = new ItemModShield(25F).setUnlocalizedName("australium_iii").setTextureName(RefStrings.MODID + ":australium_iii");
+		armor_battery = new ItemModBattery(1.25D).setUnlocalizedName("armor_battery").setTextureName(RefStrings.MODID + ":armor_battery");
+		armor_battery_mk2 = new ItemModBattery(1.5D).setUnlocalizedName("armor_battery_mk2").setTextureName(RefStrings.MODID + ":armor_battery_mk2");
+		armor_battery_mk3 = new ItemModBattery(2D).setUnlocalizedName("armor_battery_mk3").setTextureName(RefStrings.MODID + ":armor_battery_mk3");
 
 		cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka");
 		cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum");
@@ -3869,8 +3811,6 @@ public class ModItems {
 		pellet_buckshot = new Item().setUnlocalizedName("pellet_buckshot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_lead");
 		pellet_flechette = new Item().setUnlocalizedName("pellet_flechette").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_flechette");
 		pellet_chlorophyte = new Item().setUnlocalizedName("pellet_chlorophyte").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_chlorophyte");
-		pellet_mercury = new Item().setUnlocalizedName("pellet_mercury").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_mercury");
-		pellet_meteorite = new Item().setUnlocalizedName("pellet_meteorite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_meteorite");
 		pellet_canister = new Item().setUnlocalizedName("pellet_canister").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_canister");
 		pellet_claws = new Item().setUnlocalizedName("pellet_claws").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_claws");
 		pellet_charged = new Item().setUnlocalizedName("pellet_charged").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_charged");
@@ -4398,8 +4338,6 @@ public class ModItems {
 		
 		battery_potato = new ItemBattery(1000, 0, 100).setUnlocalizedName("battery_potato").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potato");
 		battery_potatos = new ItemPotatos(500000, 0, 100).setUnlocalizedName("battery_potatos").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potatos");
-		battery_su = new ItemBattery(50000, 0, 1000).setUnlocalizedName("battery_su").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_su");
-		battery_su_l = new ItemBattery(150000, 0, 1000).setUnlocalizedName("battery_su_l").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_su_l");
 		hev_battery = new ItemFusionCore(150000).setUnlocalizedName("hev_battery").setMaxStackSize(4).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":hev_battery");
 		fusion_core = new ItemFusionCore(2500000).setUnlocalizedName("fusion_core").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_core");
 		fusion_core_infinite = new Item().setUnlocalizedName("fusion_core_infinite").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_core_infinite");
@@ -5364,7 +5302,6 @@ public class ModItems {
 		wings_murk = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk");
 		wings_limp = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp");
 
-		cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test");
 		cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation");
 		cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask");
 		cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium");
@@ -5375,7 +5312,6 @@ public class ModItems {
 		shimmer_axe = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_axe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_axe");
 		bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener");
 		pch = new WeaponSpecial(MainRegistry.tMatHammmer).setUnlocalizedName("pch").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":schrabidium_hammer");
-		euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper");
 		matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick");
 		balefire_and_steel = new ItemBalefireMatch().setUnlocalizedName("balefire_and_steel").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":balefire_and_steel");
 		crowbar = new ModSword(MainRegistry.tMatSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar");
@@ -5450,14 +5386,6 @@ public class ModItems {
 		book_lemegeton = new ItemBookLemegeton().setUnlocalizedName("book_lemegeton").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":book_lemegeton");
 		burnt_bark = new ItemCustomLore().setUnlocalizedName("burnt_bark").setCreativeTab(null).setTextureName(RefStrings.MODID + ":burnt_bark");
 
-		smoke1 = new Item().setUnlocalizedName("smoke1").setTextureName(RefStrings.MODID + ":smoke1");
-		smoke2 = new Item().setUnlocalizedName("smoke2").setTextureName(RefStrings.MODID + ":smoke2");
-		smoke3 = new Item().setUnlocalizedName("smoke3").setTextureName(RefStrings.MODID + ":smoke3");
-		smoke4 = new Item().setUnlocalizedName("smoke4").setTextureName(RefStrings.MODID + ":smoke4");
-		smoke5 = new Item().setUnlocalizedName("smoke5").setTextureName(RefStrings.MODID + ":smoke5");
-		smoke6 = new Item().setUnlocalizedName("smoke6").setTextureName(RefStrings.MODID + ":smoke6");
-		smoke7 = new Item().setUnlocalizedName("smoke7").setTextureName(RefStrings.MODID + ":smoke7");
-		smoke8 = new Item().setUnlocalizedName("smoke8").setTextureName(RefStrings.MODID + ":smoke8");
 		b_smoke1 = new Item().setUnlocalizedName("b_smoke1").setTextureName(RefStrings.MODID + ":b_smoke1");
 		b_smoke2 = new Item().setUnlocalizedName("b_smoke2").setTextureName(RefStrings.MODID + ":b_smoke2");
 		b_smoke3 = new Item().setUnlocalizedName("b_smoke3").setTextureName(RefStrings.MODID + ":b_smoke3");
@@ -5466,30 +5394,6 @@ public class ModItems {
 		b_smoke6 = new Item().setUnlocalizedName("b_smoke6").setTextureName(RefStrings.MODID + ":b_smoke6");
 		b_smoke7 = new Item().setUnlocalizedName("b_smoke7").setTextureName(RefStrings.MODID + ":b_smoke7");
 		b_smoke8 = new Item().setUnlocalizedName("b_smoke8").setTextureName(RefStrings.MODID + ":b_smoke8");
-		d_smoke1 = new Item().setUnlocalizedName("d_smoke1").setTextureName(RefStrings.MODID + ":d_smoke1");
-		d_smoke2 = new Item().setUnlocalizedName("d_smoke2").setTextureName(RefStrings.MODID + ":d_smoke2");
-		d_smoke3 = new Item().setUnlocalizedName("d_smoke3").setTextureName(RefStrings.MODID + ":d_smoke3");
-		d_smoke4 = new Item().setUnlocalizedName("d_smoke4").setTextureName(RefStrings.MODID + ":d_smoke4");
-		d_smoke5 = new Item().setUnlocalizedName("d_smoke5").setTextureName(RefStrings.MODID + ":d_smoke5");
-		d_smoke6 = new Item().setUnlocalizedName("d_smoke6").setTextureName(RefStrings.MODID + ":d_smoke6");
-		d_smoke7 = new Item().setUnlocalizedName("d_smoke7").setTextureName(RefStrings.MODID + ":d_smoke7");
-		d_smoke8 = new Item().setUnlocalizedName("d_smoke8").setTextureName(RefStrings.MODID + ":d_smoke8");
-		spill1 = new Item().setUnlocalizedName("spill1").setTextureName(RefStrings.MODID + ":spill1");
-		spill2 = new Item().setUnlocalizedName("spill2").setTextureName(RefStrings.MODID + ":spill2");
-		spill3 = new Item().setUnlocalizedName("spill3").setTextureName(RefStrings.MODID + ":spill3");
-		spill4 = new Item().setUnlocalizedName("spill4").setTextureName(RefStrings.MODID + ":spill4");
-		spill5 = new Item().setUnlocalizedName("spill5").setTextureName(RefStrings.MODID + ":spill5");
-		spill6 = new Item().setUnlocalizedName("spill6").setTextureName(RefStrings.MODID + ":spill6");
-		spill7 = new Item().setUnlocalizedName("spill7").setTextureName(RefStrings.MODID + ":spill7");
-		spill8 = new Item().setUnlocalizedName("spill8").setTextureName(RefStrings.MODID + ":spill8");
-		gas1 = new Item().setUnlocalizedName("gas1").setTextureName(RefStrings.MODID + ":gas1");
-		gas2 = new Item().setUnlocalizedName("gas2").setTextureName(RefStrings.MODID + ":gas2");
-		gas3 = new Item().setUnlocalizedName("gas3").setTextureName(RefStrings.MODID + ":gas3");
-		gas4 = new Item().setUnlocalizedName("gas4").setTextureName(RefStrings.MODID + ":gas4");
-		gas5 = new Item().setUnlocalizedName("gas5").setTextureName(RefStrings.MODID + ":gas5");
-		gas6 = new Item().setUnlocalizedName("gas6").setTextureName(RefStrings.MODID + ":gas6");
-		gas7 = new Item().setUnlocalizedName("gas7").setTextureName(RefStrings.MODID + ":gas7");
-		gas8 = new Item().setUnlocalizedName("gas8").setTextureName(RefStrings.MODID + ":gas8");
 		chlorine1 = new Item().setUnlocalizedName("chlorine1").setTextureName(RefStrings.MODID + ":chlorine1");
 		chlorine2 = new Item().setUnlocalizedName("chlorine2").setTextureName(RefStrings.MODID + ":chlorine2");
 		chlorine3 = new Item().setUnlocalizedName("chlorine3").setTextureName(RefStrings.MODID + ":chlorine3");
@@ -5522,9 +5426,6 @@ public class ModItems {
 		orange6 = new Item().setUnlocalizedName("orange6").setTextureName(RefStrings.MODID + ":orange6");
 		orange7 = new Item().setUnlocalizedName("orange7").setTextureName(RefStrings.MODID + ":orange7");
 		orange8 = new Item().setUnlocalizedName("orange8").setTextureName(RefStrings.MODID + ":orange8");
-		energy_ball = new Item().setUnlocalizedName("energy_ball").setTextureName(RefStrings.MODID + ":energy_ball");
-		discharge = new Item().setUnlocalizedName("discharge").setTextureName(RefStrings.MODID + ":discharge");
-		empblast = new Item().setUnlocalizedName("empblast").setTextureName(RefStrings.MODID + ":empblast");
 		flame_1 = new Item().setUnlocalizedName("flame_1").setTextureName(RefStrings.MODID + ":flame_1");
 		flame_2 = new Item().setUnlocalizedName("flame_2").setTextureName(RefStrings.MODID + ":flame_2");
 		flame_3 = new Item().setUnlocalizedName("flame_3").setTextureName(RefStrings.MODID + ":flame_3");
@@ -5546,7 +5447,6 @@ public class ModItems {
 		ln2_9 = new Item().setUnlocalizedName("ln2_9").setTextureName(RefStrings.MODID + ":ln2_9");
 		ln2_10 = new Item().setUnlocalizedName("ln2_10").setTextureName(RefStrings.MODID + ":ln2_10");
 		nothing = new Item().setUnlocalizedName("nothing").setTextureName(RefStrings.MODID + ":nothing");
-		void_anim = new Item().setUnlocalizedName("void_anim").setTextureName(RefStrings.MODID + ":void_anim");
 
 
 		achievement_icon = new ItemEnumMulti(ItemEnums.EnumAchievementType.class, true, true).setUnlocalizedName("achievement_icon");
@@ -5577,13 +5477,6 @@ public class ModItems {
 		GameRegistry.registerItem(redstone_sword, redstone_sword.getUnlocalizedName());
 		GameRegistry.registerItem(big_sword, big_sword.getUnlocalizedName());
 		
-		//Test Armor
-		GameRegistry.registerItem(test_helmet, test_helmet.getUnlocalizedName());
-		GameRegistry.registerItem(test_chestplate, test_chestplate.getUnlocalizedName());
-		GameRegistry.registerItem(test_leggings, test_leggings.getUnlocalizedName());
-		GameRegistry.registerItem(test_boots, test_boots.getUnlocalizedName());
-		GameRegistry.registerItem(cape_test, cape_test.getUnlocalizedName());
-		
 		//Test Nuke
 		GameRegistry.registerItem(test_nuke_igniter, test_nuke_igniter.getUnlocalizedName());
 		GameRegistry.registerItem(test_nuke_propellant, test_nuke_propellant.getUnlocalizedName());
@@ -5884,7 +5777,6 @@ public class ModItems {
 		GameRegistry.registerItem(powder_meteorite_tiny, powder_meteorite_tiny.getUnlocalizedName());
 		GameRegistry.registerItem(powder_euphemium, powder_euphemium.getUnlocalizedName());
 		GameRegistry.registerItem(powder_dineutronium, powder_dineutronium.getUnlocalizedName());
-		GameRegistry.registerItem(redstone_depleted, redstone_depleted.getUnlocalizedName());
 		GameRegistry.registerItem(dust, dust.getUnlocalizedName());
 		GameRegistry.registerItem(dust_tiny, dust_tiny.getUnlocalizedName());
 		GameRegistry.registerItem(fallout, fallout.getUnlocalizedName());
@@ -6288,14 +6180,11 @@ public class ModItems {
 		GameRegistry.registerItem(pellet_buckshot, pellet_buckshot.getUnlocalizedName());
 		GameRegistry.registerItem(pellet_flechette, pellet_flechette.getUnlocalizedName());
 		GameRegistry.registerItem(pellet_chlorophyte, pellet_chlorophyte.getUnlocalizedName());
-		GameRegistry.registerItem(pellet_mercury, pellet_mercury.getUnlocalizedName());
-		GameRegistry.registerItem(pellet_meteorite, pellet_meteorite.getUnlocalizedName());
 		GameRegistry.registerItem(pellet_canister, pellet_canister.getUnlocalizedName());
 		GameRegistry.registerItem(pellet_claws, pellet_claws.getUnlocalizedName());
 		GameRegistry.registerItem(pellet_charged, pellet_charged.getUnlocalizedName());
 		GameRegistry.registerItem(pellet_gas, pellet_gas.getUnlocalizedName());
 		GameRegistry.registerItem(magnetron, magnetron.getUnlocalizedName());
-		GameRegistry.registerItem(pellet_coal, pellet_coal.getUnlocalizedName());
 		
 		//Engine Pieces
 		GameRegistry.registerItem(piston_selenium, piston_selenium.getUnlocalizedName());
@@ -6376,13 +6265,6 @@ public class ModItems {
 		//Siphon
 		GameRegistry.registerItem(siphon, siphon.getUnlocalizedName());
 
-		//Disperser Canister
-		GameRegistry.registerItem(disperser_canister_empty, disperser_canister_empty.getUnlocalizedName());
-		GameRegistry.registerItem(disperser_canister, disperser_canister.getUnlocalizedName());
-
-		GameRegistry.registerItem(glyphid_gland_empty, glyphid_gland_empty.getUnlocalizedName());
-		GameRegistry.registerItem(glyphid_gland, glyphid_gland.getUnlocalizedName());
-
 		//Batteries
 		GameRegistry.registerItem(battery_generic, battery_generic.getUnlocalizedName());
 		GameRegistry.registerItem(battery_red_cell, battery_red_cell.getUnlocalizedName());
@@ -6411,8 +6293,6 @@ public class ModItems {
 		GameRegistry.registerItem(battery_spark_cell_power, battery_spark_cell_power.getUnlocalizedName());
 		GameRegistry.registerItem(cube_power, cube_power.getUnlocalizedName());
 		GameRegistry.registerItem(battery_creative, battery_creative.getUnlocalizedName());
-		GameRegistry.registerItem(battery_su, battery_su.getUnlocalizedName());
-		GameRegistry.registerItem(battery_su_l, battery_su_l.getUnlocalizedName());
 		GameRegistry.registerItem(battery_potato, battery_potato.getUnlocalizedName());
 		GameRegistry.registerItem(battery_potatos, battery_potatos.getUnlocalizedName());
 		GameRegistry.registerItem(battery_sc_uranium, battery_sc_uranium.getUnlocalizedName());
@@ -7247,6 +7127,12 @@ public class ModItems {
 		GameRegistry.registerItem(grenade_if_hopwire, grenade_if_hopwire.getUnlocalizedName());
 		GameRegistry.registerItem(grenade_if_null, grenade_if_null.getUnlocalizedName());
 		GameRegistry.registerItem(nuclear_waste_pearl, nuclear_waste_pearl.getUnlocalizedName());
+
+		//Disperser Canister
+		GameRegistry.registerItem(disperser_canister_empty, disperser_canister_empty.getUnlocalizedName());
+		GameRegistry.registerItem(disperser_canister, disperser_canister.getUnlocalizedName());
+		GameRegistry.registerItem(glyphid_gland_empty, glyphid_gland_empty.getUnlocalizedName());
+		GameRegistry.registerItem(glyphid_gland, glyphid_gland.getUnlocalizedName());
 		
 		GameRegistry.registerItem(ullapool_caber, ullapool_caber.getUnlocalizedName());
 		GameRegistry.registerItem(weaponized_starblaster_cell, weaponized_starblaster_cell.getUnlocalizedName());
@@ -7508,6 +7394,9 @@ public class ModItems {
 		GameRegistry.registerItem(card_aos, card_aos.getUnlocalizedName());
 		GameRegistry.registerItem(card_qos, card_qos.getUnlocalizedName());
 		GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName());
+		GameRegistry.registerItem(armor_battery, armor_battery.getUnlocalizedName());
+		GameRegistry.registerItem(armor_battery_mk2, armor_battery_mk2.getUnlocalizedName());
+		GameRegistry.registerItem(armor_battery_mk3, armor_battery_mk3.getUnlocalizedName());
 
 		//Chaos
 		GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName());
@@ -7817,9 +7706,6 @@ public class ModItems {
 		GameRegistry.registerItem(structure_randomly, structure_randomly.getUnlocalizedName());
 		GameRegistry.registerItem(structure_custommachine, structure_custommachine.getUnlocalizedName());
 		GameRegistry.registerItem(rod_of_discord, rod_of_discord.getUnlocalizedName());
-		//GameRegistry.registerItem(analyzer, analyzer.getUnlocalizedName());
-		//GameRegistry.registerItem(remote, remote.getUnlocalizedName());
-		GameRegistry.registerItem(euphemium_stopper, euphemium_stopper.getUnlocalizedName());
 		GameRegistry.registerItem(polaroid, polaroid.getUnlocalizedName());
 		GameRegistry.registerItem(glitch, glitch.getUnlocalizedName());
 		GameRegistry.registerItem(book_secret, book_secret.getUnlocalizedName());
@@ -7887,14 +7773,6 @@ public class ModItems {
 		GameRegistry.registerItem(holotape_damaged, holotape_damaged.getUnlocalizedName());
 		
 		//Technical Items
-		GameRegistry.registerItem(smoke1, smoke1.getUnlocalizedName());
-		GameRegistry.registerItem(smoke2, smoke2.getUnlocalizedName());
-		GameRegistry.registerItem(smoke3, smoke3.getUnlocalizedName());
-		GameRegistry.registerItem(smoke4, smoke4.getUnlocalizedName());
-		GameRegistry.registerItem(smoke5, smoke5.getUnlocalizedName());
-		GameRegistry.registerItem(smoke6, smoke6.getUnlocalizedName());
-		GameRegistry.registerItem(smoke7, smoke7.getUnlocalizedName());
-		GameRegistry.registerItem(smoke8, smoke8.getUnlocalizedName());
 		GameRegistry.registerItem(b_smoke1, b_smoke1.getUnlocalizedName());
 		GameRegistry.registerItem(b_smoke2, b_smoke2.getUnlocalizedName());
 		GameRegistry.registerItem(b_smoke3, b_smoke3.getUnlocalizedName());
@@ -7903,30 +7781,6 @@ public class ModItems {
 		GameRegistry.registerItem(b_smoke6, b_smoke6.getUnlocalizedName());
 		GameRegistry.registerItem(b_smoke7, b_smoke7.getUnlocalizedName());
 		GameRegistry.registerItem(b_smoke8, b_smoke8.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke1, d_smoke1.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke2, d_smoke2.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke3, d_smoke3.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke4, d_smoke4.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke5, d_smoke5.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke6, d_smoke6.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke7, d_smoke7.getUnlocalizedName());
-		GameRegistry.registerItem(d_smoke8, d_smoke8.getUnlocalizedName());
-		GameRegistry.registerItem(spill1, spill1.getUnlocalizedName());
-		GameRegistry.registerItem(spill2, spill2.getUnlocalizedName());
-		GameRegistry.registerItem(spill3, spill3.getUnlocalizedName());
-		GameRegistry.registerItem(spill4, spill4.getUnlocalizedName());
-		GameRegistry.registerItem(spill5, spill5.getUnlocalizedName());
-		GameRegistry.registerItem(spill6, spill6.getUnlocalizedName());
-		GameRegistry.registerItem(spill7, spill7.getUnlocalizedName());
-		GameRegistry.registerItem(spill8, spill8.getUnlocalizedName());
-		GameRegistry.registerItem(gas1, gas1.getUnlocalizedName());
-		GameRegistry.registerItem(gas2, gas2.getUnlocalizedName());
-		GameRegistry.registerItem(gas3, gas3.getUnlocalizedName());
-		GameRegistry.registerItem(gas4, gas4.getUnlocalizedName());
-		GameRegistry.registerItem(gas5, gas5.getUnlocalizedName());
-		GameRegistry.registerItem(gas6, gas6.getUnlocalizedName());
-		GameRegistry.registerItem(gas7, gas7.getUnlocalizedName());
-		GameRegistry.registerItem(gas8, gas8.getUnlocalizedName());
 		GameRegistry.registerItem(chlorine1, chlorine1.getUnlocalizedName());
 		GameRegistry.registerItem(chlorine2, chlorine2.getUnlocalizedName());
 		GameRegistry.registerItem(chlorine3, chlorine3.getUnlocalizedName());
@@ -7959,9 +7813,6 @@ public class ModItems {
 		GameRegistry.registerItem(orange6, orange6.getUnlocalizedName());
 		GameRegistry.registerItem(orange7, orange7.getUnlocalizedName());
 		GameRegistry.registerItem(orange8, orange8.getUnlocalizedName());
-		GameRegistry.registerItem(energy_ball, energy_ball.getUnlocalizedName());
-		GameRegistry.registerItem(discharge, discharge.getUnlocalizedName());
-		GameRegistry.registerItem(empblast, empblast.getUnlocalizedName());
 		GameRegistry.registerItem(flame_1, flame_1.getUnlocalizedName());
 		GameRegistry.registerItem(flame_2, flame_2.getUnlocalizedName());
 		GameRegistry.registerItem(flame_3, flame_3.getUnlocalizedName());
@@ -7983,7 +7834,6 @@ public class ModItems {
 		GameRegistry.registerItem(ln2_9, ln2_9.getUnlocalizedName());
 		GameRegistry.registerItem(ln2_10, ln2_10.getUnlocalizedName());
 		GameRegistry.registerItem(nothing, nothing.getUnlocalizedName());
-		GameRegistry.registerItem(void_anim, void_anim.getUnlocalizedName());
 		GameRegistry.registerItem(achievement_icon, achievement_icon.getUnlocalizedName());
 		GameRegistry.registerItem(bob_metalworks, bob_metalworks.getUnlocalizedName());
 		GameRegistry.registerItem(bob_assembly, bob_assembly.getUnlocalizedName());

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

@@ -2,6 +2,7 @@ package com.hbm.items.armor;
 
 import java.util.List;
 
+import com.hbm.handler.ArmorModHandler;
 import com.hbm.util.BobMathUtil;
 
 import api.hbm.energymk2.IBatteryItem;
@@ -30,9 +31,7 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem {
 
 	@SideOnly(Side.CLIENT)
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
-
+		list.add("Charge: " + BobMathUtil.getShortNumber(getCharge(stack)) + " / " + BobMathUtil.getShortNumber(getMaxCharge(stack)));
-		list.add("Charge: " + BobMathUtil.getShortNumber(getCharge(stack)) + " / " + BobMathUtil.getShortNumber(maxPower));
-
 		super.addInformation(stack, player, list, ext);
 	}
 
@@ -72,7 +71,7 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem {
 				stack.stackTagCompound.setLong("charge", stack.stackTagCompound.getLong("charge") - i);
 			} else {
 				stack.stackTagCompound = new NBTTagCompound();
-				stack.stackTagCompound.setLong("charge", this.maxPower - i);
+				stack.stackTagCompound.setLong("charge", getMaxCharge(stack) - i);
 			}
 
 			if(stack.stackTagCompound.getLong("charge") < 0)
@@ -84,10 +83,10 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem {
 	public long getCharge(ItemStack stack) {
 		if(stack.getItem() instanceof ArmorFSBPowered) {
 			if(stack.hasTagCompound()) {
-				return stack.stackTagCompound.getLong("charge");
+				return Math.min(stack.stackTagCompound.getLong("charge"), getMaxCharge(stack));
 			} else {
 				stack.stackTagCompound = new NBTTagCompound();
-				stack.stackTagCompound.setLong("charge", ((ArmorFSBPowered) stack.getItem()).maxPower);
+				stack.stackTagCompound.setLong("charge", getMaxCharge(stack));
 				return stack.stackTagCompound.getLong("charge");
 			}
 		}
@@ -97,18 +96,23 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem {
 
 	@Override
 	public boolean showDurabilityBar(ItemStack stack) {
-
+		return getCharge(stack) < getMaxCharge(stack);
-		return getCharge(stack) < maxPower;
 	}
 
 	@Override
 	public double getDurabilityForDisplay(ItemStack stack) {
 
-		return 1 - (double) getCharge(stack) / (double) maxPower;
+		return 1 - (double) getCharge(stack) / (double) getMaxCharge(stack);
 	}
 
 	@Override
-	public long getMaxCharge() {
+	public long getMaxCharge(ItemStack stack) {
+		if(ArmorModHandler.hasMods(stack)) {
+			ItemStack mod = ArmorModHandler.pryMod(stack, ArmorModHandler.battery);
+			if(mod != null && mod.getItem() instanceof ItemModBattery) {
+				return (long) (maxPower * ((ItemModBattery) mod.getItem()).mod);
+			}
+		}
 		return maxPower;
 	}
 

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

@@ -108,7 +108,7 @@ public class ArmorHEV extends ArmorFSBPowered {
 			ItemStack armor = player.inventory.armorInventory[i];
 			ArmorFSBPowered item = ((ArmorFSBPowered) player.inventory.armorInventory[i].getItem());
 
-			c += (double) item.getCharge(armor) / (double) item.getMaxCharge();
+			c += (double) item.getCharge(armor) / (double) item.getMaxCharge(armor);
 		}
 
 		int aX = (int) (70 / scale);

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

@@ -70,7 +70,7 @@ public class ArmorModel extends ItemArmor {
 				return this.modelHat;
 			}
 		}
-		if(this == ModItems.cape_test || this == ModItems.cape_radiation || this == ModItems.cape_gasmask || this == ModItems.cape_schrabidium || this == ModItems.cape_hidden) {
+		if(this == ModItems.cape_radiation || this == ModItems.cape_gasmask || this == ModItems.cape_schrabidium || this == ModItems.cape_hidden) {
 			if(armorSlot == 1) {
 				if(this.modelCloak == null) {
 					this.modelCloak = new ModelCloak();
@@ -86,9 +86,6 @@ public class ArmorModel extends ItemArmor {
 		if(stack.getItem() == ModItems.goggles) {
 			return "hbm:textures/models/Goggles.png";
 		}
-		if(stack.getItem() == ModItems.cape_test) {
-			return "hbm:textures/models/TestCape.png";
-		}
 		if(stack.getItem() == ModItems.cape_radiation) {
 			return "hbm:textures/models/capes/CapeRadiation.png";
 		}

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

@@ -1,28 +0,0 @@
-package com.hbm.items.armor;
-
-import com.hbm.items.ModItems;
-import com.hbm.lib.RefStrings;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemArmor;
-import net.minecraft.item.ItemStack;
-
-public class ArmorTest extends ItemArmor {
-	
-	public ArmorTest(ArmorMaterial armorMaterial, int armorType) {
-		super(armorMaterial, 0, armorType);
-	}
-	
-	@Override
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layer) {
-		if(stack.getItem().equals(ModItems.test_helmet) || stack.getItem().equals(ModItems.test_chestplate) || stack.getItem().equals(ModItems.test_boots)) {
-			return (RefStrings.MODID + ":textures/armor/test_1.png");
-		}
-		if(stack.getItem().equals(ModItems.test_leggings)) {
-			return (RefStrings.MODID + ":textures/armor/test_2.png");
-		}
-		
-		else return null;
-	}
-
-}

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

@@ -64,6 +64,7 @@ public class ItemArmorMod extends Item {
 		case ArmorModHandler.cladding: list.add("  " + I18nUtil.resolveKey("armorMod.type.cladding")); break;
 		case ArmorModHandler.kevlar: list.add("  " + I18nUtil.resolveKey("armorMod.type.insert")); break;
 		case ArmorModHandler.extra: list.add("  " + I18nUtil.resolveKey("armorMod.type.special")); break;
+		case ArmorModHandler.battery: list.add("  " + I18nUtil.resolveKey("armorMod.type.battery")); break;
 		}
 	}
 

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

@@ -0,0 +1,13 @@
+package com.hbm.items.armor;
+
+import com.hbm.handler.ArmorModHandler;
+
+public class ItemModBattery extends ItemArmorMod {
+	
+	public double mod;
+
+	public ItemModBattery(double mod) {
+		super(ArmorModHandler.battery, true, true, true, true);
+		this.mod = mod;
+	}
+}

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

@@ -6,7 +6,6 @@ import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.handler.ArmorModHandler;
 import com.hbm.items.ModItems;
 
-import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -35,7 +34,7 @@ public class ItemModCard extends ItemArmorMod {
 
 	@Override
 	public void addDesc(List list, ItemStack stack, ItemStack armor) {
-		list.add(EnumChatFormatting.YELLOW + I18n.format("item.night_vision.description.in_armor", stack.getDisplayName()));
+		list.add(EnumChatFormatting.RED + stack.getDisplayName());
 	}
 	
 	@Override

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

@@ -33,7 +33,7 @@ public class ItemModNightVision extends ItemArmorMod {
 		if(!entity.worldObj.isRemote && entity instanceof EntityPlayer && armor.getItem() instanceof ArmorFSBPowered && ArmorFSBPowered.hasFSBArmor((EntityPlayer) entity)) {
 			entity.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0));
 
-			if(entity.getRNG().nextInt(50) == 0) {
+			if(entity.getRNG().nextInt(100) == 0) {
 				armor.damageItem(1, entity);
 			}
 		}

src/main/java/com/hbm/items/food/ItemPancake.java

@@ -30,7 +30,7 @@ public class ItemPancake extends ItemFood {
     			continue;
     		
     		if(st.getItem() instanceof IBatteryItem) {
-    			((IBatteryItem)st.getItem()).setCharge(st, ((IBatteryItem)st.getItem()).getMaxCharge());
+    			((IBatteryItem)st.getItem()).setCharge(st, ((IBatteryItem)st.getItem()).getMaxCharge(st));
     		}
     	}
     }

src/main/java/com/hbm/items/machine/ItemBattery.java

@@ -105,14 +105,17 @@ public class ItemBattery extends Item implements IBatteryItem {
 		return 0;
 	}
 
-	public long getMaxCharge() {
+	@Override
+	public long getMaxCharge(ItemStack stack) {
 		return maxCharge;
 	}
 
+	@Override
 	public long getChargeRate() {
 		return chargeRate;
 	}
 
+	@Override
 	public long getDischargeRate() {
 		return dischargeRate;
 	}
@@ -134,7 +137,7 @@ public class ItemBattery extends Item implements IBatteryItem {
 		if(item instanceof ItemBattery) {
 			ItemStack stack = new ItemStack(item);
 			stack.stackTagCompound = new NBTTagCompound();
-			stack.stackTagCompound.setLong("charge", ((ItemBattery) item).getMaxCharge());
+			stack.stackTagCompound.setLong("charge", ((ItemBattery) item).getMaxCharge(stack));
 			return stack.copy();
 		}
 
@@ -146,7 +149,7 @@ public class ItemBattery extends Item implements IBatteryItem {
 	}
 
 	public double getDurabilityForDisplay(ItemStack stack) {
-		return 1D - (double) getCharge(stack) / (double) getMaxCharge();
+		return 1D - (double) getCharge(stack) / (double) getMaxCharge(stack);
 	}
 
 	@Override

src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java

@@ -1,8 +1,6 @@
 package com.hbm.items.machine;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
@@ -12,7 +10,6 @@ import com.hbm.main.MainRegistry;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.PlayerInformPacket;
 import com.hbm.tileentity.IGUIProvider;
-import com.hbm.tileentity.conductor.TileEntityFluidDuctSimple;
 import com.hbm.util.ChatBuilder;
 import com.hbm.util.I18nUtil;
 
@@ -26,10 +23,8 @@ import net.minecraft.inventory.Container;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class ItemFluidIDMulti extends Item implements IItemFluidIdentifier, IItemControlReceiver, IGUIProvider {
 
@@ -147,80 +142,6 @@ public class ItemFluidIDMulti extends Item implements IItemFluidIdentifier, IIte
 		int type = stack.stackTagCompound.getInteger("fluid" + (primary ? 1 : 2));
 		return Fluids.fromID(type);
 	}
-	
-	/*
-	 * CRAPPY COMPAT SECTION
-	 */
-
-	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f1, float f2, float f3) {
-		TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TileEntityFluidDuctSimple) {
-
-			TileEntityFluidDuctSimple duct = (TileEntityFluidDuctSimple) te;
-			
-			if(!world.isRemote) {
-				FluidType type = getType(world, x, y ,z, stack);
-				
-				if (player.isSneaking()) {
-					markDuctsRecursively(world, x, y, z, type);
-				} else {
-					duct.setType(type);
-				}
-			}
-			
-			world.markBlockForUpdate(x, y, z);
-
-			player.swingItem();
-			return true;
-		}
-		return false;
-	}
-
-	private void markDuctsRecursively(World world, int x, int y, int z, FluidType type) {
-		markDuctsRecursively(world, x, y, z, type, 64);
-	}
-
-	@Deprecated
-	private void markDuctsRecursively(World world, int x, int y, int z, FluidType type, int maxRecursion) {
-		TileEntity start = world.getTileEntity(x, y, z);
-		
-		if (!(start instanceof TileEntityFluidDuctSimple))
-			return;
-		
-		TileEntityFluidDuctSimple startDuct = (TileEntityFluidDuctSimple) start;
-		FluidType oldType = startDuct.getType();
-		
-		if (oldType == type)
-			return; // prevent infinite loops
-		
-		startDuct.setType(type);
-
-		directionLoop: for (ForgeDirection direction : ForgeDirection.values()) {
-			for (int currentRecursion = 1; currentRecursion <= maxRecursion; currentRecursion++) {
-				
-				int nextX = x + direction.offsetX * currentRecursion;
-				int nextY = y + direction.offsetY * currentRecursion;
-				int nextZ = z + direction.offsetZ * currentRecursion;
-
-				TileEntity te = world.getTileEntity(nextX, nextY, nextZ);
-				if (te instanceof TileEntityFluidDuctSimple && ((TileEntityFluidDuctSimple) te).getType() == oldType) {
-					
-					TileEntityFluidDuctSimple nextDuct = (TileEntityFluidDuctSimple) te;
-					long connectionsCount = Arrays.stream(nextDuct.connections).filter(Objects::nonNull).count(); // (o -> Objects.nonNull(o))
-					
-					if (connectionsCount > 1) {
-						markDuctsRecursively(world, nextX, nextY, nextZ, type, maxRecursion - currentRecursion);
-						continue directionLoop;
-					} else {
-						nextDuct.setType(type);
-					}
-				} else {
-					break;
-				}
-			}
-		}
-	}
 
 	@Override
 	public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {

src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java

@@ -1,13 +1,10 @@
 package com.hbm.items.machine;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
-import com.hbm.tileentity.conductor.TileEntityFluidDuctSimple;
 import com.hbm.util.I18nUtil;
 
 import cpw.mods.fml.relauncher.Side;
@@ -17,11 +14,9 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class ItemFluidIdentifier extends Item implements IItemFluidIdentifier {
 
@@ -88,75 +83,6 @@ public class ItemFluidIdentifier extends Item implements IItemFluidIdentifier {
 		return true;
 	}
 
-	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f1, float f2, float f3) {
-		TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TileEntityFluidDuctSimple) {
-
-			TileEntityFluidDuctSimple duct = (TileEntityFluidDuctSimple) te;
-			
-			if(!world.isRemote) {
-				FluidType type = Fluids.fromID(stack.getItemDamage());
-				
-				if (player.isSneaking()) {
-					markDuctsRecursively(world, x, y, z, type);
-				} else {
-					duct.setType(type);
-				}
-			}
-			
-			world.markBlockForUpdate(x, y, z);
-
-			player.swingItem();
-		}
-		return false;
-	}
-
-	private void markDuctsRecursively(World world, int x, int y, int z, FluidType type) {
-		markDuctsRecursively(world, x, y, z, type, 64);
-	}
-
-	@Deprecated
-	private void markDuctsRecursively(World world, int x, int y, int z, FluidType type, int maxRecursion) {
-		TileEntity start = world.getTileEntity(x, y, z);
-		
-		if (!(start instanceof TileEntityFluidDuctSimple))
-			return;
-		
-		TileEntityFluidDuctSimple startDuct = (TileEntityFluidDuctSimple) start;
-		FluidType oldType = startDuct.getType();
-		
-		if (oldType == type)
-			return; // prevent infinite loops
-		
-		startDuct.setType(type);
-
-		directionLoop: for (ForgeDirection direction : ForgeDirection.values()) {
-			for (int currentRecursion = 1; currentRecursion <= maxRecursion; currentRecursion++) {
-				
-				int nextX = x + direction.offsetX * currentRecursion;
-				int nextY = y + direction.offsetY * currentRecursion;
-				int nextZ = z + direction.offsetZ * currentRecursion;
-
-				TileEntity te = world.getTileEntity(nextX, nextY, nextZ);
-				if (te instanceof TileEntityFluidDuctSimple && ((TileEntityFluidDuctSimple) te).getType() == oldType) {
-					
-					TileEntityFluidDuctSimple nextDuct = (TileEntityFluidDuctSimple) te;
-					long connectionsCount = Arrays.stream(nextDuct.connections).filter(Objects::nonNull).count(); // (o -> Objects.nonNull(o))
-					
-					if (connectionsCount > 1) {
-						markDuctsRecursively(world, nextX, nextY, nextZ, type, maxRecursion - currentRecursion);
-						continue directionLoop;
-					} else {
-						nextDuct.setType(type);
-					}
-				} else {
-					break;
-				}
-			}
-		}
-	}
-
 	@Override
 	@SideOnly(Side.CLIENT)
 	public boolean requiresMultipleRenderPasses() {

src/main/java/com/hbm/items/machine/ItemSelfcharger.java

@@ -38,7 +38,7 @@ public class ItemSelfcharger extends Item implements IBatteryItem {
 	}
 
 	@Override
-	public long getMaxCharge() {
+	public long getMaxCharge(ItemStack stack) {
 		return charge;
 	}
 

src/main/java/com/hbm/items/special/ItemGlitch.java

@@ -241,7 +241,7 @@ public class ItemGlitch extends Item implements IBatteryItem {
 	@Override public void setCharge(ItemStack stack, long i) { }
 	@Override public void dischargeBattery(ItemStack stack, long i) { }
 	@Override public long getCharge(ItemStack stack) { return 200; }
-	@Override public long getMaxCharge() { return 200; }
+	@Override public long getMaxCharge(ItemStack stack) { return 200; }
 	@Override public long getChargeRate() { return 0; }
 	@Override public long getDischargeRate() { return 200; }
 }

src/main/java/com/hbm/items/special/ItemPotatos.java

@@ -28,7 +28,7 @@ public class ItemPotatos extends ItemBattery {
     			
     			if(p.getHeldItem() == stack) {
     				
-    		    	float pitch = (float)getCharge(stack) / (float)this.getMaxCharge() * 0.5F + 0.5F;
+    		    	float pitch = (float)getCharge(stack) / (float)this.getMaxCharge(stack) * 0.5F + 0.5F;
     		    	
     				world.playSoundAtEntity(p, "hbm:potatos.random", 1.0F, pitch);
     				setTimer(stack, 200 + itemRand.nextInt(100));

src/main/java/com/hbm/items/special/ItemSyringe.java

@@ -360,10 +360,6 @@ public class ItemSyringe extends Item {
 		if(this == ModItems.syringe_awesome) {
 			return EnumRarity.uncommon;
 		}
-		if(this == ModItems.euphemium_stopper) {
-			return EnumRarity.epic;
-		}
-
 		return EnumRarity.common;
 	}
 
@@ -527,14 +523,6 @@ public class ItemSyringe extends Item {
 			}
 		}
 
-		if(this == ModItems.euphemium_stopper) {
-			if(!world.isRemote) {
-				entity.addPotionEffect(new PotionEffect(Potion.weakness.id, 30 * 20, 9));
-				entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 30 * 20, 9));
-				entity.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 30 * 20, 9));
-			}
-		}
-
 		if(this == ModItems.syringe_mkunicorn) {
 			if(!world.isRemote) {
 				HbmLivingProps.setContagion(entity, 3 * 60 * 60 * 20);

src/main/java/com/hbm/items/tool/ItemFusionCore.java

@@ -33,7 +33,7 @@ public class ItemFusionCore extends Item {
 
 				if(st.getItem() instanceof IBatteryItem) {
 
-					long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge();
+					long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(st);
 					long charge = ((IBatteryItem) st.getItem()).getCharge(st);
 					long newcharge = Math.min(charge + this.charge, maxcharge);
 

src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java

@@ -106,7 +106,7 @@ public class ItemSwordAbilityPower extends ItemSwordAbility implements IBatteryI
     }
 
 	@Override
-    public long getMaxCharge() {
+    public long getMaxCharge(ItemStack stack) {
     	return maxPower;
     }
 

src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java

@@ -102,7 +102,7 @@ public class ItemToolAbilityPower extends ItemToolAbility implements IBatteryIte
 	}
 
 	@Override
-	public long getMaxCharge() {
+	public long getMaxCharge(ItemStack stack) {
 		return maxPower;
 	}
 

src/main/java/com/hbm/items/weapon/GunFolly.java

@@ -1,6 +1,5 @@
 package com.hbm.items.weapon;
 
-import com.hbm.entity.particle.EntitySSmokeFX;
 import com.hbm.entity.projectile.EntityBulletBaseNT;
 import com.hbm.handler.BulletConfigSyncingUtil;
 import com.hbm.interfaces.IHoldableWeapon;
@@ -65,20 +64,6 @@ public class GunFolly extends Item implements IHoldableWeapon {
 				if (!world.isRemote) {
 					EntityBulletBaseNT bullet = new EntityBulletBaseNT(world, BulletConfigSyncingUtil.TEST_CONFIG, player);
 					world.spawnEntityInWorld(bullet);
-					
-					for(int i = 0; i < 25; i++) {
-						EntitySSmokeFX flame = new EntitySSmokeFX(world);
-						
-						flame.motionX = player.getLookVec().xCoord;
-						flame.motionY = player.getLookVec().yCoord;
-						flame.motionZ = player.getLookVec().zCoord;
-						
-						flame.posX = player.posX + flame.motionX + world.rand.nextGaussian() * 0.35;
-						flame.posY = player.posY + flame.motionY + world.rand.nextGaussian() * 0.35 + player.eyeHeight;
-						flame.posZ = player.posZ + flame.motionZ + world.rand.nextGaussian() * 0.35;
-						
-						world.spawnEntityInWorld(flame);
-					}
 				}
 			}
 		}

src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java

@@ -181,7 +181,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem {
 	}
 
 	public double getDurabilityForDisplay(ItemStack stack) {
-		return 1D - (double) getCharge(stack) / (double) getMaxCharge();
+		return 1D - (double) getCharge(stack) / (double) getMaxCharge(stack);
 	}
 
 	@Override
@@ -236,7 +236,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem {
 	}
 
 	@Override
-	public long getMaxCharge() {
+	public long getMaxCharge(ItemStack stack) {
 		return mainConfig.maxCharge;
 	}
 
@@ -266,7 +266,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem {
 
 		ItemStack stack = new ItemStack(item);
 		stack.stackTagCompound = new NBTTagCompound();
-		stack.stackTagCompound.setLong("charge", ((ItemEnergyGunBase) item).getMaxCharge());
+		stack.stackTagCompound.setLong("charge", ((ItemEnergyGunBase) item).getMaxCharge(stack));
 
 		list.add(stack);
 	}

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

@@ -7,13 +7,9 @@ import java.util.Random;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.entity.mob.EntityHunterChopper;
 import com.hbm.entity.projectile.EntityChopperMine;
-import com.hbm.interfaces.IFluidAcceptor;
-import com.hbm.interfaces.IFluidDuct;
-import com.hbm.interfaces.IFluidSource;
 import com.hbm.interfaces.Spaghetti;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
-import com.hbm.tileentity.TileEntityProxyInventory;
 
 import api.hbm.energymk2.IBatteryItem;
 import api.hbm.energymk2.IEnergyConnectorBlock;
@@ -40,10 +36,7 @@ public class Library {
 	static Random rand = new Random();
 	
 	public static boolean checkForHeld(EntityPlayer player, Item item) {
-		
+		if(player.getHeldItem() == null) return false;
-		if(player.getHeldItem() == null)
-			return false;
-		
 		return player.getHeldItem().getItem() == item;
 	}
 
@@ -109,26 +102,6 @@ public class Library {
 		
 		return false;
 	}
-	
-	public static boolean checkFluidConnectables(World world, int x, int y, int z, FluidType type)
-	{
-		TileEntity tileentity = world.getTileEntity(x, y, z);
-		if(tileentity != null && tileentity instanceof IFluidDuct && ((IFluidDuct)tileentity).getType() == type)
-			return true;
-		if((tileentity != null && (tileentity instanceof IFluidAcceptor || 
-				tileentity instanceof IFluidSource)) || 
-				world.getBlock(x, y, z) == ModBlocks.fusion_hatch ||
-				world.getBlock(x, y, z) == ModBlocks.dummy_port_compact_launcher ||
-				world.getBlock(x, y, z) == ModBlocks.dummy_port_launch_table ||
-				world.getBlock(x, y, z) == ModBlocks.rbmk_loader) {
-			return true;
-		}
-		
-		if(world.getBlock(x, y, z) == ModBlocks.machine_mining_laser && tileentity instanceof TileEntityProxyInventory)
-			return true;
-		
-		return false;
-	}
 
 	public static EntityLivingBase getClosestEntityForChopper(World world, double x, double y, double z, double radius) {
 		double d4 = -1.0D;
@@ -270,7 +243,7 @@ public class Library {
 			
 			IBatteryItem battery = (IBatteryItem) slots[index].getItem();
 
-			long batMax = battery.getMaxCharge();
+			long batMax = battery.getMaxCharge(slots[index]);
 			long batCharge = battery.getCharge(slots[index]);
 			long batRate = battery.getChargeRate();
 			long toCharge = Math.min(Math.min(power, batRate), batMax - batCharge);
@@ -318,24 +291,6 @@ public class Library {
 		 * You won't be missed.
 		 */
 	}
-	
-	public static void transmitFluid(int x, int y, int z, boolean newTact, IFluidSource that, World worldObj, FluidType type) { }
-	
-	public static boolean isArrayEmpty(Object[] array) {
-		if(array == null)
-			return true;
-		if(array.length == 0)
-			return true;
-		
-		boolean flag = true;
-		
-		for(int i = 0; i < array.length; i++) {
-			if(array[i] != null)
-				flag = false;
-		}
-		
-		return flag;
-	}
 
 	// Added for sake of doors
 	// Original: Drillgon200: https://thebookofshaders.com/glossary/?search=smoothstep
@@ -358,24 +313,11 @@ public class Library {
 		return pos != null;
 	}
 	
-	public static int getFirstNullIndex(int start, Object[] array) {
-		for(int i = start; i < array.length; i++) {
-			if(array[i] == null)
-				return i;
-		}
-		return -1;
-	}
-	
 	public static Block getRandomConcrete() {
 		int i = rand.nextInt(20);
-
+		if(i <= 1) return ModBlocks.brick_concrete_broken;
-		if(i <= 1)
+		if(i <= 4) return ModBlocks.brick_concrete_cracked;
-			return ModBlocks.brick_concrete_broken;
+		if(i <= 10) return ModBlocks.brick_concrete_mossy;
-		if(i <= 4)
-			return ModBlocks.brick_concrete_cracked;
-		if(i <= 10)
-			return ModBlocks.brick_concrete_mossy;
-		
 		return ModBlocks.brick_concrete;
 	}
 }

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

@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (5036)";
+	public static final String VERSION = "1.0.27 BETA (5061)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/main/ClientProxy.java

@@ -116,7 +116,6 @@ import com.hbm.sound.AudioWrapper;
 import com.hbm.sound.AudioWrapperClient;
 import com.hbm.tileentity.TileEntityDoorGeneric;
 import com.hbm.tileentity.bomb.*;
-import com.hbm.tileentity.conductor.*;
 import com.hbm.tileentity.deco.*;
 import com.hbm.tileentity.machine.*;
 import com.hbm.tileentity.machine.oil.*;
@@ -349,7 +348,6 @@ public class ClientProxy extends ServerProxy {
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzLauncher.class, new RenderSoyuzLauncher());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzCapsule.class, new RenderCapsule());
 		//network
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFluidDuct.class, new RenderFluidDuct());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPylon.class, new RenderPylon());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityConnector.class, new RenderConnector());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPylonMedium.class, new RenderPylonMedium());
@@ -629,7 +627,7 @@ public class ClientProxy extends ServerProxy {
 		RenderingRegistry.registerEntityRenderingHandler(EntityBulletBaseNT.class, new RenderBullet());
 		RenderingRegistry.registerEntityRenderingHandler(EntityRainbow.class, new RenderRainbow());
 		RenderingRegistry.registerEntityRenderingHandler(EntityNightmareBlast.class, new RenderOminousBullet());
-		RenderingRegistry.registerEntityRenderingHandler(EntityFire.class, new RenderFireball(ModItems.energy_ball));
+		RenderingRegistry.registerEntityRenderingHandler(EntityFire.class, new RenderFireball(ModItems.nothing));
 		RenderingRegistry.registerEntityRenderingHandler(EntityPlasmaBeam.class, new RenderBeam());
 		RenderingRegistry.registerEntityRenderingHandler(EntityLaserBeam.class, new RenderBeam2());
 		RenderingRegistry.registerEntityRenderingHandler(EntityMinerBeam.class, new RenderBeam3());
@@ -637,7 +635,7 @@ public class ClientProxy extends ServerProxy {
 		RenderingRegistry.registerEntityRenderingHandler(EntityExplosiveBeam.class, new RenderBeam5());
 		RenderingRegistry.registerEntityRenderingHandler(EntityModBeam.class, new RenderBeam6());
 		RenderingRegistry.registerEntityRenderingHandler(EntitySiegeLaser.class, new RenderSiegeLaser());
-		RenderingRegistry.registerEntityRenderingHandler(EntityLN2.class, new RenderLN2(ModItems.energy_ball));
+		RenderingRegistry.registerEntityRenderingHandler(EntityLN2.class, new RenderLN2(ModItems.nothing));
 		RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityBombletZeta.class, new RenderBombletTheta());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityMeteor.class, new RenderMeteor());
@@ -656,7 +654,6 @@ public class ClientProxy extends ServerProxy {
 	    RenderingRegistry.registerEntityRenderingHandler(EntityRubble.class, new RenderRubble());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityShrapnel.class, new RenderShrapnel());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityFireworks.class, new RenderShrapnel());
-	    RenderingRegistry.registerEntityRenderingHandler(EntityOilSpill.class, new RenderEmpty());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityWaterSplash.class, new RenderEmpty());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityEMP.class, new RenderEmpty());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityBeamVortex.class, new RenderVortexBeam());
@@ -820,20 +817,13 @@ public class ClientProxy extends ServerProxy {
 		RenderingRegistry.registerEntityRenderingHandler(EntityPlasticBag.class, new RenderPlasticBag());
 		RenderingRegistry.registerEntityRenderingHandler(EntityPigeon.class, new RenderPigeon(new ModelPigeon(), 0.3F));
 	    //"particles"
-	    RenderingRegistry.registerEntityRenderingHandler(EntitySmokeFX.class, new MultiCloudRenderer(new Item[] { ModItems.smoke1, ModItems.smoke2, ModItems.smoke3, ModItems.smoke4, ModItems.smoke5, ModItems.smoke6, ModItems.smoke7, ModItems.smoke8 }));
 	    RenderingRegistry.registerEntityRenderingHandler(EntityBSmokeFX.class, new MultiCloudRenderer(new Item[] { ModItems.b_smoke1, ModItems.b_smoke2, ModItems.b_smoke3, ModItems.b_smoke4, ModItems.b_smoke5, ModItems.b_smoke6, ModItems.b_smoke7, ModItems.b_smoke8 }));
-	    RenderingRegistry.registerEntityRenderingHandler(EntityDSmokeFX.class, new MultiCloudRenderer(new Item[] { ModItems.d_smoke1, ModItems.d_smoke2, ModItems.d_smoke3, ModItems.d_smoke4, ModItems.d_smoke5, ModItems.d_smoke6, ModItems.d_smoke7, ModItems.d_smoke8 }));
 	    RenderingRegistry.registerEntityRenderingHandler(EntityChlorineFX.class, new MultiCloudRenderer(new Item[] { ModItems.chlorine1, ModItems.chlorine2, ModItems.chlorine3, ModItems.chlorine4, ModItems.chlorine5, ModItems.chlorine6, ModItems.chlorine7, ModItems.chlorine8 }));
 	    RenderingRegistry.registerEntityRenderingHandler(EntityPinkCloudFX.class, new MultiCloudRenderer(new Item[] { ModItems.pc1, ModItems.pc2, ModItems.pc3, ModItems.pc4, ModItems.pc5, ModItems.pc6, ModItems.pc7, ModItems.pc8 }));
 	    RenderingRegistry.registerEntityRenderingHandler(com.hbm.entity.particle.EntityCloudFX.class, new MultiCloudRenderer(new Item[] { ModItems.cloud1, ModItems.cloud2, ModItems.cloud3, ModItems.cloud4, ModItems.cloud5, ModItems.cloud6, ModItems.cloud7, ModItems.cloud8 }));
 	    RenderingRegistry.registerEntityRenderingHandler(EntityOrangeFX.class, new MultiCloudRenderer(new Item[] { ModItems.orange1, ModItems.orange2, ModItems.orange3, ModItems.orange4, ModItems.orange5, ModItems.orange6, ModItems.orange7, ModItems.orange8 }));
 	    RenderingRegistry.registerEntityRenderingHandler(EntityFogFX.class, new FogRenderer());
-	    RenderingRegistry.registerEntityRenderingHandler(EntitySSmokeFX.class, new SSmokeRenderer(ModItems.nuclear_waste));
-	    RenderingRegistry.registerEntityRenderingHandler(EntityOilSpillFX.class, new SpillRenderer(ModItems.nuclear_waste));
-	    RenderingRegistry.registerEntityRenderingHandler(EntityGasFX.class, new GasRenderer(ModItems.nuclear_waste));
-	    RenderingRegistry.registerEntityRenderingHandler(EntityCombineBall.class, new RenderSnowball(ModItems.energy_ball));
 	    RenderingRegistry.registerEntityRenderingHandler(EntityEMPBlast.class, new RenderEMPBlast());
-	    RenderingRegistry.registerEntityRenderingHandler(EntityTSmokeFX.class, new TSmokeRenderer(ModItems.nuclear_waste));
 	}
 	
 	@Override
@@ -859,7 +849,6 @@ public class ClientProxy extends ServerProxy {
 		RenderingRegistry.registerBlockHandler(new RenderPipe());
 		RenderingRegistry.registerBlockHandler(new RenderBattery());
 		RenderingRegistry.registerBlockHandler(new RenderAnvil());
-		RenderingRegistry.registerBlockHandler(new RenderCrystal());
 		RenderingRegistry.registerBlockHandler(new RenderCable());
 		RenderingRegistry.registerBlockHandler(new RenderCableClassic());
 		RenderingRegistry.registerBlockHandler(new RenderTestPipe());

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

@@ -102,7 +102,6 @@ public class CraftingManager {
 		addRecipeAuto(Mats.MAT_DURA.make(ModItems.bolt, 16), new Object[] { "D", "D", 'D', DURA.ingot()});
 		addRecipeAuto(new ItemStack(ModItems.bolt_spike, 2), new Object[] { "BB", "B ", "B ", 'B', STEEL.bolt()});
 		addRecipeAuto(new ItemStack(ModItems.pipes_steel, 1), new Object[] { "B", "B", "B", 'B', STEEL.block() });
-		addRecipeAuto(new ItemStack(ModItems.pellet_coal, 1), new Object[] { "PFP", "FOF", "PFP", 'P', COAL.dust(), 'F', Items.flint, 'O', ModBlocks.gravel_obsidian });
 		addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_PLASTIC.ingot() });
 		addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_RUBBER.ingot() });
 		addRecipeAuto(new ItemStack(ModItems.plate_polymer, 16), new Object[] { "DD", 'D', FIBER.ingot()});
@@ -250,8 +249,6 @@ public class CraftingManager {
 
 		//addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 1), new Object[] { "T T", "PHP", "TFT", 'T', W.ingot(), 'P', ModItems.board_copper, 'H', Blocks.hopper, 'F', Blocks.furnace });
 		addRecipeAuto(new ItemStack(ModBlocks.machine_difurnace_extension, 1), new Object[] { " C ", "BGB", "BGB", 'C', CU.plate(), 'B', ModItems.ingot_firebrick, 'G', ModBlocks.steel_grate });
-		addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_uf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', IRON.plate(), 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', MINGRADE.ingot() });
-		addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_puf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', STEEL.plate(), 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', MINGRADE.ingot() });
 		addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_nuke_furnace_off), 1), new Object[] { "SSS", "LFL", "CCC", 'S', STEEL.plate(), 'C', CU.plateCast(), 'L', PB.plate(), 'F', Item.getItemFromBlock(Blocks.furnace) });
 		addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off), 1), new Object[] { "BBB", "WFW", "RRR", 'B', BE.ingot(), 'R', ModItems.coil_tungsten, 'W', CU.plateCast(), 'F', Item.getItemFromBlock(Blocks.furnace) });
 		addRecipeAuto(new ItemStack(ModBlocks.red_wire_coated, 16), new Object[] { "WRW", "RIR", "WRW", 'W', ModItems.plate_polymer, 'I', MINGRADE.ingot(), 'R', MINGRADE.wireFine() });
@@ -280,8 +277,8 @@ public class CraftingManager {
 		//addRecipeAuto(new ItemStack(ModBlocks.machine_coal_off, 1), new Object[] { "STS", "SCS", "SFS", 'S', STEEL.ingot(), 'T', ModItems.tank_steel, 'C', MINGRADE.ingot(), 'F', Blocks.furnace });
 		addRecipeAuto(new ItemStack(ModBlocks.machine_wood_burner, 1), new Object[] { "PPP", "CFC", "I I" , 'P', STEEL.plate528(), 'C', ModItems.coil_copper, 'I', IRON.ingot(), 'F', Blocks.furnace});
 		addRecipeAuto(new ItemStack(ModBlocks.machine_turbine, 1), new Object[] { "SMS", "PTP", "SMS", 'S', STEEL.ingot(), 'T', ModItems.turbine_titanium, 'M', ModItems.coil_copper, 'P', ANY_PLASTIC.ingot() });
-		addRecipeAuto(new ItemStack(ModBlocks.machine_converter_he_rf, 1), new Object[] { "SSS", "CRB", "SSS", 'S', STEEL.ingot(), 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus, 'B', REDSTONE.block() });
+		addRecipeAuto(new ItemStack(ModBlocks.machine_converter_he_rf, 1), new Object[] { "RRR", "WWW", "III", 'R', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'W', REDSTONE.dust(), 'I', STEEL.ingot() });
-		addRecipeAuto(new ItemStack(ModBlocks.machine_converter_rf_he, 1), new Object[] { "SSS", "BRC", "SSS", 'S', BE.ingot(), 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus, 'B', REDSTONE.block() });
+		addRecipeAuto(new ItemStack(ModBlocks.machine_converter_rf_he, 1), new Object[] { "RRR", "WWW", "III", 'R', REDSTONE.dust(), 'W', MINGRADE.wireFine(), 'I', STEEL.ingot() });
 		addRecipeAuto(new ItemStack(ModBlocks.crate_template, 1), new Object[] { "IPI", "P P", "IPI", 'I', IRON.ingot(), 'P', Items.paper });
 		addRecipeAuto(new ItemStack(ModBlocks.crate_iron, 1), new Object[] { "PPP", "I I", "III", 'P', IRON.plate(), 'I', IRON.ingot() });
 		addRecipeAuto(new ItemStack(ModBlocks.crate_steel, 1), new Object[] { "PPP", "I I", "III", 'P', STEEL.plate(), 'I', STEEL.ingot() });
@@ -411,8 +408,8 @@ public class CraftingManager {
 			String dyeName = "dye" + dyes[15 - i];
 			addRecipeAuto(new ItemStack(ModBlocks.concrete_colored, 8, i), new Object[] { "CCC", "CDC", "CCC", 'C', ModBlocks.concrete_smooth, 'D', dyeName });
 		}
-		addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { ModBlocks.concrete_colored });
+		addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { new ItemStack(ModBlocks.concrete_colored, 1, OreDictionary.WILDCARD_VALUE) });
-		addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { ModBlocks.concrete_colored_ext });
+		addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { new ItemStack(ModBlocks.concrete_colored_ext, 1, OreDictionary.WILDCARD_VALUE) });
 		
 		addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.MACHINE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_BROWN, '2', KEY_GRAY });
 		addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.MACHINE_STRIPE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_BROWN, '2', KEY_BLACK });
@@ -581,12 +578,6 @@ public class CraftingManager {
 		addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_spark_cell_10000), new Object[] { "OSO", "SVS", "OSO", 'S', ModItems.singularity_spark, 'V', ItemBattery.getEmptyBattery(ModItems.battery_spark_cell_2500), 'O', ModItems.ingot_osmiridium });
 		addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_spark_cell_power), new Object[] { "YSY", "SCS", "YSY", 'S', ModItems.singularity_spark, 'C', ItemBattery.getEmptyBattery(ModItems.battery_spark_cell_10000), 'Y', ModItems.billet_yharonite });
 
-		addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su), new Object[] { "P", "R", "C", 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() });
-		addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su), new Object[] { "P", "C", "R", 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() });
-		addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su_l), new Object[] { " W ", "CPC", "RPR", 'W', AL.wireFine(), 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() });
-		addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su_l), new Object[] { " W ", "RPR", "CPC", 'W', AL.wireFine(), 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() });
-		addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su_l), new Object[] { " W ", "CPC", "RPR", 'W', CU.wireFine(), 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() });
-		addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su_l), new Object[] { " W ", "RPR", "CPC", 'W', CU.wireFine(), 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() });
 		addShapelessAuto(ItemBattery.getFullBattery(ModItems.battery_potato), new Object[] { Items.potato, AL.wireFine(), CU.wireFine() });
 		addShapelessAuto(ItemBattery.getFullBattery(ModItems.battery_potatos), new Object[] { ItemBattery.getFullBattery(ModItems.battery_potato), ModItems.turret_chip, REDSTONE.dust() });
 
@@ -632,9 +623,6 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.fluid_duct_neo, 8, 2), new Object[] { "ASA", "   ", "ASA", 'S', STEEL.plate(), 'A', AL.plate() });
 		addRecipeAuto(new ItemStack(ModBlocks.fluid_duct_paintable, 8), new Object[] { "SAS", "A A", "SAS", 'S', STEEL.ingot(), 'A', AL.plate() });
 		addShapelessAuto(new ItemStack(ModBlocks.fluid_duct_gauge), new Object[] { ModBlocks.fluid_duct_paintable, STEEL.ingot(), DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC) });
-		addRecipeAuto(new ItemStack(ModBlocks.fluid_duct, 8), new Object[] { "SAS", " D ", "SAS", 'S', STEEL.plate(), 'A', AL.plate(), 'D', ModItems.ducttape });
-		addShapelessAuto(new ItemStack(ModBlocks.fluid_duct_neo, 1, 0), new Object[] { ModBlocks.fluid_duct });
-		addRecipeAuto(new ItemStack(ModBlocks.fluid_duct_solid, 8), new Object[] { "SAS", "ADA", "SAS", 'S', STEEL.ingot(), 'A', AL.plate(), 'D', ModItems.ducttape });
 		addRecipeAuto(new ItemStack(ModBlocks.fluid_valve, 1), new Object[] { "S", "W", 'S', Blocks.lever, 'W', ModBlocks.fluid_duct_paintable });
 		addRecipeAuto(new ItemStack(ModBlocks.fluid_switch, 1), new Object[] { "S", "W", 'S', REDSTONE.dust(), 'W', ModBlocks.fluid_duct_paintable });
 		addRecipeAuto(new ItemStack(ModItems.template_folder, 1), new Object[] { "LPL", "BPB", "LPL", 'P', Items.paper, 'L', "dye", 'B', "dye" });
@@ -724,10 +712,6 @@ public class CraftingManager {
 
 		addShapelessAuto(new ItemStack(ModBlocks.fluid_duct_neo, 1), new Object[] { new ItemStack(ModItems.fluid_duct, 1, OreDictionary.WILDCARD_VALUE) });
 
-		addShapelessAuto(new ItemStack(ModItems.redstone_depleted, 1), new Object[] { new ItemStack(ModItems.battery_su, 1, OreDictionary.WILDCARD_VALUE) });
-		addShapelessAuto(new ItemStack(ModItems.redstone_depleted, 2), new Object[] { new ItemStack(ModItems.battery_su_l, 1, OreDictionary.WILDCARD_VALUE) });
-		addShapelessAuto(new ItemStack(Items.redstone, 1), new Object[] { ModItems.redstone_depleted, ModItems.redstone_depleted });
-
 		addRecipeAuto(new ItemStack(Blocks.torch, 3), new Object[] { "L", "S", 'L', LIGNITE.gem(), 'S', KEY_STICK });
 		addRecipeAuto(new ItemStack(Blocks.torch, 8), new Object[] { "L", "S", 'L', ANY_COKE.gem(), 'S', KEY_STICK });
 

src/main/java/com/hbm/main/MainRegistry.java

@@ -137,7 +137,6 @@ public class MainRegistry {
 	public static ToolMaterial enumToolMaterialMultitool = EnumHelper.addToolMaterial("MULTITOOL", 3, 5000, 25F, 5.5F, 25);
 
 	// Armor Materials
-	public static ArmorMaterial enumArmorMaterialEmerald = EnumHelper.addArmorMaterial("HBM_TEST", 2500, new int[] { 3, 8, 6, 3 }, 30);
 	public static ArmorMaterial aMatSchrab = EnumHelper.addArmorMaterial("HBM_SCHRABIDIUM", 100, new int[] { 3, 8, 6, 3 }, 50);
 	public static ArmorMaterial aMatEuph = EnumHelper.addArmorMaterial("HBM_EUPHEMIUM", 15000000, new int[] { 3, 8, 6, 3 }, 100);
 	public static ArmorMaterial aMatHaz = EnumHelper.addArmorMaterial("HBM_HAZMAT", 60, new int[] { 2, 5, 4, 1 }, 5);
@@ -878,7 +877,10 @@ public class MainRegistry {
 		proxy.registerMissileItems();
 		
 		BlockMotherOfAllOres.init();
-		
+
+		// Load compatibility for OC.
+		CompatHandler.init();
+
 		//expand for the largest entity we have (currently Quackos who is 17.5m in diameter, that's one fat duck)
 		World.MAX_ENTITY_RADIUS = Math.max(World.MAX_ENTITY_RADIUS, 8.75);
 
@@ -1364,6 +1366,61 @@ public class MainRegistry {
 		ignoreMappings.add("hbm:item.circuit_targeting_tier4");
 		ignoreMappings.add("hbm:item.circuit_targeting_tier5");
 		ignoreMappings.add("hbm:item.circuit_targeting_tier6");
+		ignoreMappings.add("hbm:tile.fluid_duct");
+		ignoreMappings.add("hbm:tile.fluid_duct_solid");
+		ignoreMappings.add("hbm:item.void_anim");
+		ignoreMappings.add("hbm:item.pellet_mercury");
+		ignoreMappings.add("hbm:item.pellet_meteorite");
+		ignoreMappings.add("hbm:item.d_smoke1");
+		ignoreMappings.add("hbm:item.d_smoke2");
+		ignoreMappings.add("hbm:item.d_smoke3");
+		ignoreMappings.add("hbm:item.d_smoke4");
+		ignoreMappings.add("hbm:item.d_smoke5");
+		ignoreMappings.add("hbm:item.d_smoke6");
+		ignoreMappings.add("hbm:item.d_smoke7");
+		ignoreMappings.add("hbm:item.d_smoke8");
+		ignoreMappings.add("hbm:item.smoke1");
+		ignoreMappings.add("hbm:item.smoke2");
+		ignoreMappings.add("hbm:item.smoke3");
+		ignoreMappings.add("hbm:item.smoke4");
+		ignoreMappings.add("hbm:item.smoke5");
+		ignoreMappings.add("hbm:item.smoke6");
+		ignoreMappings.add("hbm:item.smoke7");
+		ignoreMappings.add("hbm:item.smoke8");
+		ignoreMappings.add("hbm:item.battery_su");
+		ignoreMappings.add("hbm:item.battery_su_l");
+		ignoreMappings.add("hbm:item.redstone_depleted");
+		ignoreMappings.add("hbm:item.euphemium_stopper");
+		ignoreMappings.add("hbm:item.energy_ball");
+		ignoreMappings.add("hbm:item.discharge");
+		ignoreMappings.add("hbm:item.empblast");
+		ignoreMappings.add("hbm:tile.crystal_power");
+		ignoreMappings.add("hbm:tile.crystal_energy");
+		ignoreMappings.add("hbm:tile.crystal_robust");
+		ignoreMappings.add("hbm:tile.crystal_trixite");
+		ignoreMappings.add("hbm:tile.hazmat");
+		ignoreMappings.add("hbm:item.pellet_coal");
+		ignoreMappings.add("hbm:item.test_helmet");
+		ignoreMappings.add("hbm:item.test_chestplate");
+		ignoreMappings.add("hbm:item.test_leggings");
+		ignoreMappings.add("hbm:item.test_boots");
+		ignoreMappings.add("hbm:item.cape_test");
+		ignoreMappings.add("hbm:item.spill1");
+		ignoreMappings.add("hbm:item.spill2");
+		ignoreMappings.add("hbm:item.spill3");
+		ignoreMappings.add("hbm:item.spill4");
+		ignoreMappings.add("hbm:item.spill5");
+		ignoreMappings.add("hbm:item.spill6");
+		ignoreMappings.add("hbm:item.spill7");
+		ignoreMappings.add("hbm:item.spill8");
+		ignoreMappings.add("hbm:item.gas1");
+		ignoreMappings.add("hbm:item.gas2");
+		ignoreMappings.add("hbm:item.gas3");
+		ignoreMappings.add("hbm:item.gas4");
+		ignoreMappings.add("hbm:item.gas5");
+		ignoreMappings.add("hbm:item.gas6");
+		ignoreMappings.add("hbm:item.gas7");
+		ignoreMappings.add("hbm:item.gas8");
 		
 		/// REMAP ///
 		remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

src/main/java/com/hbm/packet/PacketDispatcher.java

@@ -15,8 +15,6 @@ public class PacketDispatcher {
 	{
 		int i = 0;
 		
-		//Fluid packet for GUI
-		wrapper.registerMessage(TEFluidPacket.Handler.class, TEFluidPacket.class, i++, Side.CLIENT);
 		//Sound packet that keeps client and server separated
 		wrapper.registerMessage(LoopedSoundPacket.Handler.class, LoopedSoundPacket.class, i++, Side.CLIENT);
 		//Signals server to consume items and create template

src/main/java/com/hbm/packet/TEFluidPacket.java

@@ -1,73 +0,0 @@
-package com.hbm.packet;
-
-import com.hbm.interfaces.IFluidContainer;
-import com.hbm.inventory.fluid.FluidType;
-import com.hbm.inventory.fluid.Fluids;
-
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
-import net.minecraft.tileentity.TileEntity;
-
-@Deprecated
-public class TEFluidPacket implements IMessage {
-
-	int x;
-	int y;
-	int z;
-	int fill;
-	int index;
-	int type;
-
-	public TEFluidPacket() { }
-
-	public TEFluidPacket(int x, int y, int z, int fill, int index, FluidType type)
-	{
-		this.x = x;
-		this.y = y;
-		this.z = z;
-		this.fill = fill;
-		this.index = index;
-		this.type = type.getID();
-	}
-
-	@Override
-	public void fromBytes(ByteBuf buf) {
-		x = buf.readInt();
-		y = buf.readInt();
-		z = buf.readInt();
-		fill = buf.readInt();
-		index = buf.readInt();
-		type = buf.readInt();
-	}
-
-	@Override
-	public void toBytes(ByteBuf buf) {
-		buf.writeInt(x);
-		buf.writeInt(y);
-		buf.writeInt(z);
-		buf.writeInt(fill);
-		buf.writeInt(index);
-		buf.writeInt(type);
-	}
-
-	public static class Handler implements IMessageHandler<TEFluidPacket, IMessage> {
-		
-		@Override
-		public IMessage onMessage(TEFluidPacket m, MessageContext ctx) {
-			try{
-			TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z);
-
-			if (te != null && te instanceof IFluidContainer) {
-					
-				IFluidContainer gen = (IFluidContainer) te;
-				gen.setFillForSync(m.fill, m.index);
-				gen.setTypeForSync(Fluids.fromID(m.type), m.index);
-			}
-			} catch(Exception x) { }
-			return null;
-		}
-	}
-}