gough,

changelog

@@ -20,6 +20,11 @@
 * Base steam production per consumed heat has been increased by 50% on the ZIRNOX
 * Both radioisotope cell variants have been finally removed after being deprecated for a while
 * Selfchargers now have a tooltip explaining the hazards of using them in a battery socket
+* The alternate recipe for the assembler in the assembler now uses integrated circuits instead of analog ones
+* Added an alternate chemical plant recipe that uses a smaller selection of items and ICs instead of ACs
+* Flashgold and flashlead are now made in the PUREX instead of the crafting table
+  * The flashgold recipe now yields two billets instead of one
+* Slightly changed the HSS ingot texture to not look identical to steel except slightly greenish
 
 ## Fixed
 * Fixed AUTOCAL's number comparison functions not working with variable substitution as advertised

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

@@ -14,6 +14,7 @@ import com.hbm.blocks.machine.rbmk.*;
 import com.hbm.blocks.network.*;
 import com.hbm.blocks.network.pneumatic.PneumoStorageAccess;
 import com.hbm.blocks.network.pneumatic.PneumoStorageClutter;
+import com.hbm.blocks.network.pneumatic.PneumoStorageImporter;
 import com.hbm.blocks.network.pneumatic.PneumoStorageMono;
 import com.hbm.blocks.network.pneumatic.PneumoTube;
 import com.hbm.blocks.network.pneumatic.PneumoTubePaintableBlock;
@@ -807,6 +808,7 @@ public class ModBlocks {
 	public static Block pneumatic_storage_access;
 	public static Block pneumatic_storage_clutter;
 	public static Block pneumatic_storage_mono;
+	public static Block pneumatic_storage_importer;
 
 	public static Block fan;
 	public static Block piston_inserter;
@@ -1911,6 +1913,7 @@ public class ModBlocks {
 		pneumatic_storage_access = new PneumoStorageAccess().setBlockName("pneumatic_storage_access").setStepSound(ModSoundTypes.pipe).setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pneumatic_storage_access");
 		pneumatic_storage_clutter = new PneumoStorageClutter().setBlockName("pneumatic_storage_clutter").setStepSound(ModSoundTypes.pipe).setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pneumatic_storage_clutter");
 		pneumatic_storage_mono = new PneumoStorageMono().setBlockName("pneumatic_storage_mono").setStepSound(ModSoundTypes.pipe).setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pneumatic_storage_mono");
+		pneumatic_storage_importer = new PneumoStorageImporter().setBlockName("pneumatic_storage_importer").setStepSound(ModSoundTypes.pipe).setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pneumatic_storage_importer");
 
 		chain = new BlockChain(Material.iron).setBlockName("dungeon_chain").setHardness(0.25F).setResistance(2.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":chain");
 
@@ -3176,6 +3179,7 @@ public class ModBlocks {
 		register(pneumatic_storage_access);
 		register(pneumatic_storage_clutter);
 		register(pneumatic_storage_mono);
+		register(pneumatic_storage_importer);
 		register(fan);
 		register(piston_inserter);
 

src/main/java/com/hbm/blocks/network/pneumatic/PneumoStorageClutter.java

@@ -15,6 +15,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
@@ -44,6 +45,11 @@ public class PneumoStorageClutter extends BlockContainer {
 		return false;
 	}
 
+	@Override
+	public Item getItemDropped(int i, Random rand, int j) {
+		return null;
+	}
+
 	@Override
 	public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
 

src/main/java/com/hbm/blocks/network/pneumatic/PneumoStorageImporter.java

@@ -0,0 +1,32 @@
+package com.hbm.blocks.network.pneumatic;
+
+import com.hbm.main.MainRegistry;
+
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class PneumoStorageImporter extends BlockContainer {
+
+	public PneumoStorageImporter() {
+		super(Material.iron);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World world, int meta) {
+		return null;
+	}
+
+	@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;
+		if(!player.isSneaking()) {
+			FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z);
+			return true;
+		}
+		return false;
+	}
+}

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

@@ -230,9 +230,6 @@ public class MineralRecipes {
 		addBilletToIngot(ModItems.ingot_hes, ModItems.billet_hes);
 		addBilletToIngot(ModItems.ingot_australium, ModItems.billet_australium);*/
 		
-		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_balefire_gold, 1), new Object[] { ModItems.billet_au198, ModItems.cell_antimatter, ModItems.pellet_charged });
-		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_flashlead, 2), new Object[] { ModItems.billet_balefire_gold, ModItems.billet_pb209, ModItems.cell_antimatter });
-		
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238, IRON.plate() }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_radium), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, IRON.plate() }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238, IRON.plate() }));

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

@@ -238,10 +238,13 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
 				.inputItems(new OreDictStack(STEEL.plate(), 8), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2))
 				.inputItemsEx(new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2)));
 		this.register(new GenericRecipe("ass.assembler").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_assembly_machine, 1))
-				.inputItems(new OreDictStack(STEEL.ingot(), 4), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG)));
+				.inputItems(new OreDictStack(STEEL.ingot(), 4), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BASIC)));
 		this.register(new GenericRecipe("ass.chemplant").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_chemical_plant, 1))
 				.inputItems(new OreDictStack(STEEL.ingot(), 8), new OreDictStack(CU.pipe(), 2), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.coil_tungsten, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG))
 				.inputItemsEx(new ComparableStack(ModItems.item_expensive, 3, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.pipe(), 2), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.coil_tungsten, 2), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ANALOG)));
+		this.register(new GenericRecipe("ass.chemplantAlt").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_chemical_plant, 1))
+				.inputItems(new OreDictStack(DURA.plate(), 8), new OreDictStack(CU.pipe(), 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BASIC))
+				.inputItemsEx(new ComparableStack(ModItems.item_expensive, 5, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.pipe(), 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit, 2, EnumCircuitType.BASIC)));
 		this.register(new GenericRecipe("ass.purex").setup(300, 100).outputItems(new ItemStack(ModBlocks.machine_purex, 1))
 				.inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(RUBBER.pipe(), 8), new OreDictStack(PB.plateCast(), 4), new ComparableStack(ModItems.motor_desh, 1), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BASIC))
 				.inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.LEAD_PLATING), new OreDictStack(STEEL.shell(), 4), new OreDictStack(RUBBER.pipe(), 12), new ComparableStack(ModItems.motor_desh, 3), new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.CIRCUIT)));

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

@@ -43,9 +43,21 @@ public class PUREXRecipes extends GenericRecipes<PUREXRecipe> {
 		this.register((PUREXRecipe) new PUREXRecipe("purex.uzh").setup(600, 1_000)
 				.inputItems(new ComparableStack(ModItems.billet_uranium_fuel),
 						new OreDictStack(ZR.billet(), 3))
-				.inputFluids(new FluidStack(Fluids.NITRIC_ACID, 1000), new FluidStack(Fluids.HYDROGEN, 4000))
+				.inputFluids(new FluidStack(Fluids.NITRIC_ACID, 1_000), new FluidStack(Fluids.HYDROGEN, 4000))
 				.outputItems(new ItemStack(ModItems.billet_uzh, 4)));
 		
+		this.register((PUREXRecipe) new PUREXRecipe("purex.flashgold").setup(600, 1_000)
+				.inputItems(new OreDictStack(AU198.billet()),
+						new ComparableStack(ModItems.pellet_charged))
+				.inputFluids(new FluidStack(Fluids.AMAT, 1_000))
+				.outputItems(new ItemStack(ModItems.billet_balefire_gold, 2)));
+		
+		this.register((PUREXRecipe) new PUREXRecipe("purex.flashlead").setup(600, 1_000)
+				.inputItems(new OreDictStack(PB209.billet()),
+						new ComparableStack(ModItems.billet_balefire_gold))
+				.inputFluids(new FluidStack(Fluids.AMAT, 1_000))
+				.outputItems(new ItemStack(ModItems.billet_flashlead, 1)));
+		
 		//CP-1
 		String autoPile = "autoswitch.pile";
 		this.register((PUREXRecipe) new PUREXRecipe("purex.pilepu").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this)