Strap on your setbelts, this is going to be a turbulent merge

com/hbm/explosion/ExplosionNukeGeneric.java

@@ -269,11 +269,15 @@ public class ExplosionNukeGeneric {
 					// entity.boundingBox);
 					// if(d10 > 0) isOccupied = true;
 					double d11 = (1.0D - d4);// * d10;
-					
+
 					if(entity instanceof EntityItem && ((EntityItem)entity).getEntityItem().getItem() == ModItems.flame_pony) {
 						entity.setDead();
 						return true;
 					}
+					if(entity instanceof EntityItem && ((EntityItem)entity).getEntityItem().getItem() == ModItems.pellet_antimatter) {
+						entity.setDead();
+						return true;
+					}
 						
 					if (!(entity instanceof EntityPlayerMP
 							&& ((EntityPlayerMP) entity).theItemInWorldManager.getGameType() == GameType.CREATIVE)) {

com/hbm/handler/MultiblockHandler.java

@@ -48,10 +48,10 @@ public class MultiblockHandler {
 	public static final int[] wellDimension  = new int[] { 1, 1, 5, 0, 1, 1 };
 	public static final int[] flareDimension  = new int[] { 1, 1, 9, 0, 1, 1 };
 	public static final int[] drillDimension  = new int[] { 1, 1, 3, 0, 1, 1 };
-	public static final int[] assemblerDimensionNorth = new int[] { 2, 1, 2, 0, 1, 2 };
-	public static final int[] assemblerDimensionEast  = new int[] { 2, 1, 2, 0, 2, 1 };
-	public static final int[] assemblerDimensionSouth = new int[] { 1, 2, 2, 0, 2, 1 };
-	public static final int[] assemblerDimensionWest  = new int[] { 1, 2, 2, 0, 1, 2 };
+	public static final int[] assemblerDimensionNorth = new int[] { 2, 1, 1, 0, 1, 2 };
+	public static final int[] assemblerDimensionEast  = new int[] { 2, 1, 1, 0, 2, 1 };
+	public static final int[] assemblerDimensionSouth = new int[] { 1, 2, 1, 0, 2, 1 };
+	public static final int[] assemblerDimensionWest  = new int[] { 1, 2, 1, 0, 1, 2 };
 	public static final int[] chemplantDimensionNorth = new int[] { 2, 1, 2, 0, 1, 2 };
 	public static final int[] chemplantDimensionEast  = new int[] { 2, 1, 2, 0, 2, 1 };
 	public static final int[] chemplantDimensionSouth = new int[] { 1, 2, 2, 0, 2, 1 };

com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;

com/hbm/handler/nei/AssemblerRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.Arrays;

com/hbm/handler/nei/CMBFurnaceRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.Arrays;

com/hbm/handler/nei/CentrifugeRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;

com/hbm/handler/nei/CyclotronRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.Arrays;

com/hbm/handler/nei/ModInfoHandler.java

@@ -0,0 +1,102 @@
+package com.hbm.handler.nei;
+
+import java.awt.Rectangle;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import com.hbm.handler.nei.CyclotronRecipeHandler.SmeltingSet;
+import com.hbm.inventory.MachineRecipes;
+import com.hbm.inventory.gui.GUIMachineCyclotron;
+import com.hbm.lib.RefStrings;
+
+import codechicken.nei.NEIServerUtils;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.api.IOverlayHandler;
+import codechicken.nei.api.IRecipeOverlayRenderer;
+import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.ICraftingHandler;
+import codechicken.nei.recipe.TemplateRecipeHandler;
+import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;
+import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
+
+public class ModInfoHandler extends TemplateRecipeHandler {
+
+    public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe
+    {
+        PositionedStack item;
+    	
+        public SmeltingSet(ItemStack item) {
+        	item.stackSize = 1;
+            this.item = new PositionedStack(item, 129, 24);
+        }
+
+        @Override
+		public List<PositionedStack> getIngredients() {
+            return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {item}));
+        }
+
+        @Override
+		public PositionedStack getResult() {
+            return item;
+        }
+    }
+    
+	@Override
+	public String getRecipeName() {
+		return "Cyclotron";
+	}
+
+	@Override
+	public String getGuiTexture() {
+		return RefStrings.MODID + ":textures/gui/gui_info.png";
+	}
+	
+	@Override
+	public void loadCraftingRecipes(String outputId, Object... results) {
+		if ((outputId.equals("hbminfo")) && getClass() == ModInfoHandler.class) {
+			Map<Object, Object[]> recipes = MachineRecipes.instance().getItemInfo();
+			for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
+				this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey()));
+			}
+		} else {
+			super.loadCraftingRecipes(outputId, results);
+		}
+	}
+
+	@Override
+	public void loadCraftingRecipes(ItemStack result) {
+		Map<Object, Object[]> recipes = MachineRecipes.instance().getItemInfo();
+		for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
+			if (NEIServerUtils.areStacksSameType((ItemStack)recipe.getKey(), result))
+				this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey()));
+		}
+	}
+
+	@Override
+	public void loadUsageRecipes(String inputId, Object... ingredients) {
+		if ((inputId.equals("hbminfo")) && getClass() == ModInfoHandler.class) {
+			loadCraftingRecipes("hbminfo", new Object[0]);
+		} else {
+			super.loadUsageRecipes(inputId, ingredients);
+		}
+	}
+
+	@Override
+	public void loadUsageRecipes(ItemStack ingredient) {
+		Map<Object, Object[]> recipes = MachineRecipes.instance().getItemInfo();
+		for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
+			if (NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()))
+				this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey()));				
+		}
+	}
+
+    @Override
+    public TemplateRecipeHandler newInstance() {
+        return super.newInstance();
+    }
+}

com/hbm/handler/nei/ReactorRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;

com/hbm/handler/nei/RefineryRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;

com/hbm/handler/nei/ShredderRecipeHandler.java

@@ -1,4 +1,4 @@
-package com.hbm.handler;
+package com.hbm.handler.nei;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;

com/hbm/inventory/MachineRecipes.java

@@ -2685,4 +2685,11 @@ public class MachineRecipes {
 		
 		return input;
 	}
+	
+	public Map<Object, Object[]> getItemInfo() {
+		Map<Object, Object[]> map = new HashMap<Object, Object[]>();
+		map.put(new ItemStack(ModBlocks.asphalt), new String[] {"test", "test"});
+		
+		return map;
+	}
 }

com/hbm/items/ModItems.java

@@ -184,12 +184,26 @@ public class ModItems {
 
 	public static Item powder_dura_steel;
 	public static Item powder_polymer;
+	
 	public static Item powder_lithium_tiny;
+	public static Item powder_neodymium_tiny;
+	public static Item powder_caesium_tiny;
 	public static Item powder_cobalt_tiny;
+	public static Item powder_niobium_tiny;
+	public static Item powder_cerium_tiny;
+	public static Item powder_lanthanium_tiny;
+	public static Item powder_actinium_tiny;
 
 	public static Item powder_lanthanium;
 	public static Item powder_actinium;
 	public static Item powder_desh;
+
+	public static Item fragment_neodymium;
+	public static Item fragment_caesium;
+	public static Item fragment_niobium;
+	public static Item fragment_cerium;
+	public static Item fragment_lanthanium;
+	public static Item fragment_actinium;
 	
 	public static Item coil_copper;
 	public static Item coil_copper_torus;
@@ -329,6 +343,7 @@ public class ModItems {
 	public static Item cell_sas3;
 	public static Item cell_antimatter;
 	public static Item cell_anti_schrabidium;
+	public static Item pellet_antimatter;
 	public static Item singularity;
 	public static Item singularity_counter_resonant;
 	public static Item singularity_super_heated;
@@ -1253,6 +1268,7 @@ public class ModItems {
 		singularity_counter_resonant = new ItemDrop().setUnlocalizedName("singularity_counter_resonant").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_alt");
 		singularity_super_heated = new ItemDrop().setUnlocalizedName("singularity_super_heated").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_5");
 		black_hole = new ItemDrop().setUnlocalizedName("black_hole").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_4");
+		pellet_antimatter = new ItemDrop().setUnlocalizedName("pellet_antimatter").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":pellet_antimatter");
 		crystal_xen = new ItemDrop().setUnlocalizedName("crystal_xen").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":crystal_xen");
 		inf_water = new Item().setUnlocalizedName("inf_water").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_water");
 		inf_coolant = new Item().setUnlocalizedName("inf_coolant").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_coolant");
@@ -2236,6 +2252,7 @@ public class ModItems {
 		GameRegistry.registerItem(singularity_super_heated, singularity_super_heated.getUnlocalizedName());
 		GameRegistry.registerItem(black_hole, black_hole.getUnlocalizedName());
 		GameRegistry.registerItem(crystal_xen, crystal_xen.getUnlocalizedName());
+		GameRegistry.registerItem(pellet_antimatter, pellet_antimatter.getUnlocalizedName());
 		
 		//Infinite Tanks
 		GameRegistry.registerItem(inf_water, inf_water.getUnlocalizedName());

com/hbm/items/special/ItemDrop.java

@@ -6,6 +6,7 @@ import com.hbm.entity.effect.EntityBlackHole;
 import com.hbm.entity.effect.EntityCloudFleija;
 import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
 import com.hbm.explosion.ExplosionChaos;
+import com.hbm.explosion.ExplosionLarge;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
 
@@ -29,6 +30,12 @@ public class ItemDrop extends Item {
 								entityItem.posZ, 10.0F, true);
 					}
 				}
+				if (stack.getItem() != null && stack.getItem() == ModItems.pellet_antimatter) {
+					if (!entityItem.worldObj.isRemote) {
+						ExplosionLarge.explodeFire(entityItem.worldObj, entityItem.posX, entityItem.posY,
+								entityItem.posZ, 100, true, true, true);
+					}
+				}
 				if (stack.getItem() != null && stack.getItem() == ModItems.cell_anti_schrabidium) {
 					if (!entityItem.worldObj.isRemote) {
 						entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ,
@@ -151,6 +158,10 @@ public class ItemDrop extends Item {
 			list.add("Warning: Exposure to matter will");
 			list.add("lead to violent annihilation!");
 		}
+		if (itemstack.getItem() != null && itemstack.getItem() == ModItems.pellet_antimatter) {
+			list.add("Very heavy antimatter cluster.");
+			list.add("Gets rid of black holes.");
+		}
 		if (itemstack.getItem() != null && itemstack.getItem() == ModItems.cell_anti_schrabidium) {
 			list.add("Warning: Exposure to matter will");
 			list.add("create a fólkvangr field!");

com/hbm/main/NEIConfig.java

@@ -1,14 +1,15 @@
 package com.hbm.main;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.AlloyFurnaceRecipeHandler;
-import com.hbm.handler.AssemblerRecipeHandler;
-import com.hbm.handler.CMBFurnaceRecipeHandler;
-import com.hbm.handler.CentrifugeRecipeHandler;
-import com.hbm.handler.CyclotronRecipeHandler;
-import com.hbm.handler.ReactorRecipeHandler;
-import com.hbm.handler.RefineryRecipeHandler;
-import com.hbm.handler.ShredderRecipeHandler;
+import com.hbm.handler.nei.AlloyFurnaceRecipeHandler;
+import com.hbm.handler.nei.AssemblerRecipeHandler;
+import com.hbm.handler.nei.CMBFurnaceRecipeHandler;
+import com.hbm.handler.nei.CentrifugeRecipeHandler;
+import com.hbm.handler.nei.CyclotronRecipeHandler;
+import com.hbm.handler.nei.ModInfoHandler;
+import com.hbm.handler.nei.ReactorRecipeHandler;
+import com.hbm.handler.nei.RefineryRecipeHandler;
+import com.hbm.handler.nei.ShredderRecipeHandler;
 import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
 
@@ -37,6 +38,8 @@ public class NEIConfig implements IConfigureNEI {
 		API.registerUsageHandler(new AssemblerRecipeHandler());
 		API.registerRecipeHandler(new RefineryRecipeHandler());
 		API.registerUsageHandler(new RefineryRecipeHandler());
+		API.registerRecipeHandler(new ModInfoHandler());
+		API.registerUsageHandler(new ModInfoHandler());
 
 		//Some things are even beyond my control...or are they?
 		API.hideItem(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_coal_on)));

com/hbm/render/tileentity/RenderChemplant.java

@@ -24,7 +24,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer {
 	public RenderChemplant()
     {
 		bodyModel = AdvancedModelLoader.loadModel(body);
-		bodyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGenRotor.png");
+		bodyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/chemplant.png");
 		boltModel = AdvancedModelLoader.loadModel(bolt);
 		boltTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGenRotor.png");
     }

com/hbm/render/tileentity/RenderRefinery.java

@@ -19,7 +19,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer {
 	public RenderRefinery()
     {
 		genModel = AdvancedModelLoader.loadModel(body);
-		genTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
+		genTexture = new ResourceLocation(RefStrings.MODID, "textures/models/refinery.png");
     }
 
     @Override