guess what? even more removals!

changelog

@@ -12,7 +12,7 @@
 * Adjusted the nuclear flash's intensity, the flash will now deal less and less radiation the longer it goes on
 * The nuclear flash now bypasses radiation resistance, being only affected by blocks and distance
 * Mushroom clouds' initial scale is now based on the total scale instead of all spawning roughly at the same size, causing fireballs to be comically small for huge bombs
-* Removed the old mining drill, combustion generator, old watz core, structure marker and CMB furnace for good
+* Removed the old mining drill, combustion generator, old watz core, structure marker, all old large reactor parts and CMB furnace for good
 
 ## Fixed
 * Fixed a rare crash caused by radars force-loading chunks conflicting with certain mods' chunk loading changes

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

@@ -902,14 +902,6 @@ public class ModBlocks {
 	public static Block pwr_port;
 	public static Block pwr_controller;
 	public static Block pwr_block;
-
-	@Deprecated public static Block reactor_element;
-	@Deprecated public static Block reactor_control;
-	@Deprecated public static Block reactor_hatch;
-	@Deprecated public static Block reactor_ejector;
-	@Deprecated public static Block reactor_inserter;
-	@Deprecated public static Block reactor_conductor;
-	@Deprecated public static Block reactor_computer;
 	
 	public static Block fusion_conductor;
 	public static Block fusion_center;
@@ -1271,8 +1263,6 @@ public class ModBlocks {
 	public static Block pink_double_slab;
 	public static Block pink_stairs;
 	
-	public static Block ff;
-	
 	public static Material materialGas = new MaterialGas();
 	
 	private static void initializeBlock() {
@@ -2068,14 +2058,6 @@ public class ModBlocks {
 		pwr_port = new BlockGenericPWR(Material.iron).setBlockName("pwr_port").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_port");
 		pwr_controller = new MachinePWRController(Material.iron).setBlockName("pwr_controller").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_casing_blank");
 		pwr_block = new BlockPWR(Material.iron).setBlockName("pwr_block").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pwr_block");
-		
-		reactor_element = new BlockPillar(Material.iron, RefStrings.MODID + ":reactor_element_top", RefStrings.MODID + ":reactor_element_base").setBlockName("reactor_element").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":reactor_element_side");
-		reactor_control = new BlockPillar(Material.iron, RefStrings.MODID + ":reactor_control_top").setBlockName("reactor_control").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":reactor_control_side");
-		reactor_hatch = new ReactorHatch(Material.iron).setBlockName("reactor_hatch").setHardness(5.0F).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete");
-		reactor_ejector = new BlockRotatable(Material.iron).setBlockName("reactor_ejector").setHardness(5.0F).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete");
-		reactor_inserter = new BlockRotatable(Material.iron).setBlockName("reactor_inserter").setHardness(5.0F).setResistance(1000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete");
-		reactor_conductor = new BlockPillar(Material.iron, RefStrings.MODID + ":reactor_conductor_top").setBlockName("reactor_conductor").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":reactor_conductor_side");
-		reactor_computer = new ReactorCore(Material.iron).setBlockName("reactor_computer").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":reactor_computer");
 
 		fusion_conductor = new BlockToolConversionPillar(Material.iron).addVariant("_welded").setBlockName("fusion_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fusion_conductor");
 		fusion_center = new BlockPillar(Material.iron, RefStrings.MODID + ":fusion_center_top_alt").setBlockName("fusion_center").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fusion_center_side_alt");
@@ -2441,8 +2423,6 @@ public class ModBlocks {
 		pink_slab = new BlockPinkSlab(false, Material.wood).setBlockName("pink_slab").setStepSound(Block.soundTypeWood).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pink_planks");
 		pink_double_slab = new BlockPinkSlab(true, Material.wood).setBlockName("pink_double_slab").setStepSound(Block.soundTypeWood).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pink_planks");
 		pink_stairs = new BlockGenericStairs(pink_planks, 0).setBlockName("pink_stairs").setStepSound(Block.soundTypeWood).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pink_planks");
-		
-		ff = new BlockFF(Material.iron).setBlockName("ff").setHardness(0.5F).setStepSound(Block.soundTypeGravel).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":code");
 	}
 
 	private static void registerBlock() {
@@ -3440,14 +3420,6 @@ public class ModBlocks {
 		register(pwr_block);
 		
 		//Multiblock Generators
-		GameRegistry.registerBlock(reactor_element, reactor_element.getUnlocalizedName());
-		GameRegistry.registerBlock(reactor_control, reactor_control.getUnlocalizedName());
-		GameRegistry.registerBlock(reactor_hatch, reactor_hatch.getUnlocalizedName());
-		GameRegistry.registerBlock(reactor_ejector, reactor_ejector.getUnlocalizedName());
-		GameRegistry.registerBlock(reactor_inserter, reactor_inserter.getUnlocalizedName());
-		GameRegistry.registerBlock(reactor_conductor, reactor_conductor.getUnlocalizedName());
-		GameRegistry.registerBlock(reactor_computer, reactor_computer.getUnlocalizedName());
-
 		register(fusion_conductor);
 		GameRegistry.registerBlock(fusion_center, fusion_center.getUnlocalizedName());
 		GameRegistry.registerBlock(fusion_motor, fusion_motor.getUnlocalizedName());
@@ -3606,7 +3578,6 @@ public class ModBlocks {
 		GameRegistry.registerBlock(pink_slab, pink_slab.getUnlocalizedName());
 		GameRegistry.registerBlock(pink_double_slab, pink_double_slab.getUnlocalizedName());
 		GameRegistry.registerBlock(pink_stairs, pink_stairs.getUnlocalizedName());
-		GameRegistry.registerBlock(ff, ff.getUnlocalizedName());
 	}
 	
 	private static void register(Block b) {

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

@@ -127,7 +127,7 @@ public class BlockOre extends Block {
 			case 23:
 				return Item.getItemFromBlock(ModBlocks.fusion_conductor);
 			case 24:
-				return Item.getItemFromBlock(ModBlocks.reactor_computer);
+				return Item.getItemFromBlock(ModBlocks.pwr_fuel);
 			case 25:
 				return Item.getItemFromBlock(ModBlocks.machine_diesel);
 			case 26:

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

@@ -1,23 +1,15 @@
 package com.hbm.blocks.machine;
 
-import com.hbm.blocks.ModBlocks;
-import com.hbm.inventory.fluid.FluidType;
-import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.RefStrings;
 
-import api.hbm.fluid.IFluidConnectorBlock;
 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.entity.player.EntityPlayer;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockPillar extends Block implements IFluidConnectorBlock {
+public class BlockPillar extends Block {
 
 	@SideOnly(Side.CLIENT)
 	private IIcon iconTop;
@@ -37,18 +29,13 @@ public class BlockPillar extends Block implements IFluidConnectorBlock {
 		textureAlt = bottom;
 	}
 
-    public Block setBlockTextureName(String name) {
-    	
-    	if(textureTop.isEmpty())
-    		textureTop = name;
-    	
-    	if(textureAlt.isEmpty())
-    		textureAlt = name;
-    	
-        this.textureName = name;
-        
-        return this;
-    }
+	public Block setBlockTextureName(String name) {
+
+		if(textureTop.isEmpty()) textureTop = name;
+		if(textureAlt.isEmpty()) textureAlt = name;
+		this.textureName = name;
+		return this;
+	}
 	
 	@Override
 	@SideOnly(Side.CLIENT)
@@ -62,37 +49,6 @@ public class BlockPillar extends Block implements IFluidConnectorBlock {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public IIcon getIcon(int side, int metadata) {
-		
-		if(this == ModBlocks.reactor_element && metadata == 1)
-			return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.iconAlt);
-		
 		return side == 1 ? this.iconTop : (side == 0 ? this.iconTop : this.blockIcon);
 	}
-
-	
-	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
-		
-		if(this != ModBlocks.reactor_element)
-			return super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ);
-		
-		if(player.isSneaking())
-		{
-			if(world.getBlockMetadata(x, y, z) == 0) {
-				world.setBlockMetadataWithNotify(x, y, z, 1, 3);
-			} else {
-				world.setBlockMetadataWithNotify(x, y, z, 0, 3);
-			}
-			
-			return true;
-		}
-		
-		return false;
-	}
-
-	@Override
-	public boolean canConnect(FluidType type, IBlockAccess world, int x, int y, int z, ForgeDirection dir) {
-		if(this != ModBlocks.reactor_conductor) return false;
-		return type == Fluids.WATER || type == Fluids.COOLANT || type == Fluids.STEAM || type == Fluids.HOTSTEAM || type == Fluids.SUPERHOTSTEAM || type == Fluids.ULTRAHOTSTEAM;
-	}
 }

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

@@ -1,63 +0,0 @@
-package com.hbm.blocks.machine;
-
-import com.hbm.blocks.ModBlocks;
-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.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-
-public class BlockRotatable extends Block {
-	
-	@SideOnly(Side.CLIENT)
-	private IIcon iconFront;
-
-	public BlockRotatable(Material p_i45394_1_) {
-		super(p_i45394_1_);
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister iconRegister) {
-
-		if(this == ModBlocks.reactor_ejector) {
-			this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":reactor_ejector");
-			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":brick_concrete");
-		}
-		if(this == ModBlocks.reactor_inserter) {
-			this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":reactor_inserter");
-			this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":brick_concrete");
-		}
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int metadata) {
-		return metadata == 0 && side == 3 ? this.iconFront : (side == metadata ? this.iconFront : this.blockIcon);
-	}
-
-	@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) {
-			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
-		}
-		if(i == 1) {
-			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
-		}
-		if(i == 2) {
-			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
-		}
-		if(i == 3) {
-			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
-		}
-	}
-}

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

@@ -1,23 +0,0 @@
-package com.hbm.blocks.machine;
-
-import java.util.Random;
-
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-public class ReactorCore extends BlockContainer {
-	
-	public boolean keepInventory = false;
-	public Random field_149933_a = new Random();
-
-	public ReactorCore(Material p_i45386_1_) {
-		super(p_i45386_1_);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
-		return null;
-	}
-}

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

@@ -1,158 +0,0 @@
-package com.hbm.blocks.machine;
-
-import java.util.Random;
-
-import com.hbm.inventory.fluid.FluidType;
-import com.hbm.inventory.fluid.Fluids;
-import com.hbm.lib.RefStrings;
-import com.hbm.main.MainRegistry;
-import com.hbm.tileentity.machine.TileEntityMachineReactorLarge;
-
-import api.hbm.fluid.IFluidConnectorBlock;
-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.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public class ReactorHatch extends Block implements IFluidConnectorBlock {
-	
-	@SideOnly(Side.CLIENT)
-	private IIcon iconFront;
-
-	public ReactorHatch(Material p_i45394_1_) {
-		super(p_i45394_1_);
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister iconRegister) {
-		this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":reactor_hatch");
-		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":brick_concrete");
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int metadata) {
-		return metadata == 0 && side == 3 ? this.iconFront : (side == metadata ? this.iconFront : this.blockIcon);
-	}
-	
-	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-    {
-        return Item.getItemFromBlock(this);
-    }
-	
-	@Override
-	public void onBlockAdded(World world, int x, int y, int z) {
-		super.onBlockAdded(world, x, y, z);
-		//this.setDefaultDirection(world, x, y, z);
-	}
-	
-	@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)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
-		}
-		if(i == 1)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
-		}
-		if(i == 2)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
-		}
-		if(i == 3)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
-		}
-	}
-	
-	@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)
-		{
-			return true;
-		} else if(!player.isSneaking())
-		{
-			if(world.getBlockMetadata(x, y, z) == 2)
-			{
-				if(world.getTileEntity(x, y, z + 2) instanceof TileEntityMachineReactorLarge)
-				{
-					if(((TileEntityMachineReactorLarge)world.getTileEntity(x, y, z + 2)).checkBody())
-					{
-						FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z + 2);
-					} else {
-						player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!"));
-					}
-				} else {
-					player.addChatMessage(new ChatComponentText("[Nuclear Reactor Error: Reactor Core not found!"));
-				}
-			}
-			if(world.getBlockMetadata(x, y, z) == 3)
-			{
-				if(world.getTileEntity(x, y, z - 2) instanceof TileEntityMachineReactorLarge)
-				{
-					if(((TileEntityMachineReactorLarge)world.getTileEntity(x, y, z - 2)).checkBody())
-					{
-						FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z - 2);
-					} else {
-						player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!"));
-					}
-				} else {
-					player.addChatMessage(new ChatComponentText("[Nuclear Reactor Error: Reactor Core not found!"));
-				}
-			}
-			if(world.getBlockMetadata(x, y, z) == 4)
-			{
-				if(world.getTileEntity(x + 2, y, z) instanceof TileEntityMachineReactorLarge)
-				{
-					if(((TileEntityMachineReactorLarge)world.getTileEntity(x + 2, y, z)).checkBody())
-					{
-						FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x + 2, y, z);
-					} else {
-						player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!"));
-					}
-				} else {
-					player.addChatMessage(new ChatComponentText("[Nuclear Reactor Error: Reactor Core not found!"));
-				}
-			}
-			if(world.getBlockMetadata(x, y, z) == 5)
-			{
-				if(world.getTileEntity(x - 2, y, z) instanceof TileEntityMachineReactorLarge)
-				{
-					if(((TileEntityMachineReactorLarge)world.getTileEntity(x - 2, y, z)).checkBody())
-					{
-						FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x - 2, y, z);
-					} else {
-						player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!"));
-					}
-				} else {
-					player.addChatMessage(new ChatComponentText("[Nuclear Reactor Error: Reactor Core not found!"));
-				}
-			}
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public boolean canConnect(FluidType type, IBlockAccess world, int x, int y, int z, ForgeDirection dir) {
-		return type == Fluids.WATER || type == Fluids.COOLANT || type == Fluids.STEAM || type == Fluids.HOTSTEAM || type == Fluids.SUPERHOTSTEAM || type == Fluids.ULTRAHOTSTEAM;
-	}
-}

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

@@ -1,88 +0,0 @@
-package com.hbm.inventory.container;
-
-import com.hbm.inventory.SlotTakeOnly;
-import com.hbm.tileentity.machine.TileEntityMachineReactorLarge;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class ContainerReactorMultiblock extends Container {
-	
-	private TileEntityMachineReactorLarge diFurnace;
-	
-	public ContainerReactorMultiblock(InventoryPlayer invPlayer, TileEntityMachineReactorLarge tedf) {
-		
-		diFurnace = tedf;
-		
-		//Water in
-		this.addSlotToContainer(new Slot(tedf, 0, 8, 90));
-		//Water out
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 1, 8, 108));
-		//Coolant in
-		this.addSlotToContainer(new Slot(tedf, 2, 26, 90));
-		//Coolant out
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 3, 26, 108));
-		
-		//Fuel in
-		this.addSlotToContainer(new Slot(tedf, 4, 80, 36));
-		//Fuel out
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 5, 80, 72));
-		//Waste in
-		this.addSlotToContainer(new Slot(tedf, 6, 152, 36));
-		//Waste out
-		this.addSlotToContainer(new SlotTakeOnly(tedf, 7, 152, 72));
-		
-		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));
-			}
-		}
-		
-		for(int i = 0; i < 9; i++)
-		{
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 56));
-		}
-	}
-	
-	@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 <= 7) {
-				if (!this.mergeItemStack(var5, 8, this.inventorySlots.size(), true))
-				{
-					return null;
-				}
-			} else {
-				return null;
-			}
-            
-			if (var5.stackSize == 0)
-			{
-				var4.putStack((ItemStack) null);
-			}
-			else
-			{
-				var4.onSlotChanged();
-			}
-		}
-		
-		return var3;
-    }
-
-	@Override
-	public boolean canInteractWith(EntityPlayer player) {
-		return diFurnace.isUseableByPlayer(player);
-	}
-}

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

@@ -52,6 +52,7 @@ public class GUIMachineRadarNTSlots extends GuiInfoContainer {
 	@Override
 	protected void drawGuiContainerForegroundLayer(int i, int j) {
 		String name = this.radar.hasCustomInventoryName() ? this.radar.getInventoryName() : I18n.format(this.radar.getInventoryName());
+		if(MainRegistry.polaroidID == 11) name = "Reda";
 		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);
 	}

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

@@ -1,189 +0,0 @@
-package com.hbm.inventory.gui;
-
-import org.lwjgl.opengl.GL11;
-
-import com.hbm.inventory.container.ContainerReactorMultiblock;
-import com.hbm.inventory.fluid.FluidType;
-import com.hbm.inventory.fluid.Fluids;
-import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.tileentity.machine.TileEntityMachineReactorLarge;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-public class GUIReactorMultiblock extends GuiInfoContainer {
-	
-	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_reactor_large_experimental.png");
-	private TileEntityMachineReactorLarge diFurnace;
-
-	public GUIReactorMultiblock(InventoryPlayer invPlayer, TileEntityMachineReactorLarge tedf) {
-		super(new ContainerReactorMultiblock(invPlayer, tedf));
-		diFurnace = tedf;
-		
-		this.xSize = 176;
-		this.ySize = 222;
-	}
-	
-	@Override
-	public void drawScreen(int mouseX, int mouseY, float f) {
-		super.drawScreen(mouseX, mouseY, f);
-
-		diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 88 - 52, 16, 52);
-		diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 88 - 52, 16, 52);
-		diFurnace.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 108, 88, 4);
-		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 114, 88, 4, new String[] { "Hull Temperature:", "   " + Math.round((diFurnace.hullHeat) * 0.00001 * 980 + 20) + "°C" });
-		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 120, 88, 4, new String[] { "Core Temperature:", "   " + Math.round((diFurnace.coreHeat) * 0.00002 * 980 + 20) + "°C" });
-
-		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 115, guiTop + 17, 18, 90, new String[] { "Operating Level: " + diFurnace.rods + "%" });
-		
-		String fuel = "";
-		
-		switch(diFurnace.type) {
-		case URANIUM:
-			fuel = "Uranium";
-			break;
-		case MOX:
-			fuel = "MOX";
-			break;
-		case PLUTONIUM:
-			fuel = "Plutonium";
-			break;
-		case SCHRABIDIUM:
-			fuel = "Schrabidium";
-			break;
-		case THORIUM:
-			fuel = "Thorium";
-			break;
-		default:
-			fuel = "ERROR";
-			break;
-		}
-
-		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 98, guiTop + 18, 16, 88, new String[] { fuel + ": " + (diFurnace.fuel / diFurnace.fuelMult) + "/" + (diFurnace.maxFuel / diFurnace.fuelMult) + "ng" });
-		this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 18, 16, 88, new String[] { "Depleted " + fuel + ": " + (diFurnace.waste / diFurnace.fuelMult) + "/" + (diFurnace.maxWaste / diFurnace.fuelMult) + "ng" });
-		
-		String[] text0 = new String[] { diFurnace.rods > 0 ? "Reactor is ON" : "Reactor is OFF"};
-		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 52, guiTop + 53, 18, 18, mouseX, mouseY, text0);
-		
-		String s = "0";
-		
-		FluidType type = diFurnace.tanks[2].getTankType();
-		if(type == Fluids.STEAM) s = "1x";
-		if(type == Fluids.HOTSTEAM) s = "10x";
-		if(type == Fluids.SUPERHOTSTEAM) s = "100x";
-		
-		String[] text4 = new String[] { "Steam compression switch",
-				"Current compression level: " + s};
-		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 63, guiTop + 107, 14, 18, mouseX, mouseY, text4);
-	}
-
-	protected void mouseClicked(int x, int y, int i) {
-    	super.mouseClicked(x, y, i);
-    	
-    	if(guiLeft + 115 <= x && guiLeft + 115 + 18 > x && guiTop + 17 < y && guiTop + 17 + 90 >= y) {
-
-			mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
-			
-			int rods = (y - (guiTop + 24)) * 100 / 76;
-			
-			if(rods < 0)
-				rods = 0;
-			
-			if(rods > 100)
-				rods = 100;
-			
-			rods = 100 - rods;
-			
-    		PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(diFurnace.xCoord, diFurnace.yCoord, diFurnace.zCoord, rods, 0));
-    	}
-		
-    	if(guiLeft + 63 <= x && guiLeft + 63 + 14 > x && guiTop + 107 < y && guiTop + 107 + 18 >= y) {
-    		
-			mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
-			int c = 0;
-			
-			FluidType type = diFurnace.tanks[2].getTankType();
-			if(type == Fluids.STEAM) c = 0;
-			if(type == Fluids.HOTSTEAM) c = 1;
-			if(type == Fluids.SUPERHOTSTEAM) c = 2;
-			
-    		PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(diFurnace.xCoord, diFurnace.yCoord, diFurnace.zCoord, c, 1));
-    	}
-    }
-	
-	@Override
-	protected void drawGuiContainerForegroundLayer(int i, int j) {
-		String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.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);
-		
-		int k = diFurnace.rods;
-		drawTexturedModalRect(guiLeft + 115, guiTop + 107 - 14 - (k * 76 / 100), 208, 36, 18, 14);
-		
-		if(diFurnace.rods > 0)
-			drawTexturedModalRect(guiLeft + 52, guiTop + 53, 212, 0, 18, 18);
-		
-		int q = diFurnace.getFuelScaled(88);
-		drawTexturedModalRect(guiLeft + 98, guiTop + 106 - q, 176, 124 - q, 16, q);
-		
-		int j = diFurnace.getWasteScaled(88);
-		drawTexturedModalRect(guiLeft + 134, guiTop + 106 - j, 192, 124 - j, 16, j);
-		
-		int s = diFurnace.size;
-		
-		if(s < 8)
-			drawTexturedModalRect(guiLeft + 50, guiTop + 17, 208, 50 + s * 18, 22, 18);
-		else
-			drawTexturedModalRect(guiLeft + 50, guiTop + 17, 230, 50 + (s - 8) * 18, 22, 18);
-
-		
-		FluidType type = diFurnace.tanks[2].getTankType();
-		if(type == Fluids.STEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 176, 18, 14, 18);
-		if(type == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 190, 18, 14, 18);
-		if(type == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 204, 18, 14, 18);
-		
-		if(diFurnace.hasHullHeat()) {
-			int i = diFurnace.getHullHeatScaled(88);
-			
-			i = (int) Math.min(i, 160);
-			
-			drawTexturedModalRect(guiLeft + 80, guiTop + 114, 0, 226, i, 4);
-		}
-		
-		if(diFurnace.hasCoreHeat()) {
-			int i = diFurnace.getCoreHeatScaled(88);
-			
-			i = (int) Math.min(i, 160);
-			
-			drawTexturedModalRect(guiLeft + 80, guiTop + 120, 0, 230, i, 4);
-		}
-		
-		if(diFurnace.tanks[2].getFill() > 0) {
-			int i = diFurnace.getSteamScaled(88);
-			
-			//i = (int) Math.min(i, 160);
-			
-			int offset = 234;
-			
-			if(type == Fluids.HOTSTEAM) offset += 4;
-			if(type == Fluids.SUPERHOTSTEAM) offset += 8;
-			
-			drawTexturedModalRect(guiLeft + 80, guiTop + 108, 0, offset, i, 4);
-		}
-
-		diFurnace.tanks[0].renderTank(guiLeft + 8, guiTop + 88, this.zLevel, 16, 52);
-		diFurnace.tanks[1].renderTank(guiLeft + 26, guiTop + 88, this.zLevel, 16, 52);
-	}
-}

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

@@ -77,6 +77,7 @@ public class Library {
 	public static String Ma118 = "1121cb7a-8773-491f-8e2b-221290c93d81";
 	public static String Adam29Adam29 = "bbae7bfa-0eba-40ac-a0dd-f3b715e73e61";
 	public static String Alcater = "0b399a4a-8545-45a1-be3d-ece70d7d48e9";
+	public static String ege444 = "42ee978c-442a-4cd8-95b6-29e469b6df10";
 
 	public static Set<String> contributors = Sets.newHashSet(new String[] {
 			"06ab7c03-55ce-43f8-9d3c-2850e3c652de", //mustang_rudolf
@@ -165,8 +166,6 @@ public class Library {
 			return true;
 		if((tileentity != null && (tileentity instanceof IFluidAcceptor || 
 				tileentity instanceof IFluidSource)) || 
-				world.getBlock(x, y, z) == ModBlocks.reactor_hatch ||
-				world.getBlock(x, y, z) == ModBlocks.reactor_conductor ||
 				world.getBlock(x, y, z) == ModBlocks.fusion_hatch ||
 				world.getBlock(x, y, z) == ModBlocks.fwatz_hatch ||
 				world.getBlock(x, y, z) == ModBlocks.dummy_port_ams_limiter ||
@@ -390,23 +389,6 @@ public class Library {
 		Block block = worldObj.getBlock(x, y, z);
 		TileEntity tileentity = worldObj.getTileEntity(x, y, z);
 		
-		//Large Nuclear Reactor
-		if(block == ModBlocks.reactor_hatch && worldObj.getBlock(x, y, z + 2) == ModBlocks.reactor_computer)
-		{
-			tileentity = worldObj.getTileEntity(x, y, z + 2);
-		}
-		if(block == ModBlocks.reactor_hatch && worldObj.getBlock(x, y, z - 2) == ModBlocks.reactor_computer)
-		{
-			tileentity = worldObj.getTileEntity(x, y, z - 2);
-		}
-		if(block == ModBlocks.reactor_hatch && worldObj.getBlock(x + 2, y, z) == ModBlocks.reactor_computer)
-		{
-			tileentity = worldObj.getTileEntity(x + 2, y, z);
-		}
-		if(block == ModBlocks.reactor_hatch && worldObj.getBlock(x - 2, y, z) == ModBlocks.reactor_computer)
-		{
-			tileentity = worldObj.getTileEntity(x - 2, y, z);
-		}
 		//FWatz Reactor
 		if(block == ModBlocks.fwatz_hatch && worldObj.getBlock(x, y + 11, z + 9) == ModBlocks.fwatz_core)
 		{

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

@@ -1079,6 +1079,8 @@ public class CraftingManager {
 			addRecipeAuto(new ItemStack(ModBlocks.ore_nether_uranium, 8), new Object[] { "OOO", "OBO", "OOO", 'O', ModBlocks.ore_nether_uranium_scorched, 'B', Items.water_bucket });
 			addShapelessAuto(new ItemStack(ModBlocks.ore_gneiss_uranium, 1), new Object[] { ModBlocks.ore_gneiss_uranium_scorched, Items.water_bucket });
 			addRecipeAuto(new ItemStack(ModBlocks.ore_gneiss_uranium, 8), new Object[] { "OOO", "OBO", "OOO", 'O', ModBlocks.ore_gneiss_uranium_scorched, 'B', Items.water_bucket });
+			addShapelessAuto(new ItemStack(ModBlocks.ore_uranium, 1), new Object[] { ModBlocks.ore_sellafield_uranium_scorched, Items.water_bucket });
+			addRecipeAuto(new ItemStack(ModBlocks.ore_uranium, 8), new Object[] { "OOO", "OBO", "OOO", 'O', ModBlocks.ore_sellafield_uranium_scorched, 'B', Items.water_bucket });
 
 			addRecipeAuto(new ItemStack(ModItems.plate_iron, 4), new Object[] { "##", "##", '#', IRON.ingot() });
 			addRecipeAuto(new ItemStack(ModItems.plate_gold, 4), new Object[] { "##", "##", '#', GOLD.ingot() });

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

@@ -43,7 +43,6 @@ import com.hbm.saveddata.satellites.Satellite;
 import com.hbm.tileentity.TileMappings;
 import com.hbm.tileentity.bomb.TileEntityLaunchPad;
 import com.hbm.tileentity.bomb.TileEntityNukeCustom;
-import com.hbm.tileentity.machine.TileEntityMachineReactorLarge;
 import com.hbm.tileentity.machine.TileEntityNukeFurnace;
 import com.hbm.tileentity.machine.rbmk.RBMKDials;
 import com.hbm.util.*;
@@ -864,7 +863,6 @@ public class MainRegistry {
 		ArmorUtil.register();
 		HazmatRegistry.registerHazmats();
 		FluidContainerRegistry.register();
-		TileEntityMachineReactorLarge.registerAll();
 		BlockToolConversion.registerRecipes();
 		AchievementHandler.register();
 
@@ -1204,6 +1202,14 @@ public class MainRegistry {
 		ignoreMappings.add("hbm:tile.watz_core");
 		ignoreMappings.add("hbm:tile.watz_hatch");
 		ignoreMappings.add("hbm:tile.marker_structure");
+		ignoreMappings.add("hbm:tile.reactor_element");
+		ignoreMappings.add("hbm:tile.reactor_control");
+		ignoreMappings.add("hbm:tile.reactor_hatch");
+		ignoreMappings.add("hbm:tile.reactor_ejector");
+		ignoreMappings.add("hbm:tile.reactor_inserter");
+		ignoreMappings.add("hbm:tile.reactor_conductor");
+		ignoreMappings.add("hbm:tile.reactor_computer");
+		ignoreMappings.add("hbm:tile.ff");
 		
 		/// REMAP ///
 		remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

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

@@ -13,7 +13,6 @@ import com.hbm.tileentity.machine.TileEntityCoreStabilizer;
 import com.hbm.tileentity.machine.TileEntityForceField;
 import com.hbm.tileentity.machine.TileEntityMachineMiningLaser;
 import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly;
-import com.hbm.tileentity.machine.TileEntityMachineReactorLarge;
 import com.hbm.tileentity.machine.TileEntitySoyuzLauncher;
 import com.hbm.tileentity.machine.storage.TileEntityBarrel;
 import com.hbm.tileentity.machine.storage.TileEntityMachineBattery;
@@ -85,30 +84,6 @@ public class AuxButtonPacket implements IMessage {
 					field.isOn = !field.isOn;
 				}
 				
-				if (te instanceof TileEntityMachineReactorLarge) {
-					TileEntityMachineReactorLarge reactor = (TileEntityMachineReactorLarge)te;
-					
-					if(m.id == 0)
-						reactor.rods = m.value;
-					
-					if(m.id == 1) {
-						FluidType type = Fluids.STEAM;
-						int fill = reactor.tanks[2].getFill();
-						
-						switch(m.value) {
-						case 0: type = Fluids.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
-						case 1: type = Fluids.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
-						case 2: type = Fluids.STEAM; fill = (int)Math.floor(fill * 100); break;
-						}
-						
-						if(fill > reactor.tanks[2].getMaxFill())
-							fill = reactor.tanks[2].getMaxFill();
-						
-						reactor.tanks[2].setTankType(type);
-						reactor.tanks[2].setFill(fill);
-					}
-				}
-				
 				if (te instanceof TileEntityMachineMissileAssembly) {
 					TileEntityMachineMissileAssembly assembly = (TileEntityMachineMissileAssembly)te;
 					

src/main/java/com/hbm/tileentity/TileMappings.java

@@ -135,7 +135,6 @@ public class TileMappings {
 		put(TileEntityMachineShredderLarge.class, "tileentity_machine_big_shredder");
 		put(TileEntityRFDuct.class, "tileentity_hbm_rfduct");
 		put(TileEntityReactorControl.class, "tileentity_reactor_remote_control");
-		put(TileEntityMachineReactorLarge.class, "tileentity_large_reactor");
 		put(TileEntityWasteDrum.class, "tileentity_waste_drum");
 		put(TileEntityDecon.class, "tileentity_decon");
 		put(TileEntityMachineSatDock.class, "tileentity_miner_dock");

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

@@ -22,7 +22,7 @@ public class Spaceship extends WorldGenerator
 	Block Block3 = ModBlocks.deco_steel;
 	Block Block4 = ModBlocks.fusion_heater;
 	Block Block5 = ModBlocks.block_meteor;
-	Block Block6 = ModBlocks.reactor_element;
+	Block Block6 = ModBlocks.pwr_fuel;
 	Block Block7 = ModBlocks.cable_switch;
 	Block Block8 = ModBlocks.fusion_hatch;
 	Block Block9 = ModBlocks.reinforced_light;

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

@@ -18,7 +18,7 @@ public class Spaceship2
 	Block Block3 = ModBlocks.deco_steel;
 	Block Block4 = ModBlocks.fusion_heater;
 	Block Block5 = ModBlocks.block_meteor;
-	Block Block6 = ModBlocks.reactor_element;
+	Block Block6 = ModBlocks.pwr_fuel;
 	Block Block8 = ModBlocks.fusion_hatch;
 	Block Block9 = ModBlocks.reinforced_light;
 	Block Block10 = ModBlocks.reinforced_glass;