+Added New Circuits & Components along with recipes.

+Added A complete set of Machine components up to MAX voltage along with recipes.
+Started Initial work on multiblock items (Similar to the turbine rotor needed in Large turbines)
+Added better support for future recipe additions.

6 files changed, 308 insertions, 9 deletions

diff --git a/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java b/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
index 77e21f7607..af75e71324 100644
--- a/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
+++ b/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
@@ -108,6 +108,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	@Override
 	public boolean addFuel(ItemStack aInput1, ItemStack aOutput1, int aEU, int aType) {
         if (aInput1 == null) {
+        	Utils.LOG_INFO("Fuel Input is Invalid.");
             return false;
         }
         new GregtechRecipe(aInput1, aOutput1, GregTech_API.sRecipeFile.get("fuel_" + aType, aInput1, aEU), aType);
diff --git a/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechItems.java
index 77e3b7b015..f1cc7eaa76 100644
--- a/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,7 +1,6 @@
 package miscutil.gregtech.common.items;
 
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.Textures;
@@ -12,6 +11,8 @@ import gregtech.common.covers.GT_Cover_Arm;
 import gregtech.common.covers.GT_Cover_Conveyor;
 import gregtech.common.covers.GT_Cover_Pump;
 import miscutil.gregtech.api.enums.GregtechItemList;
+import miscutil.gregtech.api.enums.GregtechOrePrefixes;
+import miscutil.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import miscutil.gregtech.api.items.Gregtech_MetaItem_X32;
 
 public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
@@ -107,14 +108,43 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         //GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_MAX.get(1L, new Object[0]), //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'), OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite)});
        
         
-        //GregtechItemList.Circuit_Primitive.set(addItem(tLastID = 700, "NAND Chip", "A very simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
-        //GregtechItemList.Circuit_Basic.set(addItem(tLastID = 701, "Basic Electronic Circuit", "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
-        //GregtechItemList.Circuit_Good.set(addItem(tLastID = 702, "Good Electronic Circuit", "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)}));
-        //GregtechItemList.Circuit_Advanced.set(addItem(tLastID = 703, "Advanced Circuit", "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced)}));
-        GregtechItemList.Circuit_Data.set(addItem(tLastID = 704, "Circuit I", "A Data Chip", new Object[]{OrePrefixes.circuit.get(Materials.Data)}));
-        GregtechItemList.Circuit_Elite.set(addItem(tLastID = 705, "Circuit II", "A Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite)}));
-        GregtechItemList.Circuit_Master.set(addItem(tLastID = 706, "Circuit III", "A High Voltage Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master)}));
-       
+       /* GregtechItemList.Circuit_Primitive.set(addItem(tLastID = 700, "Circuit"+" "+tLastID, "A simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
+        GregtechItemList.Circuit_Basic.set(addItem(tLastID = 701, "Circuit"+" "+tLastID, "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
+        GregtechItemList.Circuit_Good.set(addItem(tLastID = 702, "Circuit"+" "+tLastID, "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)}));
+        GregtechItemList.Circuit_Advanced.set(addItem(tLastID = 703, "Circuit"+" "+tLastID, "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced)}));
+        GregtechItemList.Circuit_Data.set(addItem(tLastID = 704, "Circuit"+" "+tLastID, "A Data Chip", new Object[]{OrePrefixes.circuit.get(Materials.Data)}));
+        GregtechItemList.Circuit_Elite.set(addItem(tLastID = 705, "Circuit"+" "+tLastID, "A Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite)}));
+        GregtechItemList.Circuit_Master.set(addItem(tLastID = 706, "Circuit"+" "+tLastID, "A High Voltage Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master)}));
+        GregtechItemList.Tool_DataOrb.set(addItem(tLastID = 707, "Data Orb", "A High Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()}));
+        GregtechItemList.Circuit_Ultimate.set(ItemList.Tool_DataOrb.get(1L, new Object[0]));
+        GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataOrb.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataOrb.get(1L, new Object[0])});
+        GregtechItemList.Tool_DataStick.set(addItem(tLastID = 708, "Data Stick", "A Low Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()}));
+        GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataStick.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataStick.get(1L, new Object[0])});
+
+*
+*
+	Circuit_IV, Circuit_LuV, Circuit_ZPM,
+	Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, 
+	Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
+	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
+	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
+*
+*/
+        GregtechItemList.Circuit_IV.set(addItem(tLastID = 704, "Symbiotic Circuit (IV)", "A Symbiotic Data Processor", new Object[]{GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic)}));
+        GregtechItemList.Circuit_LuV.set(addItem(tLastID = 705, "Neutronic Circuit (LuV)", "A Neutron Particle Processor", new Object[]{OrePrefixes.circuit.get(GT_Materials.Neutronic)}));
+        GregtechItemList.Circuit_ZPM.set(addItem(tLastID = 706, "Quantum Circuit (ZPM)", "A Singlularity Processor", new Object[]{OrePrefixes.circuit.get(GT_Materials.Quantum)}));
+        GregtechItemList.Circuit_Board_IV.set(addItem(tLastID = 710, "IV Circuit Board", "An IV Voltage Rated Circuit Board", new Object[0]));
+        GregtechItemList.Circuit_Board_LuV.set(addItem(tLastID = 711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board", new Object[0]));
+        GregtechItemList.Circuit_Board_ZPM.set(addItem(tLastID = 712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board", new Object[0]));
+        GregtechItemList.Circuit_Parts_Crystal_Chip_IV.set(addItem(tLastID = 713, "(IV) Energized Crystal Chip", "Needed for Circuits", new Object[0]));
+        GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.set(addItem(tLastID = 714, "(LuV) Neutron based Microchip", "Needed for Circuits", new Object[0]));
+        GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.set(addItem(tLastID = 715, "(ZPM) Quantum Chip", "Needed for Circuits", new Object[0]));
+        GregtechItemList.Circuit_Parts_IV.set(addItem(tLastID = 716, "(IV) Energized Circuit Parts", "Circuit Parts", new Object[0]));
+        GregtechItemList.Circuit_Parts_LuV.set(addItem(tLastID = 717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts", new Object[0]));
+        GregtechItemList.Circuit_Parts_ZPM.set(addItem(tLastID = 718, "(ZPM) Quantum Circuit Parts", "Circuit Parts", new Object[0]));        
+        GregtechItemList.Circuit_Parts_Wiring_IV.set(addItem(tLastID = 719, "Etched IV Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+        GregtechItemList.Circuit_Parts_Wiring_LuV.set(addItem(tLastID = 720, "Etched LuV Voltage Wiring", "Part of Circuit Boards", new Object[0]));
+        GregtechItemList.Circuit_Parts_Wiring_ZPM.set(addItem(tLastID = 721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards", new Object[0]));
         
         
         
diff --git a/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechTools.java
new file mode 100644
index 0000000000..d2800fa2c0
--- /dev/null
+++ b/src/Java/miscutil/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -0,0 +1,24 @@
+package miscutil.gregtech.common.items;
+
+import miscutil.gregtech.api.items.Gregtech_MetaTool;
+import miscutil.gregtech.common.tools.TOOL_Gregtech_MaxEfficiencyMultiBlockItem;
+
+public class MetaGeneratedGregtechTools extends Gregtech_MetaTool {
+    
+    public static final short TURBINE_SMALL = 10;
+    public static final short TURBINE = 12;
+    public static final short TURBINE_LARGE = 14;
+    public static final short HUGE_ITEM = 16;
+    public static final short TURBINE_BLADE = 18;
+    public static MetaGeneratedGregtechTools INSTANCE;
+
+    public MetaGeneratedGregtechTools() {
+        super("MU-metaitem.02");
+        INSTANCE = this;
+        //addTool(TURBINE_SMALL, "Small Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Small(), new Object[]{});
+        //addTool(TURBINE, "Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Normal(), new Object[]{});
+        //addTool(TURBINE_LARGE, "Large Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Large(), new Object[]{});
+        addTool(HUGE_ITEM, "Huge Item", "Item 4 for your power station", new TOOL_Gregtech_MaxEfficiencyMultiBlockItem(), new Object[]{});
+
+    }
+}
diff --git a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_Base.java
new file mode 100644
index 0000000000..79afb7025d
--- /dev/null
+++ b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_Base.java
@@ -0,0 +1,168 @@
+package miscutil.gregtech.common.tools;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.damagesources.GT_DamageSources;
+
+import java.util.List;
+
+import miscutil.gregtech.api.interfaces.internal.Interface_ToolStats;
+import miscutil.gregtech.api.items.Gregtech_MetaTool;
+import net.minecraft.block.Block;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EntityDamageSource;
+import net.minecraft.util.IChatComponent;
+import net.minecraftforge.event.world.BlockEvent;
+
+public abstract class TOOL_Gregtech_Base
+implements Interface_ToolStats {
+	public static final Enchantment[] FORTUNE_ENCHANTMENT = {Enchantment.fortune};
+	public static final Enchantment[] LOOTING_ENCHANTMENT = {Enchantment.looting};
+	public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0];
+	public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0];
+
+	@Override
+	public int getToolDamagePerBlockBreak() {
+		return 100;
+	}
+
+	@Override
+	public int getToolDamagePerDropConversion() {
+		return 100;
+	}
+
+	@Override
+	public int getToolDamagePerContainerCraft() {
+		return 800;
+	}
+
+	@Override
+	public int getToolDamagePerEntityAttack() {
+		return 200;
+	}
+
+	@Override
+	public float getSpeedMultiplier() {
+		return 1.0F;
+	}
+
+	@Override
+	public float getMaxDurabilityMultiplier() {
+		return 1.0F;
+	}
+
+	@Override
+	public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {
+		return aOriginalHurtResistance;
+	}
+
+	@Override
+	public String getMiningSound() {
+		return null;
+	}
+
+	@Override
+	public String getCraftingSound() {
+		return null;
+	}
+
+	@Override
+	public String getEntityHitSound() {
+		return null;
+	}
+
+	@Override
+	public String getBreakingSound() {
+		return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
+	}
+
+	@Override
+	public int getBaseQuality() {
+		return 0;
+	}
+
+	@Override
+	public boolean canBlock() {
+		return false;
+	}
+
+	@Override
+	public boolean isCrowbar() {
+		return false;
+	}
+
+	@Override
+	public boolean isWrench() {
+		return false;
+	}
+
+	@Override
+	public boolean isWeapon() {
+		return false;
+	}
+
+	@Override
+	public boolean isRangedWeapon() {
+		return false;
+	}
+
+	@Override
+	public boolean isMiningTool() {
+		return true;
+	}
+
+	@Override
+	public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {
+		return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
+	}
+
+	public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
+		return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b(aEntity);
+	}
+
+	@Override
+	public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
+		return 0;
+	}
+
+	@Override
+	public ItemStack getBrokenItem(ItemStack aStack) {
+		return null;
+	}
+
+	@Override
+	public Enchantment[] getEnchantments(ItemStack aStack) {
+		return ZERO_ENCHANTMENTS;
+	}
+
+	@Override
+	public int[] getEnchantmentLevels(ItemStack aStack) {
+		return ZERO_ENCHANTMENT_LEVELS;
+	}
+
+	@Override
+	public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
+		aPlayer.triggerAchievement(AchievementList.openInventory);
+		aPlayer.triggerAchievement(AchievementList.mineWood);
+		aPlayer.triggerAchievement(AchievementList.buildWorkBench);
+	}
+	
+	@Override
+	public void onStatsAddedToTool(Gregtech_MetaTool aItem, int aID) {
+	}
+
+	@Override
+	public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {
+		return aOriginalDamage;
+	}
+
+	@Override
+	public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {
+		return aOriginalDamage;
+	}
+}
diff --git a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
new file mode 100644
index 0000000000..b1225ffcc5
--- /dev/null
+++ b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_BaseMultiblockItem.java
@@ -0,0 +1,49 @@
+package miscutil.gregtech.common.tools;
+
+import gregtech.api.interfaces.IIconContainer;
+import miscutil.gregtech.api.items.Gregtech_MetaTool;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+public abstract class TOOL_Gregtech_BaseMultiblockItem extends TOOL_Gregtech_Base {
+    @Override
+	public abstract float getBaseDamage();
+
+    @Override
+    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
+        return false;
+    }
+
+    @Override
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? getTurbineIcon() : null;
+    }
+
+    @Override
+    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? Gregtech_MetaTool.getPrimaryMaterial(aStack).mRGBa : null;
+    }
+
+    @Override
+	public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
+        return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED +
+                aEntity.getCommandSenderName() + "s" + EnumChatFormatting.WHITE + " head into a turbine");
+    }
+
+    public abstract IIconContainer getTurbineIcon();
+
+    @Override
+	public abstract float getSpeedMultiplier();
+
+    @Override
+	public abstract float getMaxDurabilityMultiplier();
+
+    @Override
+	public ItemStack getBrokenItem(ItemStack aStack) {
+        return null;
+    }
+}
diff --git a/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
new file mode 100644
index 0000000000..15cf1599b6
--- /dev/null
+++ b/src/Java/miscutil/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java
@@ -0,0 +1,27 @@
+package miscutil.gregtech.common.tools;
+
+import gregtech.api.interfaces.IIconContainer;
+import miscutil.gregtech.api.enums.GregtechTextures;
+
+public class TOOL_Gregtech_MaxEfficiencyMultiBlockItem extends TOOL_Gregtech_BaseMultiblockItem {
+    @Override
+    public float getSpeedMultiplier() {
+        return 4.0F;
+    }
+
+    @Override
+    public float getMaxDurabilityMultiplier() {
+        return 4.0F;
+    }
+
+    @Override
+    public float getBaseDamage() {
+        return 3.0F;
+    }
+
+    @Override
+    public IIconContainer getTurbineIcon() {
+        return GregtechTextures.ItemIcons.TURBINE_HUGE;
+    }
+
+}