the malicious gigglefish from the silly dimension

changelog

@@ -14,6 +14,8 @@
   * Rotary engine (1 ID)
   * FWatz (8 IDs)
   * Meteorite ores (10 IDs)
+  * Tiny nuclear rector (1 ID)
+* The small oil heaters are no longer craftable and the NEI handler has been removed, however existing ones can still be used
 * The loot pool for meteorite treasure blocks has been updated
   * Treasures are no longer senselessly progression breaking, radioactive or plain stupid (whole-ass machines inside meteorites)
   * The treasure now consists of mainly some rarer earlygame ingots, circuits, some gear, a small selection of armor mods and alexandrite (rare)

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

@@ -690,8 +690,6 @@ public class ModBlocks {
 	public static Block machine_rtg_furnace_off;
 	public static Block machine_rtg_furnace_on;
 	
-	public static Block machine_generator;
-
 	public static Block machine_industrial_generator;
 
 	public static Block machine_cyclotron;
@@ -895,6 +893,9 @@ public class ModBlocks {
 	public static Block plasma_heater;
 
 	public static Block icf;
+	public static Block icf_controller;
+	public static Block icf_laser_component;
+	public static Block icf_block;
 
 	public static Block watz;
 	public static Block watz_pump;
@@ -1798,8 +1799,7 @@ public class ModBlocks {
 		machine_rtg_furnace_off = new MachineRtgFurnace(false).setBlockName("machine_rtg_furnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		machine_rtg_furnace_on = new MachineRtgFurnace(true).setBlockName("machine_rtg_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F);
 
-		machine_generator = new MachineGenerator(Material.iron).setBlockName("machine_generator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null);
-		machine_industrial_generator = new MachineIGenerator(Material.iron).setBlockName("machine_industrial_generator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":industrial_generator");
+		machine_industrial_generator = new MachineIGenerator(Material.iron).setBlockName("machine_industrial_generator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName("gold_block");
 		machine_cyclotron = new MachineCyclotron(Material.iron).setBlockName("machine_cyclotron").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cyclotron");
 		machine_exposure_chamber = new MachineExposureChamber(Material.iron).setBlockName("machine_exposure_chamber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_aluminium");
 		machine_radgen = new MachineRadGen(Material.iron).setBlockName("machine_radgen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_radgen");
@@ -2010,6 +2010,7 @@ public class ModBlocks {
 		plasma_heater = new MachinePlasmaHeater().setBlockName("plasma_heater").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":plasma_heater");
 		
 		icf = new MachineICF().setBlockName("icf").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
+		icf_laser_component = new BlockICFLaserComponent().setBlockName("icf_laser_component").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab);
 
 		watz_element = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_element_top").setBlockName("watz_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_element_side");
 		watz_control = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_control_top").setBlockName("watz_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_control_side");
@@ -3049,7 +3050,6 @@ public class ModBlocks {
 		register(machine_wood_burner);
 		register(machine_diesel);
 		register(machine_combustion_engine);
-		GameRegistry.registerBlock(machine_generator, machine_generator.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_controller, machine_controller.getUnlocalizedName());
 		GameRegistry.registerBlock(reactor_research, reactor_research.getUnlocalizedName());
 		GameRegistry.registerBlock(reactor_zirnox, reactor_zirnox.getUnlocalizedName());
@@ -3341,7 +3341,8 @@ public class ModBlocks {
 		GameRegistry.registerBlock(iter, iter.getUnlocalizedName());
 		GameRegistry.registerBlock(plasma_heater, plasma_heater.getUnlocalizedName());
 		
-		GameRegistry.registerBlock(icf, icf.getUnlocalizedName());
+		register(icf_laser_component);
+		register(icf);
 
 		GameRegistry.registerBlock(watz_element, watz_element.getUnlocalizedName());
 		GameRegistry.registerBlock(watz_control, watz_control.getUnlocalizedName());

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

@@ -0,0 +1,54 @@
+package com.hbm.blocks.machine;
+
+import com.hbm.blocks.BlockEnumMulti;
+import com.hbm.lib.RefStrings;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class BlockICFLaserComponent extends BlockEnumMulti {
+	
+	protected IIcon[] iconsTop;
+
+	public BlockICFLaserComponent() {
+		super(Material.iron, EnumICFPart.class, true, true);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister reg) {
+		
+		Enum[] enums = theEnum.getEnumConstants();
+		this.icons = new IIcon[enums.length];
+		this.iconsTop = new IIcon[enums.length];
+
+		this.icons[0] = this.iconsTop[0] = reg.registerIcon(RefStrings.MODID + ":icf_casing");
+		this.icons[1] = this.iconsTop[1] = reg.registerIcon(RefStrings.MODID + ":icf_cell");
+		this.icons[2] = this.iconsTop[2] = reg.registerIcon(RefStrings.MODID + ":icf_emitter");
+		this.icons[3] = reg.registerIcon(RefStrings.MODID + ":icf_capacitor_side");
+		this.icons[4] = reg.registerIcon(RefStrings.MODID + ":icf_turbocharger");
+		this.iconsTop[3] = this.iconsTop[4] = reg.registerIcon(RefStrings.MODID + ":icf_capacitor_top");
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int meta) {
+		return side == 0 || side == 1 ? this.iconsTop[meta % this.iconsTop.length] : this.icons[meta % this.icons.length];
+	}
+
+	@Override
+	public int getSubCount() {
+		return 5;
+	}
+	
+	public static enum EnumICFPart {
+		CASING,
+		CELL,
+		EMITTER,
+		CAPACITOR,
+		TURBO
+	}
+}

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

@@ -1,42 +0,0 @@
-package com.hbm.blocks.machine;
-
-import java.util.Random;
-
-import com.hbm.items.ModItems;
-import com.hbm.lib.RefStrings;
-
-import cpw.mods.fml.relauncher.Side;
-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.item.Item;
-import net.minecraft.util.IIcon;
-
-public class MachineGenerator extends Block {
-
-	@SideOnly(Side.CLIENT)
-	private IIcon iconSide;
-
-	public MachineGenerator(Material p_i45386_1_) {
-		super(p_i45386_1_);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister iconRegister) {
-		this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_generator_side");
-		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_generator");
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int metadata) {
-		return side == 0 ? blockIcon : (side == 1 ? blockIcon : iconSide);
-	}
-
-	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
-		return ModItems.circuit_targeting_tier3;
-	}
-}

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

@@ -6,7 +6,6 @@ import java.util.List;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.inventory.gui.GUIScreenRadioTorchLogic;
 import com.hbm.lib.RefStrings;
-import com.hbm.tileentity.network.TileEntityRadioTorchBase;
 import com.hbm.tileentity.network.TileEntityRadioTorchLogic;
 import com.hbm.util.I18nUtil;
 

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

@@ -1,127 +0,0 @@
-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.inventory.gui.GUIMachineBoiler;
-import com.hbm.inventory.gui.GUIMachineBoilerElectric;
-import com.hbm.inventory.recipes.MachineRecipes;
-import com.hbm.lib.RefStrings;
-
-import codechicken.nei.PositionedStack;
-import codechicken.nei.recipe.TemplateRecipeHandler;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-
-public class BoilerRecipeHandler extends TemplateRecipeHandler {
-
-	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
-	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
-	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();
-	public LinkedList<Class<? extends GuiContainer>> guiGui = new LinkedList<Class<? extends GuiContainer>>();
-
-	public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe {
-		PositionedStack input;
-		PositionedStack result;
-
-		public SmeltingSet(ItemStack input, ItemStack result) {
-			input.stackSize = 1;
-			this.input = new PositionedStack(input, 21 + 9, 6 + 18);
-			this.result = new PositionedStack(result, 120, 24);
-		}
-
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] { input }));
-		}
-
-		@Override
-		public PositionedStack getResult() {
-			return result;
-		}
-	}
-
-	@Override
-	public String getRecipeName() {
-		return "Boiler";
-	}
-
-	@Override
-	public String getGuiTexture() {
-		return RefStrings.MODID + ":textures/gui/nei/gui_nei_boiler.png";
-	}
-
-	@Override
-	public Class<? extends GuiContainer> getGuiClass() {
-		return null;
-	}
-
-	@Override
-	public TemplateRecipeHandler newInstance() {
-		return super.newInstance();
-	}
-
-	@Override
-	public void loadCraftingRecipes(String outputId, Object... results) {
-		if((outputId.equals("ntmboiler")) && getClass() == BoilerRecipeHandler.class) {
-			Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes();
-			for(Map.Entry<Object, Object> recipe : recipes.entrySet()) {
-				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()));
-			}
-		} else {
-			super.loadCraftingRecipes(outputId, results);
-		}
-	}
-
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes();
-		for(Map.Entry<Object, Object> recipe : recipes.entrySet()) {
-			if(compareFluidStacks((ItemStack) recipe.getValue(), result) || compareFluidStacks((ItemStack) recipe.getValue(), result))
-				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()));
-		}
-	}
-
-	@Override
-	public void loadUsageRecipes(String inputId, Object... ingredients) {
-		if((inputId.equals("ntmboiler")) && getClass() == BoilerRecipeHandler.class) {
-			loadCraftingRecipes("ntmboiler", new Object[0]);
-		} else {
-			super.loadUsageRecipes(inputId, ingredients);
-		}
-	}
-
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes();
-		for(Map.Entry<Object, Object> recipe : recipes.entrySet()) {
-			if(compareFluidStacks(ingredient, (ItemStack) recipe.getKey()))
-				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()));
-		}
-	}
-
-	private boolean compareFluidStacks(ItemStack sta1, ItemStack sta2) {
-		return sta1.getItem() == sta2.getItem() && sta1.getItemDamage() == sta2.getItemDamage();
-	}
-
-	@Override
-	public void drawExtras(int recipe) {
-		drawProgressBar(80, 23, 0, 85, 6, 17, 240, 3);
-	}
-
-	@Override
-	public void loadTransferRects() {
-		transferRectsGui = new LinkedList<RecipeTransferRect>();
-		guiGui = new LinkedList<Class<? extends GuiContainer>>();
-
-		transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27 - 9, 23, 36, 18), "ntmboiler"));
-		transferRectsGui.add(new RecipeTransferRect(new Rectangle(18 * 2 + 2 + 36, 89 - 29 - 18 - 18, 18, 18 * 2), "ntmboiler"));
-		guiGui.add(GUIMachineBoiler.class);
-		guiGui.add(GUIMachineBoilerElectric.class);
-		RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects);
-		RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui);
-	}
-}

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

@@ -6,20 +6,16 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.container.ContainerCounterTorch;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
-import com.hbm.tileentity.network.TileEntityRadioTorchCounter;
 import com.hbm.tileentity.network.TileEntityRadioTorchLogic;
-import com.hbm.tileentity.network.TileEntityRadioTorchSender;
 import com.hbm.util.I18nUtil;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 

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

@@ -55,15 +55,6 @@ public class MachineRecipes {
 	 * this is the smoldering crater where once the 2016 shredder recipe code was
 	 */
 
-	public Map<Object[], Object> getCMBRecipes() {
-		Map<Object[], Object> recipes = new HashMap<Object[], Object>();
-		recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_advanced_alloy), new ItemStack(ModItems.ingot_magnetized_tungsten) },
-				new ItemStack(ModItems.ingot_combine_steel, 4));
-		recipes.put(new ItemStack[] { new ItemStack(ModItems.powder_advanced_alloy), new ItemStack(ModItems.powder_magnetized_tungsten) },
-				new ItemStack(ModItems.ingot_combine_steel, 4));
-		return recipes;
-	}
-
 	public ArrayList<ItemStack> getBatteries() {
 		ArrayList<ItemStack> fuels = new ArrayList<ItemStack>();
 		fuels.add(new ItemStack(ModItems.battery_potato));
@@ -144,31 +135,6 @@ public class MachineRecipes {
 		return false;
 	}
 	
-	
-	public Map<Object, Object> getBoilerRecipes() {
-
-		Map<Object, Object> recipes = new HashMap<Object, Object>();
-		
-		for(int i = 0; i < Fluids.getAll().length; i++) {
-			Object[] outs = getBoilerOutput(Fluids.fromID(i));
-			
-			if(outs != null) {
-
-				ItemStack in = new ItemStack(ModItems.fluid_icon, 1, i);
-				in.stackTagCompound = new NBTTagCompound();
-				in.stackTagCompound.setInteger("fill", (Integer) outs[2]);
-				
-				ItemStack out = new ItemStack(ModItems.fluid_icon, 1, ((FluidType)outs[0]).getID());
-				out.stackTagCompound = new NBTTagCompound();
-				out.stackTagCompound.setInteger("fill", (Integer) outs[1]);
-				
-				recipes.put(in, out);
-			}
-		}
-		
-		return recipes;
-	}
-	
 	public Map<Object, Object> getFluidContainers() {
 		Map<Object, Object> map = new HashMap<Object, Object>();
 		

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

@@ -293,8 +293,6 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.capacitor_schrabidate, 1), new Object[] { "PPP", "ICI", "WWW", 'P', STEEL.plate(), 'I', ANY_RESISTANTALLOY.ingot(), 'C', SBD.block(), 'W', STEEL.ingot() });
 		//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_boiler_off, 1), new Object[] { "SPS", "TFT", "SPS", 'S', STEEL.ingot(), 'P', CU.plateCast(), 'T', ModItems.tank_steel, 'F', Blocks.furnace });
-		addRecipeAuto(new ItemStack(ModBlocks.machine_boiler_electric_off, 1), new Object[] { "SPS", "TFT", "SPS", 'S', DESH.ingot(), 'P', CU.plateCast(), 'T', ModItems.tank_steel, 'F', ModBlocks.machine_electric_furnace_off });
 		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_rf_he, 1), new Object[] { "SSS", "BRC", "SSS", 'S', BE.ingot(), 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus, 'B', REDSTONE.block() });

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

@@ -1327,6 +1327,7 @@ public class MainRegistry {
 		ignoreMappings.add("hbm:tile.ore_meteor_lead");
 		ignoreMappings.add("hbm:tile.ore_meteor_lithium");
 		ignoreMappings.add("hbm:tile.ore_meteor_starmetal");
+		ignoreMappings.add("hbm:tile.machine_generator");
 		
 		/// REMAP ///
 		remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

src/main/java/com/hbm/main/NEIRegistry.java

@@ -5,53 +5,7 @@ import java.util.List;
 
 import com.hbm.config.CustomMachineConfigJSON;
 import com.hbm.config.VersatileConfig;
-import com.hbm.handler.nei.AlloyFurnaceRecipeHandler;
-import com.hbm.handler.nei.AnvilRecipeHandler;
-import com.hbm.handler.nei.ArcWelderHandler;
-import com.hbm.handler.nei.AshpitHandler;
-import com.hbm.handler.nei.AssemblerRecipeHandler;
-import com.hbm.handler.nei.BoilerRecipeHandler;
-import com.hbm.handler.nei.BoilingHandler;
-import com.hbm.handler.nei.BookRecipeHandler;
-import com.hbm.handler.nei.BreederRecipeHandler;
-import com.hbm.handler.nei.CentrifugeRecipeHandler;
-import com.hbm.handler.nei.ChemplantRecipeHandler;
-import com.hbm.handler.nei.CokingHandler;
-import com.hbm.handler.nei.CombinationHandler;
-import com.hbm.handler.nei.ConstructionHandler;
-import com.hbm.handler.nei.CrackingHandler;
-import com.hbm.handler.nei.CrucibleAlloyingHandler;
-import com.hbm.handler.nei.CrucibleCastingHandler;
-import com.hbm.handler.nei.CrucibleSmeltingHandler;
-import com.hbm.handler.nei.CrystallizerRecipeHandler;
-import com.hbm.handler.nei.CustomMachineHandler;
-import com.hbm.handler.nei.CyclotronRecipeHandler;
-import com.hbm.handler.nei.ElectrolyserFluidHandler;
-import com.hbm.handler.nei.ElectrolyserMetalHandler;
-import com.hbm.handler.nei.ExposureChamberHandler;
-import com.hbm.handler.nei.FluidRecipeHandler;
-import com.hbm.handler.nei.FractioningHandler;
-import com.hbm.handler.nei.FuelPoolHandler;
-import com.hbm.handler.nei.FusionRecipeHandler;
-import com.hbm.handler.nei.GasCentrifugeRecipeHandler;
-import com.hbm.handler.nei.HadronRecipeHandler;
-import com.hbm.handler.nei.HydrotreatingHandler;
-import com.hbm.handler.nei.LiquefactionHandler;
-import com.hbm.handler.nei.MixerHandler;
-import com.hbm.handler.nei.OutgasserHandler;
-import com.hbm.handler.nei.PressRecipeHandler;
-import com.hbm.handler.nei.RTGRecipeHandler;
-import com.hbm.handler.nei.RadiolysisRecipeHandler;
-import com.hbm.handler.nei.RefineryRecipeHandler;
-import com.hbm.handler.nei.ReformingHandler;
-import com.hbm.handler.nei.SILEXRecipeHandler;
-import com.hbm.handler.nei.SawmillHandler;
-import com.hbm.handler.nei.ShredderRecipeHandler;
-import com.hbm.handler.nei.SmithingRecipeHandler;
-import com.hbm.handler.nei.SolidificationHandler;
-import com.hbm.handler.nei.ToolingHandler;
-import com.hbm.handler.nei.VacuumRecipeHandler;
-import com.hbm.handler.nei.ZirnoxRecipeHandler;
+import com.hbm.handler.nei.*;
 
 import codechicken.nei.recipe.TemplateRecipeHandler;
 
@@ -76,7 +30,6 @@ public class NEIRegistry {
 		handlers.add(new CrackingHandler());
 		handlers.add(new ReformingHandler());
 		handlers.add(new HydrotreatingHandler());
-		handlers.add(new BoilerRecipeHandler());
 		handlers.add(new ChemplantRecipeHandler());
 		handlers.add(new CrystallizerRecipeHandler());
 		handlers.add(new BookRecipeHandler());

src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchLogic.java

@@ -10,7 +10,6 @@ import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MathHelper;
 
 public class TileEntityRadioTorchLogic extends TileEntity implements INBTPacketReceiver, IControlReceiver {
 	

src/main/java/com/hbm/world/dungeon/CrashedVertibird.java

@@ -267,9 +267,9 @@ public class CrashedVertibird extends WorldGenerator
 		world.setBlock(x + 6, y + 7 - yOffset, z + 8, Block1, 0, 3);
 		world.setBlock(x + 7, y + 7 - yOffset, z + 8, Block1, 0, 3);
 		world.setBlock(x + 3, y + 7 - yOffset, z + 9, Block1, 0, 3);
-		world.setBlock(x + 4, y + 7 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 4, y + 7 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 5, y + 7 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 6, y + 7 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 6, y + 7 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 7, y + 7 - yOffset, z + 9, Block1, 0, 3);
 		world.setBlock(x + 5, y + 7 - yOffset, z + 10, Block4, 0, 3);
 		world.setBlock(x + 6, y + 7 - yOffset, z + 10, Block1, 0, 3);
@@ -304,13 +304,13 @@ public class CrashedVertibird extends WorldGenerator
 		world.setBlock(x + 6, y + 8 - yOffset, z + 8, Block1, 0, 3);
 		world.setBlock(x + 7, y + 8 - yOffset, z + 8, Block1, 0, 3);
 		world.setBlock(x + 3, y + 8 - yOffset, z + 9, Block1, 0, 3);
-		world.setBlock(x + 4, y + 8 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 4, y + 8 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 5, y + 8 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 6, y + 8 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 6, y + 8 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 7, y + 8 - yOffset, z + 9, Block1, 0, 3);
-		world.setBlock(x + 4, y + 8 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 4, y + 8 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 5, y + 8 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 6, y + 8 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 6, y + 8 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 7, y + 8 - yOffset, z + 10, Block1, 0, 3);
 		world.setBlock(x + 5, y + 8 - yOffset, z + 11, Block4, 0, 3);
 		world.setBlock(x + 6, y + 8 - yOffset, z + 11, Block1, 0, 3);
@@ -335,9 +335,9 @@ public class CrashedVertibird extends WorldGenerator
 		world.setBlock(x + 4, y + 9 - yOffset, z + 9, Block1, 0, 3);
 		world.setBlock(x + 5, y + 9 - yOffset, z + 9, Block4, 0, 3);
 		world.setBlock(x + 6, y + 9 - yOffset, z + 9, Block1, 0, 3);
-		world.setBlock(x + 4, y + 9 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 4, y + 9 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 5, y + 9 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 6, y + 9 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 6, y + 9 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 7, y + 9 - yOffset, z + 10, Block1, 0, 3);
 		world.setBlock(x + 5, y + 9 - yOffset, z + 11, ModBlocks.red_wire_coated, 0, 3);
 		world.setBlock(x + 6, y + 9 - yOffset, z + 11, Block1, 0, 3);

src/main/java/com/hbm/world/dungeon/DesertAtom001.java

@@ -31,7 +31,7 @@ public class DesertAtom001 extends WorldGenerator
 	Block Block11 = ModBlocks.reinforced_glass;
 	Block Block12 = ModBlocks.reinforced_lamp_off;
 	Block Block13 = ModBlocks.pole_satellite_receiver;
-	Block Block14 = ModBlocks.machine_generator;
+	Block Block14 = ModBlocks.pwr_fuel;
 	Block Block15 = ModBlocks.deco_titanium;
 	Block Block16 = ModBlocks.block_lead;
 	Block Block17 = ModBlocks.ore_schrabidium;

src/main/java/com/hbm/world/dungeon/DesertAtom002.java

@@ -31,7 +31,7 @@ public class DesertAtom002
 	Block Block11 = ModBlocks.reinforced_glass;
 	Block Block12 = ModBlocks.reinforced_lamp_off;
 	Block Block13 = ModBlocks.pole_satellite_receiver;
-	Block Block14 = ModBlocks.machine_generator;
+	Block Block14 = ModBlocks.pwr_fuel;
 	Block Block15 = ModBlocks.deco_titanium;
 	Block Block16 = ModBlocks.block_lead;
 	Block Block17 = ModBlocks.ore_nether_plutonium;

src/main/java/com/hbm/world/dungeon/DesertAtom003.java

@@ -34,7 +34,7 @@ public class DesertAtom003
 	Block Block11 = ModBlocks.reinforced_glass;
 	Block Block12 = ModBlocks.reinforced_lamp_off;
 	Block Block13 = ModBlocks.pole_satellite_receiver;
-	Block Block14 = ModBlocks.machine_generator;
+	Block Block14 = ModBlocks.pwr_fuel;
 	Block Block15 = ModBlocks.deco_titanium;
 	Block Block16 = ModBlocks.block_lead;
 	Block Block17 = ModBlocks.ore_schrabidium;

src/main/java/com/hbm/world/dungeon/Spaceship.java

@@ -889,14 +889,14 @@ public class Spaceship extends WorldGenerator
 		world.setBlock(x + 10, y + -1, z + 29, Block3, 0, 3);
 		world.setBlock(x + 11, y + -1, z + 29, Block3, 0, 3);
 		world.setBlock(x + 2, y + -1, z + 30, Block3, 0, 3);
-		world.setBlock(x + 3, y + -1, z + 30, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 3, y + -1, z + 30, ModBlocks.pwr_control, 0, 3);
 		world.setBlock(x + 4, y + -1, z + 30, ModBlocks.red_cable, 0, 3);
 		world.setBlock(x + 5, y + -1, z + 30, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + -1, z + 30, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + -1, z + 30, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + -1, z + 30, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + -1, z + 30, ModBlocks.red_cable, 0, 3);
-		world.setBlock(x + 10, y + -1, z + 30, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 10, y + -1, z + 30, ModBlocks.pwr_control, 0, 3);
 		world.setBlock(x + 11, y + -1, z + 30, Block3, 0, 3);
 		world.setBlock(x + 2, y + -1, z + 31, Block2, 0, 3);
 		world.setBlock(x + 3, y + -1, z + 31, Block3, 0, 3);

src/main/java/com/hbm/world/dungeon/Vertibird.java

@@ -225,14 +225,14 @@ public class Vertibird extends WorldGenerator
 		world.setBlock(x + 14, y + 4 - yOffset, z + 8, Block2, 0, 3);
 		world.setBlock(x + 15, y + 4 - yOffset, z + 8, Block2, 0, 3);
 		world.setBlock(x + 11, y + 4 - yOffset, z + 9, Block2, 0, 3);
-		world.setBlock(x + 12, y + 4 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 12, y + 4 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 13, y + 4 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 14, y + 4 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 14, y + 4 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 15, y + 4 - yOffset, z + 9, Block2, 0, 3);
 		world.setBlock(x + 11, y + 4 - yOffset, z + 10, Block2, 0, 3);
-		world.setBlock(x + 12, y + 4 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 12, y + 4 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 13, y + 4 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 14, y + 4 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 14, y + 4 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 15, y + 4 - yOffset, z + 10, Block2, 0, 3);
 		world.setBlock(x + 11, y + 4 - yOffset, z + 11, Block2, 0, 3);
 		world.setBlock(x + 12, y + 4 - yOffset, z + 11, Block2, 0, 3);
@@ -305,14 +305,14 @@ public class Vertibird extends WorldGenerator
 		world.setBlock(x + 14, y + 5 - yOffset, z + 8, Block2, 0, 3);
 		world.setBlock(x + 15, y + 5 - yOffset, z + 8, Block2, 0, 3);
 		world.setBlock(x + 11, y + 5 - yOffset, z + 9, Block2, 0, 3);
-		world.setBlock(x + 12, y + 5 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 12, y + 5 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 13, y + 5 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 14, y + 5 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 14, y + 5 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 15, y + 5 - yOffset, z + 9, Block2, 0, 3);
 		world.setBlock(x + 11, y + 5 - yOffset, z + 10, Block2, 0, 3);
-		world.setBlock(x + 12, y + 5 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 12, y + 5 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 13, y + 5 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3);
-		world.setBlock(x + 14, y + 5 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3);
+		world.setBlock(x + 14, y + 5 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3);
 		world.setBlock(x + 15, y + 5 - yOffset, z + 10, Block2, 0, 3);
 		world.setBlock(x + 12, y + 5 - yOffset, z + 11, Block2, 0, 3);
 		world.setBlock(x + 13, y + 5 - yOffset, z + 11, ModBlocks.red_wire_coated, 0, 3);

src/main/java/com/hbm/world/gen/component/CivilianFeatures.java

@@ -696,7 +696,7 @@ public class CivilianFeatures {
 			this.fillWithBlocks(world, box, 2, 6, 1, 4, 6, 2, ModBlocks.steel_roof, Blocks.air, false);
 			this.fillWithBlocks(world, box, 2, 1, 1, 2, 3, 1, ModBlocks.deco_red_copper, Blocks.air, false);
 			this.fillWithBlocks(world, box, 3, 1, 1, 3, 1, 2, ModBlocks.deco_beryllium, Blocks.air, false);
-			this.placeBlockAtCurrentPosition(world, ModBlocks.machine_generator, 0, 4, 1, 1, box);
+			this.placeBlockAtCurrentPosition(world, ModBlocks.machine_amgen, 0, 4, 1, 1, box);
 			this.placeBlockAtCurrentPosition(world, ModBlocks.machine_detector, 0, 4, 1, 2, box);
 			this.fillWithBlocks(world, box, 5, 1, 1, 5, 1, 2, ModBlocks.deco_beryllium, Blocks.air, false);
 			this.fillWithBlocks(world, box, 6, 1, 1, 6, 3, 1, ModBlocks.deco_red_copper, Blocks.air, false);

src/main/java/com/hbm/world/gen/component/SiloComponent.java

@@ -412,7 +412,7 @@ public class SiloComponent extends Component {
 		placeBlockAtCurrentPosition(world, Blocks.heavy_weighted_pressure_plate, 0, 34, 22, 18, box);
 		placeBlockAtCurrentPosition(world, ModBlocks.capacitor_copper, decoE, 36, 21, 16, box);
 		placeBlockAtCurrentPosition(world, ModBlocks.deco_steel, 0, 36, 21, 17, box);
-		placeBlockAtCurrentPosition(world, ModBlocks.machine_generator, 0, 36, 21, 19, box);
+		placeBlockAtCurrentPosition(world, ModBlocks.fusion_conductor, 0, 36, 21, 19, box);
 		fillWithMetadataBlocks(world, box, 36, 22, 16, 36, 23, 16, ModBlocks.tape_recorder, decoE);
 		placeBlockAtCurrentPosition(world, ModBlocks.deco_computer, decoModelW, 36, 22, 17, box);
 		fillWithMetadataBlocks(world, box, 36, 21, 18, 36, 23, 18, ModBlocks.tape_recorder, decoE);