Move sources and resources

22 files changed, 2259 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
new file mode 100644
index 0000000000..a349d7f86e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java
@@ -0,0 +1,22 @@
+package gtPlusPlus.xmod.ic2;
+
+import ic2.core.init.InternalName;
+import net.minecraftforge.common.util.EnumHelper;
+
+public class CustomInternalName {
+
+	public static InternalName aHazmatHelmetEx;
+	public static InternalName aHazmatChestEx;
+	public static InternalName aHazmatLegsEx;
+	public static InternalName aHazmatBootsEx;
+	
+	public static void init() {
+		aHazmatHelmetEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatHelmetEx", new Class[] {}, new Object[] {});
+		aHazmatChestEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatChestplateEx", new Class[] {}, new Object[] {});
+		aHazmatLegsEx = EnumHelper.addEnum(InternalName.class, "itemArmorHazmatLeggingsEx", new Class[] {}, new Object[] {});
+		aHazmatBootsEx = EnumHelper.addEnum(InternalName.class, "itemArmorRubBootsEx", new Class[] {}, new Object[] {});	
+	}
+
+	
+	
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
new file mode 100644
index 0000000000..bb97132ab4
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
@@ -0,0 +1,28 @@
+package gtPlusPlus.xmod.ic2;
+
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.ic2.item.IC2_Items;
+import gtPlusPlus.xmod.ic2.recipe.RECIPE_IC2;
+
+public class HANDLER_IC2{
+
+	public static void preInit() {
+		if (LoadedMods.IndustrialCraft2){
+			IC2_Items.register();
+			//new BlockRTG(InternalName.beer);
+		}
+	}
+
+	public static void init() {
+		if (LoadedMods.IndustrialCraft2){
+
+		}
+	}
+
+	public static void postInit() {
+		if (LoadedMods.IndustrialCraft2){
+			RECIPE_IC2.initRecipes();
+		}
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
new file mode 100644
index 0000000000..2a1b5ab44d
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java
@@ -0,0 +1,208 @@
+package gtPlusPlus.xmod.ic2.block.RTGGenerator;
+
+import java.util.List;
+import java.util.Random;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity.TileEntityKineticWindGenerator;
+import gtPlusPlus.xmod.ic2.item.IC2_Items;
+import gtPlusPlus.xmod.ic2.item.ItemGenerators;
+import ic2.core.IC2;
+import ic2.core.Ic2Items;
+import ic2.core.block.BlockMultiID;
+import ic2.core.block.TileEntityBlock;
+import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric;
+import ic2.core.init.InternalName;
+
+public class BlockRTG
+extends BlockMultiID
+{
+	public BlockRTG(final InternalName internalName1)
+	{
+		super(internalName1, Material.iron, ItemGenerators.class);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		this.setHardness(3.0F);
+		this.setStepSound(soundTypeMetal);
+
+		IC2_Items.blockRTG = new ItemStack(this, 1, 0);
+		IC2_Items.blockKineticGenerator = new ItemStack(this, 1, 1);
+
+		GameRegistry.registerTileEntity(TileEntityRTG.class, "RTG Mach II");
+		GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II");
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public void getSubBlocks(final Item j, final CreativeTabs tabs, final List itemList) {
+		final Item item = Item.getItemFromBlock(this);
+		if (!item.getHasSubtypes()) {
+			itemList.add(new ItemStack(this));
+		} else {
+			for (int i = 0; i < 16; i++)
+			{
+				final ItemStack is = new ItemStack(this, 1, i);
+				if (is.getItem().getUnlocalizedName(is) == null) {
+					break;
+				}
+				itemList.add(is);
+			}
+		}
+	}
+
+
+	@Override
+	public String getTextureFolder(final int id)
+	{
+		return "generator";
+	}
+
+	@Override
+	public int damageDropped(final int meta)
+	{
+		switch (meta)
+		{
+		case 2:
+			return 2;
+		}
+		return 0;
+	}
+
+	@Override
+	public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs)
+	{
+		try
+		{
+			switch (meta)
+			{
+			case 0:
+				return TileEntityRTG.class;
+			case 1:
+				return TileEntityKineticWindGenerator.class;
+			}
+		}
+		catch (final Exception e)
+		{
+			throw new RuntimeException(e);
+		}
+		return null;
+	}
+
+	/*
+	 *
+	 *  {
+      case 0:
+        return TileEntityGenerator.class;
+      case 1:
+        return TileEntityGeoGenerator.class;
+      case 2:
+        return TileEntityWaterGenerator.class;
+      case 3:
+        return TileEntitySolarGenerator.class;
+      case 4:
+        return TileEntityWindGenerator.class;
+      case 5:
+        return TileEntityNuclearReactorElectric.class;
+      case 6:
+        return TileEntityRTGenerator.class;
+      case 7:
+        return TileEntitySemifluidGenerator.class;
+      case 8:
+        return TileEntityStirlingGenerator.class;
+      case 9:
+        return TileEntityKineticGenerator.class;
+      }
+	 *
+	 * (non-Javadoc)
+	 * @see net.minecraft.block.Block#randomDisplayTick(net.minecraft.world.World, int, int, int, java.util.Random)
+	 */
+
+	@Override
+	public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random random)
+	{
+		if (!IC2.platform.isRendering()) {
+			return;
+		}
+		final int meta = world.getBlockMetadata(x, y, z);
+		if ((meta == 0) && (this.isActive(world, x, y, z)))
+		{
+			final TileEntityBlock te = (TileEntityBlock)this.getOwnTe(world, x, y, z);
+			if (te == null) {
+				return;
+			}
+			final int l = te.getFacing();
+			final float f = x + 0.5F;
+			final float f1 = y + 0.0F + ((random.nextFloat() * 6.0F) / 16.0F);
+			final float f2 = z + 0.5F;
+			final float f3 = 0.52F;
+			final float f4 = (random.nextFloat() * 0.6F) - 0.3F;
+			switch (l)
+			{
+			case 4:
+				world.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+				world.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+				break;
+			case 5:
+				world.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+				world.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D);
+				break;
+			case 2:
+				world.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
+				world.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D);
+				break;
+			case 3:
+				world.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
+				world.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D);
+			}
+		}
+		else if (meta == 5)
+		{
+			final TileEntityNuclearReactorElectric te = (TileEntityNuclearReactorElectric)this.getOwnTe(world, x, y, z);
+			if (te == null) {
+				return;
+			}
+			int puffs = te.heat / 1000;
+			if (puffs <= 0) {
+				return;
+			}
+			puffs = world.rand.nextInt(puffs);
+			for (int n = 0; n < puffs; n++) {
+				world.spawnParticle("smoke", x + random.nextFloat(), y + 0.95F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+			}
+			puffs -= world.rand.nextInt(4) + 3;
+			for (int n = 0; n < puffs; n++) {
+				world.spawnParticle("flame", x + random.nextFloat(), y + 1.0F, z + random.nextFloat(), 0.0D, 0.0D, 0.0D);
+			}
+		}
+	}
+
+	@Override
+	public boolean onBlockActivated(final World world, final int i, final int j, final int k, final EntityPlayer entityplayer, final int side, final float a, final float b, final float c)
+	{
+		if ((entityplayer.getCurrentEquippedItem() != null) && (entityplayer.getCurrentEquippedItem().isItemEqual(Ic2Items.reactorChamber))) {
+			return false;
+		}
+		return super.onBlockActivated(world, i, j, k, entityplayer, side, a, b, c);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(final ItemStack stack)
+	{
+		return stack.getItemDamage() == 5 ? EnumRarity.uncommon : EnumRarity.common;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
new file mode 100644
index 0000000000..aa50243914
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java
@@ -0,0 +1,88 @@
+package gtPlusPlus.xmod.ic2.block.RTGGenerator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.CONTAINER_RTG;
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.gui.GUI_RTG;
+import ic2.core.ContainerBase;
+import ic2.core.Ic2Items;
+import ic2.core.block.generator.tileentity.TileEntityRTGenerator;
+import ic2.core.block.invslot.InvSlotConsumable;
+import ic2.core.block.invslot.InvSlotConsumableId;
+
+public class TileEntityRTG
+extends TileEntityRTGenerator
+{
+	public final InvSlotConsumable fuelSlot;
+
+	public TileEntityRTG()
+	{
+		this.fuelSlot = new InvSlotConsumableId(this, "fuelSlot", 0, 12, new Item[] { Ic2Items.RTGPellets.getItem() });
+	}
+
+	@Override
+	public int gaugeFuelScaled(final int i)
+	{
+		return i;
+	}
+
+	@Override
+	public boolean gainEnergy()
+	{
+		int counter = 0;
+		for (int i = 0; i < this.fuelSlot.size(); i++) {
+			if (this.fuelSlot.get(i) != null) {
+				counter++;
+			}
+		}
+		if (counter == 0) {
+			return false;
+		}
+		this.storage += (int)Math.pow(2.0D, counter - 1);
+		return true;
+	}
+
+	@Override
+	public boolean gainFuel()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean needsFuel()
+	{
+		return true;
+	}
+
+	@Override
+	public String getInventoryName()
+	{
+		return "RTG";
+	}
+
+	@Override
+	public ContainerBase<TileEntityRTGenerator> getGuiContainer(final EntityPlayer entityPlayer)
+	{
+		return new CONTAINER_RTG(entityPlayer, this);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin)
+	{
+		return new GUI_RTG(new CONTAINER_RTG(entityPlayer, this));
+	}
+
+	@Override
+	public boolean delayActiveUpdate()
+	{
+		return true;
+	}
+
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
new file mode 100644
index 0000000000..0afe47c983
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java
@@ -0,0 +1,37 @@
+package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
+import ic2.core.block.generator.container.ContainerRTGenerator;
+import ic2.core.slot.SlotInvSlot;
+
+public class CONTAINER_RTG
+extends ContainerRTGenerator
+{
+	public CONTAINER_RTG(final EntityPlayer entityPlayer, final TileEntityRTG tileEntity1)
+	{
+		super(entityPlayer, tileEntity1);
+		for (int i = 0; i < 4; i++) {
+			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + (i * 18), 18));
+		}
+		for (int i = 4; i < 8; i++) {
+			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 4) * 18), 36));
+		}
+		for (int i = 8; i < 12; i++) {
+			this.addSlotToContainer(new SlotInvSlot(tileEntity1.fuelSlot, i, 36 + ((i - 8) * 18), 54));
+		}
+	}
+
+	@Override
+	public List<String> getNetworkedFields()
+	{
+		final List<String> ret = super.getNetworkedFields();
+
+		ret.add("storage");
+
+		return ret;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
new file mode 100644
index 0000000000..c6e09a78d1
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java
@@ -0,0 +1,52 @@
+package gtPlusPlus.xmod.ic2.block.RTGGenerator.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import gtPlusPlus.xmod.ic2.block.RTGGenerator.TileEntityRTG;
+import ic2.core.IC2;
+import ic2.core.block.generator.gui.GuiRTGenerator;
+import ic2.core.util.GuiTooltipHelper;
+
+@SideOnly(Side.CLIENT)
+public class GUI_RTG
+extends GuiRTGenerator
+{
+	public CONTAINER_RTG container;
+
+	public GUI_RTG(final CONTAINER_RTG container1)
+	{
+		super(container1);
+
+		this.container = container1;
+		this.name = "RTG Mach II";
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2)
+	{
+		this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752);
+
+		GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48);
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y)
+	{
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		this.mc.getTextureManager().bindTexture(background);
+		final int j = (this.width - this.xSize) / 2;
+		final int k = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize);
+
+		final int i1 = ((TileEntityRTG)this.container.base).gaugeStorageScaled(31);
+		this.drawTexturedModalRect(j + 119, k + 40, 179, 3, i1, 8);
+	}
+
+	private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIRTGenerator.png");
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
new file mode 100644
index 0000000000..95e785d1a1
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java
@@ -0,0 +1,77 @@
+package gtPlusPlus.xmod.ic2.block.kieticgenerator;
+
+import org.apache.commons.lang3.mutable.MutableObject;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import ic2.core.block.BlockMultiID;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityManualKineticGenerator;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
+import ic2.core.init.InternalName;
+import ic2.core.item.block.ItemKineticGenerator;
+
+public class IC2_BlockKineticGenerator
+extends BlockMultiID
+{
+	public IC2_BlockKineticGenerator(final InternalName internalName1)
+	{
+		super(internalName1, Material.iron, ItemKineticGenerator.class);
+
+		this.setHardness(3.0F);
+		this.setStepSound(Block.soundTypeMetal);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+
+		GameRegistry.registerTileEntity(TileEntityWindKineticGenerator.class, "Advanced Kinetic Wind Generator");
+
+	}
+
+	@Override
+	public String getTextureFolder(final int id)
+	{
+		return "kineticgenerator";
+	}
+
+	@Override
+	public int damageDropped(final int meta)
+	{
+		return meta;
+	}
+
+	@Override
+	public Class<? extends TileEntity> getTeClass(final int meta, final MutableObject<Class<?>[]> ctorArgTypes, final MutableObject<Object[]> ctorArgs)
+	{
+		try
+		{
+			switch (meta)
+			{
+			case 0:
+				return TileEntityWindKineticGenerator.class;
+			}
+		}
+		catch (final Exception e)
+		{
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer entityPlayer, final int side, final float a, final float b, final float c)
+	{
+		if (entityPlayer.isSneaking()) {
+			return false;
+		}
+		final TileEntity te = this.getOwnTe(world, x, y, z);
+		if ((te != null) && ((te instanceof TileEntityManualKineticGenerator))) {
+			return ((TileEntityManualKineticGenerator)te).playerKlicked(entityPlayer);
+		}
+		return super.onBlockActivated(world, x, y, z, entityPlayer, side, a, b, c);
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
new file mode 100644
index 0000000000..2c4c2e1d16
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java
@@ -0,0 +1,48 @@
+package gtPlusPlus.xmod.ic2.block.kieticgenerator;
+
+import java.io.DataInput;
+import java.io.IOException;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+
+import ic2.core.block.TileEntityBlock;
+
+public abstract class IC2_TEComponent
+{
+	protected final TileEntityBlock parent;
+
+	public IC2_TEComponent(final TileEntityBlock parent)
+	{
+		this.parent = parent;
+	}
+
+	public abstract String getDefaultName();
+
+	public void readFromNbt(final NBTTagCompound nbt) {}
+
+	public NBTTagCompound writeToNbt()
+	{
+		return null;
+	}
+
+	public void onLoaded() {}
+
+	public void onUnloaded() {}
+
+	public void onNeighborUpdate(final Block srcBlock) {}
+
+	public void onContainerUpdate(final String name, final EntityPlayerMP player) {}
+
+	public void onNetworkUpdate(final DataInput is)
+			throws IOException
+	{}
+
+	public boolean enableWorldTick()
+	{
+		return false;
+	}
+
+	public void onWorldTick() {}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
new file mode 100644
index 0000000000..2a5b4dc9ae
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java
@@ -0,0 +1,28 @@
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.container;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+
+import ic2.core.ContainerFullInv;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
+import ic2.core.slot.SlotInvSlot;
+
+public class ContainerKineticWindgenerator
+extends ContainerFullInv<TileEntityWindKineticGenerator>
+{
+	public ContainerKineticWindgenerator(final EntityPlayer entityPlayer, final TileEntityWindKineticGenerator tileEntity1)
+	{
+		super(entityPlayer, tileEntity1, 166);
+
+		this.addSlotToContainer(new SlotInvSlot(tileEntity1.rotorSlot, 0, 80, 26));
+	}
+
+	@Override
+	public List<String> getNetworkedFields()
+	{
+		final List<String> ret = super.getNetworkedFields();
+		ret.add("windStrength");
+		return ret;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
new file mode 100644
index 0000000000..740991c5d3
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java
@@ -0,0 +1,5 @@
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.container;
+
+public class IC2_ContainerBase {
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
new file mode 100644
index 0000000000..44053ed2e0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java
@@ -0,0 +1,78 @@
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import ic2.core.IC2;
+import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
+import ic2.core.util.GuiTooltipHelper;
+
+@SideOnly(Side.CLIENT)
+public class GuiKineticWindGenerator
+extends GuiContainer
+{
+	public ContainerWindKineticGenerator container;
+	public String name;
+
+	public GuiKineticWindGenerator(final ContainerWindKineticGenerator container1)
+	{
+		super(container1);
+
+		this.container = container1;
+		this.name = StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.name");
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2)
+	{
+		this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 4210752);
+		if (this.container.base.checkrotor())
+		{
+			if (!this.container.base.rotorspace())
+			{
+				this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), 20, 52, 2157374);
+			}
+			else if ((this.container.base.checkrotor()) && (!this.container.base.guiisminWindStrength()))
+			{
+				this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), 27, 52, 2157374);
+				this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak2"), 24, 69, 2157374);
+			}
+			else
+			{
+				this.fontRendererObj.drawString(StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.output", new Object[] { Integer.valueOf(this.container.base.getKuOutput()) }), 55, 52, 2157374);
+				this.fontRendererObj.drawString(this.container.base.getRotorhealth() + " %", 46, 70, 2157374);
+				if (this.container.base.guiisoverload())
+				{
+					GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45);
+					GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45);
+				}
+			}
+		}
+		else {
+			this.fontRendererObj.drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374);
+		}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(final float f, final int x, final int y)
+	{
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		this.mc.getTextureManager().bindTexture(background);
+		final int j = (this.width - this.xSize) / 2;
+		final int k = (this.height - this.ySize) / 2;
+		this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize);
+		if ((this.container.base.guiisoverload()) && (this.container.base.checkrotor()))
+		{
+			this.drawTexturedModalRect(j + 44, k + 20, 176, 0, 30, 26);
+			this.drawTexturedModalRect(j + 102, k + 20, 176, 0, 30, 26);
+		}
+	}
+
+	private static final ResourceLocation background = new ResourceLocation(IC2.textureDomain, "textures/gui/GUIWindKineticGenerator.png");
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
new file mode 100644
index 0000000000..a2c39cb17b
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
@@ -0,0 +1,389 @@
+package gtPlusPlus.xmod.ic2.block.kieticgenerator.tileentity;
+
+import java.util.List;
+import java.util.Vector;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.ChunkCache;
+
+import ic2.api.energy.tile.IKineticSource;
+import ic2.api.item.IKineticRotor;
+import ic2.api.item.IKineticRotor.GearboxType;
+import ic2.core.*;
+import ic2.core.block.invslot.InvSlotConsumableKineticRotor;
+import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator;
+import ic2.core.util.Util;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class TileEntityKineticWindGenerator
+extends TileEntityWindKineticGenerator
+implements IKineticSource, IHasGui
+{
+	public final InvSlotConsumableKineticRotor rotorSlot;
+	private double windStrength;
+	private int obstructedCrossSection;
+	private int crossSection;
+	private int updateTicker;
+	private float rotationSpeed;
+	private static final double efficiencyRollOffExponent = 2.0D;
+	private static final int nominalRotationPeriod = 500;
+
+	public TileEntityKineticWindGenerator()
+	{
+		this.updateTicker = IC2.random.nextInt(this.getTickRate());
+		this.rotorSlot = new InvSlotConsumableKineticRotor(this, "rotorslot", 0, null, 1, null, GearboxType.WIND);
+	}
+
+
+	public void update2Entity()
+	{
+		super.updateEntity();
+
+		assert (IC2.platform.isSimulating());
+		if ((this.updateTicker++ % this.getTickRate()) != 0) {
+			return;
+		}
+		boolean needsInvUpdate = false;
+		if (!this.rotorSlot.isEmpty())
+		{
+			if (this.checkSpace(1, true) == 0)
+			{
+				if (this.getActive() != true) {
+					this.setActive(true);
+				}
+				needsInvUpdate = true;
+			}
+			else
+			{
+				if (this.getActive()) {
+					this.setActive(false);
+				}
+				needsInvUpdate = true;
+			}
+		}
+		else
+		{
+			if (this.getActive()) {
+				this.setActive(false);
+			}
+			needsInvUpdate = true;
+		}
+		if (this.getActive())
+		{
+			this.crossSection = (((this.getRotorDiameter() / 2) * 2 * 2) + 1);
+
+			this.crossSection *= this.crossSection;
+			this.obstructedCrossSection = this.checkSpace(this.getRotorDiameter() * 3, false);
+			if ((this.obstructedCrossSection > 0) && (this.obstructedCrossSection <= ((this.getRotorDiameter() + 1) / 2))) {
+				this.obstructedCrossSection = 0;
+			} else if (this.obstructedCrossSection < 0) {
+				this.obstructedCrossSection = this.crossSection;
+			}
+			this.windStrength = this.calcWindStrength();
+
+			final float speed = (float)Util.limit((this.windStrength - this.getMinWindStrength()) / this.getMaxWindStrength(), 0.0D, 2.0D);
+
+
+			this.setRotationSpeed(speed*2);
+			if (this.windStrength >= this.getMinWindStrength()) {
+				if (this.windStrength <= this.getMaxWindStrength()) {
+					this.rotorSlot.damage(1, false);
+				} else {
+					this.rotorSlot.damage(4, false);
+				}
+			}
+		}
+	}
+
+
+
+	@Override
+	public List<String> getNetworkedFields()
+	{
+		final List<String> ret = new Vector<>(1);
+
+		ret.add("rotationSpeed");
+		ret.add("rotorSlot");
+		ret.addAll(super.getNetworkedFields());
+
+		return ret;
+	}
+
+	@Override
+	public ContainerBase<TileEntityWindKineticGenerator> getGuiContainer(final EntityPlayer entityPlayer)
+	{
+		return new ContainerWindKineticGenerator(entityPlayer, this);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public GuiScreen getGui(final EntityPlayer entityPlayer, final boolean isAdmin)
+	{
+		return new GuiWindKineticGenerator(new ContainerWindKineticGenerator(entityPlayer, this));
+	}
+
+	@Override
+	public boolean facingMatchesDirection(final ForgeDirection direction)
+	{
+		return direction.ordinal() == this.getFacing();
+	}
+
+	@Override
+	public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final int side)
+	{
+		if ((side == 0) || (side == 1)) {
+			return false;
+		}
+		return this.getFacing() != side;
+	}
+
+	@Override
+	public void setFacing(final short side)
+	{
+		super.setFacing(side);
+	}
+
+	public boolean enableUpdateEntity()
+	{
+		return IC2.platform.isSimulating();
+	}
+
+	@Override
+	public String getRotorhealth()
+	{
+		if (!this.rotorSlot.isEmpty()) {
+			return StatCollector.translateToLocalFormatted("ic2.WindKineticGenerator.gui.rotorhealth", new Object[] { Integer.valueOf((int)(100.0F - ((this.rotorSlot.get().getItemDamage() / this.rotorSlot.get().getMaxDamage()) * 100.0F))) });
+		}
+		return "";
+	}
+
+	@Override
+	public int maxrequestkineticenergyTick(final ForgeDirection directionFrom)
+	{
+		return this.getKuOutput();
+	}
+
+	@Override
+	public int requestkineticenergy(final ForgeDirection directionFrom, final int requestkineticenergy)
+	{
+		if (this.facingMatchesDirection(directionFrom.getOpposite())) {
+			return Math.min(requestkineticenergy, this.getKuOutput());
+		}
+		return 0;
+	}
+
+	@Override
+	public String getInventoryName()
+	{
+		return "Advanced Kinetic Wind Generator";
+	}
+
+	@Override
+	public void onGuiClosed(final EntityPlayer entityPlayer) {}
+
+	@Override
+	public boolean shouldRenderInPass(final int pass)
+	{
+		return pass == 0;
+	}
+
+	@Override
+	public int checkSpace(int length, final boolean onlyrotor)
+	{
+		int box = this.getRotorDiameter() / 2;
+		int lentemp = 0;
+		if (onlyrotor)
+		{
+			length = 1;
+			lentemp = length + 1;
+		}
+		if (!onlyrotor) {
+			box *= 2;
+		}
+		final ForgeDirection fwdDir = ForgeDirection.VALID_DIRECTIONS[this.getFacing()];
+		final ForgeDirection rightDir = fwdDir.getRotation(ForgeDirection.DOWN);
+
+		final int xMaxDist = Math.abs((length * fwdDir.offsetX) + (box * rightDir.offsetX));
+
+		final int zMaxDist = Math.abs((length * fwdDir.offsetZ) + (box * rightDir.offsetZ));
+
+
+		final ChunkCache chunkCache = new ChunkCache(this.worldObj, this.xCoord - xMaxDist, this.yCoord - box, this.zCoord - zMaxDist, this.xCoord + xMaxDist, this.yCoord + box, this.zCoord + zMaxDist, 0);
+
+
+
+		int ret = 0;
+		for (int up = -box; up <= box; up++)
+		{
+			final int y = this.yCoord + up;
+			for (int right = -box; right <= box; right++)
+			{
+				boolean occupied = false;
+				for (int fwd = lentemp - length; fwd <= length; fwd++)
+				{
+					final int x = this.xCoord + (fwd * fwdDir.offsetX) + (right * rightDir.offsetX);
+
+					final int z = this.zCoord + (fwd * fwdDir.offsetZ) + (right * rightDir.offsetZ);
+
+
+					assert (Math.abs(x - this.xCoord) <= xMaxDist);
+					assert (Math.abs(z - this.zCoord) <= zMaxDist);
+
+					final Block block = chunkCache.getBlock(x, y, z);
+					if (!block.isAir(chunkCache, x, y, z))
+					{
+						occupied = true;
+						if (((up != 0) || (right != 0) || (fwd != 0)) && ((chunkCache.getTileEntity(x, y, z) instanceof TileEntityKineticWindGenerator)) && (!onlyrotor)) {
+							return -1;
+						}
+					}
+				}
+				if (occupied) {
+					ret++;
+				}
+			}
+		}
+		return ret;
+	}
+
+	@Override
+	public boolean checkrotor()
+	{
+		return !this.rotorSlot.isEmpty();
+	}
+
+	@Override
+	public boolean rotorspace()
+	{
+		return this.checkSpace(1, true) == 0;
+	}
+
+	private void setRotationSpeed(final float speed)
+	{
+		if (this.rotationSpeed != speed)
+		{
+			this.rotationSpeed = speed;
+			IC2.network.get().updateTileEntityField(this, "rotationSpeed");
+		}
+	}
+
+	@Override
+	public int getTickRate()
+	{
+		return 32;
+	}
+
+	@Override
+	public double calcWindStrength()
+	{
+		double windStr = WorldData.get(this.worldObj).windSim.getWindAt(this.yCoord);
+
+		windStr *= (1.0D - Math.pow(this.obstructedCrossSection / this.crossSection, 2.0D));
+
+
+		return Math.max(0.0D, windStr);
+	}
+
+	@Override
+	public float getAngle()
+	{
+		if (this.rotationSpeed > 0.0F)
+		{
+			final long period = (long) (5.0E+008F / this.rotationSpeed);
+
+
+			return ((float)(System.nanoTime() % period) / (float)period) * 360.0F;
+		}
+		return 0.0F;
+	}
+
+	@Override
+	public float getefficiency()
+	{
+		final ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return (float) (((IKineticRotor)stack.getItem()).getEfficiency(stack)*1.5);
+		}
+		return 0.0F;
+	}
+
+	@Override
+	public int getMinWindStrength()
+	{
+		final ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getMinWindStrength(stack)/2;
+		}
+		return 0;
+	}
+
+	@Override
+	public int getMaxWindStrength()
+	{
+		final ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getMaxWindStrength(stack)*2;
+		}
+		return 0;
+	}
+
+	@Override
+	public int getRotorDiameter()
+	{
+		final ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getDiameter(stack)/2;
+		}
+		return 0;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture()
+	{
+		final ItemStack stack = this.rotorSlot.get();
+		if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) {
+			return ((IKineticRotor)stack.getItem()).getRotorRenderTexture(stack);
+		}
+		return new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorWoodmodel.png");
+	}
+
+	@Override
+	public boolean guiisoverload()
+	{
+		if (this.windStrength > this.getMaxWindStrength()) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean guiisminWindStrength()
+	{
+		return this.windStrength >= this.getMinWindStrength();
+	}
+
+	@Override
+	public int getKuOutput()
+	{
+		if ((this.windStrength >= this.getMinWindStrength()) && (this.getActive())) {
+			return (int)(this.windStrength * 50.0D * this.getefficiency());
+		}
+		return 0;
+	}
+
+	@Override
+	public int getWindStrength()
+	{
+		return (int)this.windStrength;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
new file mode 100644
index 0000000000..92d711101b
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
@@ -0,0 +1,276 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
+import ic2.api.item.IKineticRotor;
+import ic2.core.IC2;
+import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+public class CustomKineticRotor extends Item implements IKineticRotor {
+
+	private final int mTier;
+	
+	@SideOnly(Side.CLIENT)
+	private IIcon[] mTextures;
+	
+	private static final String[] mRegistrationNames = new String[] {
+			"itemwoodrotor", "itemironrotor", "itemsteelrotor", "itemwcarbonrotor"
+	};
+	
+	private static final String[] mUnlocalNames = new String[] {
+			"itemEnergeticRotor",
+			"itemTungstenSteelRotor",
+			"itemVibrantRotor",
+			"itemIridiumRotor",
+			"itemMagnaliumRotor",
+			"itemUltimetRotor",			
+	};
+	private static final int[] mMaxDurability = new int[] {
+			512000, 809600, 1600000, 3200000
+	};
+	private static final int[] mRadius = new int[] {
+			9, 11, 13, 15
+	};
+	private static final float[] mEfficiency = new float[] {
+			0.9f, 1.0f, 1.2f, 1.5f
+	};
+	private static final int[] mMinWindStrength = new int[] {
+			12, 14, 16, 18
+	};
+	private static final int[] mMaxWindStrength = new int[] {
+			80, 120, 160, 320
+	};
+	
+	private static final ResourceLocation[] mResourceLocations = new ResourceLocation[] {
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png"),
+			new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png"),
+	};	
+
+	private final int maxWindStrength;
+	private final int minWindStrength;
+	private final int radius;
+	private final float efficiency;
+	private final ResourceLocation renderTexture;
+	
+	public CustomKineticRotor(int aTier) {
+		mTier = aTier;
+		this.setMaxStackSize(1);
+		// Handle Differences if EIO is not loaded
+		if (!LoadedMods.EnderIO && (aTier == 0 || aTier == 2)) {
+			this.renderTexture = mResourceLocations[(aTier == 0 ? 4 : 5)];	
+			this.setUnlocalizedName(mUnlocalNames[(aTier == 0 ? 4 : 5)]);		
+		}
+		else {
+			this.renderTexture = mResourceLocations[aTier];
+			this.setUnlocalizedName(mUnlocalNames[aTier]);
+		}	
+		this.setMaxDamage(mMaxDurability[aTier]);
+		this.radius = mRadius[aTier];
+		this.efficiency = mEfficiency[aTier];
+		this.minWindStrength = mMinWindStrength[aTier];
+		this.maxWindStrength = mMaxWindStrength[aTier];
+		this.setNoRepair();
+		this.setCreativeTab(IC2.tabIC2);
+		GameRegistry.registerItem(this, mRegistrationNames[aTier]);	
+	}
+	
+	@Override
+	public void setDamage(final ItemStack stack, final int damage) {
+		if (mTier < 3) {
+			super.setDamage(stack, damage);
+		}
+	}
+
+	@Override
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) {
+
+		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info",	new Object[]{this.minWindStrength, this.maxWindStrength}));
+		
+		GearboxType type = null;
+		if (Minecraft.getMinecraft().currentScreen != null && Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator) {
+			type = GearboxType.WATER;
+		} 
+		else if (Minecraft.getMinecraft().currentScreen != null	&& Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator) {
+			type = GearboxType.WIND;
+		}
+		
+		if (type != null) {
+			info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + this.isAcceptedType(itemStack, type)));
+		}
+		
+	}
+
+	@Override
+	public int getDiameter(final ItemStack stack)
+	{
+		return this.radius;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack)
+	{
+		return this.renderTexture;
+	}
+
+	@Override
+	public float getEfficiency(final ItemStack stack)
+	{
+		return this.efficiency;
+	}
+
+	@Override
+	public int getMinWindStrength(final ItemStack stack)
+	{
+		return this.minWindStrength;
+	}
+
+	@Override
+	public int getMaxWindStrength(final ItemStack stack)
+	{
+		return this.maxWindStrength;
+	}
+
+	@Override
+	public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type){
+		return (type == IKineticRotor.GearboxType.WIND) || (type == IKineticRotor.GearboxType.WATER);
+	}
+
+	public String getUnlocalizedName() {
+		return "ic2." + super.getUnlocalizedName().substring(5);
+	}
+
+	public String getUnlocalizedName(ItemStack itemStack) {
+		return this.getUnlocalizedName();
+	}
+
+	public String getItemStackDisplayName(ItemStack itemStack) {
+		return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack));
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return mTier < 3;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(int meta) {		
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconIndex(ItemStack aIndex) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamageForRenderPass(int aDmg, int aPass) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	protected String getIconString() {
+		return super.getIconString();
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return super.getDisplayDamage(stack);
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return super.getDurabilityForDisplay(stack);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}		
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(ItemStack stack, int pass) {
+		if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+			if (mTier == 0) {
+				return mTextures[4];				
+			}
+			else {
+				return mTextures[5];				
+			}
+		}
+		else {
+			return mTextures[mTier];
+		}
+	}
+
+	@Override
+	public void registerIcons(IIconRegister iconRegister) {		
+		int aIndex = 0;
+		mTextures = new IIcon[6];
+		for (String y : mUnlocalNames) {
+			mTextures[aIndex++] = iconRegister.registerIcon(IC2.textureDomain + ":" + "rotors/" + y);		
+		}		
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
new file mode 100644
index 0000000000..bd1ad91588
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java
@@ -0,0 +1,43 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+
+public class IC2_ItemGradual
+extends CoreItem
+{
+	public IC2_ItemGradual(final String internalName)
+	{
+		super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon);
+		this.setNoRepair();
+	}
+
+	@Override
+	public boolean isDamaged(final ItemStack stack)
+	{
+		return this.getDamage(stack) > 1;
+	}
+
+	@Override
+	public boolean showDurabilityBar(final ItemStack stack)
+	{
+		return true;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void getSubItems(final Item item, final CreativeTabs tabs, final List itemList)
+	{
+		itemList.add(new ItemStack(this, 1, 1));
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
new file mode 100644
index 0000000000..3ccb2cb0ee
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java
@@ -0,0 +1,54 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import ic2.api.item.ICustomDamageItem;
+import ic2.core.util.StackUtil;
+
+public class IC2_ItemGradualInteger
+extends IC2_ItemGradual
+implements ICustomDamageItem
+{
+	private final int maxDmg;
+
+	public IC2_ItemGradualInteger(final String internalName, final int maxdmg)
+	{
+		super(internalName);
+
+		this.maxDmg = maxdmg;
+	}
+
+	@Override
+	public int getCustomDamage(final ItemStack stack)
+	{
+		final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
+		return nbt.getInteger("advDmg");
+	}
+
+	@Override
+	public int getMaxCustomDamage(final ItemStack stack)
+	{
+		return this.maxDmg;
+	}
+
+	@Override
+	public void setCustomDamage(final ItemStack stack, final int damage)
+	{
+		final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
+		nbt.setInteger("advDmg", 0);
+
+		final int maxStackDamage = stack.getMaxDamage();
+		if (maxStackDamage > 2) {
+			//stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2));
+		}
+	}
+
+	@Override
+	public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src)
+	{
+		this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
+		return true;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
new file mode 100644
index 0000000000..897e831b73
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
@@ -0,0 +1,106 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
+public class IC2_ItemIC2
+extends Item
+{
+	public IC2_ItemIC2(final String internalName)
+	{
+		this.setUnlocalizedName(internalName);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		this.setTextureName(CORE.MODID + ":" + internalName);
+
+		GameRegistry.registerItem(this, internalName);
+	}
+
+	public String getTextureFolder()
+	{
+		return null;
+	}
+
+	/*  public String getTextureName(int index)
+  {
+    if ((!this.hasSubtypes) && (index > 0)) {
+      return null;
+    }
+    String name = getUnlocalizedName(new ItemStack(this, 1, index));
+    if ((name != null) && (name.length() > 4)) {
+      return name.substring(4);
+    }
+    return name;
+  }
+
+  @Override
+@SideOnly(Side.CLIENT)
+  public void registerIcons(IIconRegister iconRegister)
+  {
+    int indexCount = 0;
+    while (getTextureName(indexCount) != null)
+    {
+      indexCount++;
+      if (indexCount > 32767) {
+        throw new RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName());
+      }
+    }
+    this.textures = new IIcon[indexCount];
+    for (int index = 0; index < indexCount; index++) {
+      this.textures[index] = iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName());
+    }
+  }
+
+  @Override
+@SideOnly(Side.CLIENT)
+  public IIcon getIconFromDamage(int meta)
+  {
+    if (meta < this.textures.length) {
+      return this.textures[meta];
+    }
+    return this.textures.length < 1 ? null : this.textures[0];
+  }*/
+
+	@Override
+	public String getUnlocalizedName()
+	{
+		return super.getUnlocalizedName();
+	}
+
+	@Override
+	public String getUnlocalizedName(final ItemStack itemStack)
+	{
+		return this.getUnlocalizedName();
+	}
+
+	@Override
+	public String getItemStackDisplayName(final ItemStack itemStack)
+	{
+		return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack));
+	}
+
+	public IC2_ItemIC2 setRarity(final int aRarity)
+	{
+		this.rarity = aRarity;
+		return this;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(final ItemStack stack)
+	{
+		return EnumRarity.values()[this.rarity];
+	}
+
+	private int rarity = 0;
+	protected IIcon[] textures;
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
new file mode 100644
index 0000000000..8c8b2ea7ad
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -0,0 +1,60 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx;
+import gtPlusPlus.core.lib.LoadedMods;
+import net.minecraft.item.ItemStack;
+
+public class IC2_Items {
+
+	public static ItemStack rotor_Material_1; //Energetic Alloy
+	public static ItemStack rotor_Material_2; //TungstenSteel
+	public static ItemStack rotor_Material_3; //Vibrant Alloy
+	public static ItemStack rotor_Material_4; //Iridium
+
+	public static ItemStack rotor_Blade_Material_1;
+	public static ItemStack rotor_Blade_Material_2;
+	public static ItemStack rotor_Blade_Material_3;
+	public static ItemStack rotor_Blade_Material_4;
+
+	public static ItemStack shaft_Material_1; //Energetic Alloy
+	public static ItemStack shaft_Material_2; //TungstenSteel
+	public static ItemStack shaft_Material_3; //Vibrant Alloy
+	public static ItemStack shaft_Material_4; //Iridium
+
+	public static ItemStack blockRTG;
+	public static ItemStack blockKineticGenerator;
+
+	private static final String[] mData1 = new String[] {"itemEnergeticRotorBlade", "itemMagnaliumRotorBlade"};
+	private static final String[] mData2 = new String[] {"itemEnergeticShaft", "itemMagnaliumShaft"};
+	private static final String[] mData3 = new String[] {"itemVibrantRotorBlade", "itemUltimetRotorBlade"};
+	private static final String[] mData4 = new String[] {"itemVibrantShaft", "itemUltimetShaft"};
+	
+
+	public static void register(){
+
+		int aIndexEIO = (LoadedMods.EnderIO ? 0 : 1);		
+		
+		// Rotor Blades
+		rotor_Blade_Material_1 = new ItemStack (new CoreItem(mData1[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		rotor_Blade_Material_3 = new ItemStack (new CoreItem(mData3[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		
+		// Rotor Shafts
+		shaft_Material_1 = new ItemStack (new CoreItem(mData2[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_3 = new ItemStack (new CoreItem(mData4[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+		shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+				
+		// Rotors
+		rotor_Material_1 = new ItemStack (new CustomKineticRotor(0));
+		rotor_Material_2 = new ItemStack (new CustomKineticRotor(1));
+		rotor_Material_3 = new ItemStack (new CustomKineticRotor(2));
+		rotor_Material_4 = new ItemStack (new CustomKineticRotor(3));
+		
+		ItemArmorHazmatEx.init();
+
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
new file mode 100644
index 0000000000..0df2c8d7f1
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java
@@ -0,0 +1,55 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+
+import ic2.core.item.block.ItemBlockIC2;
+
+public class ItemGenerators
+extends ItemBlockIC2
+{
+	public ItemGenerators(final Block block)
+	{
+		super(block);
+
+		this.setMaxDamage(0);
+		this.setHasSubtypes(true);
+	}
+
+	@Override
+	public int getMetadata(final int i)
+	{
+		return i;
+	}
+
+	@Override
+	public String getUnlocalizedName(final ItemStack itemstack)
+	{
+		final int meta = itemstack.getItemDamage();
+		switch (meta)
+		{
+		case 0:
+			return "ic2.blockRTGenerator2";
+		case 1:
+			return "ic2.blockKineticGenerator2";
+		}
+		return null;
+	}
+
+	@Override
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b)
+	{
+		final int meta = itemStack.getItemDamage();
+		switch (meta)
+		{
+		case 0:
+			info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max")); break;
+		case 1:
+			info.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t " + StatCollector.translateToLocal("ic2.item.tooltip.max"));
+		}
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java
new file mode 100644
index 0000000000..b9f9ab68ef
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java
@@ -0,0 +1,100 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import ic2.api.item.IKineticRotor;
+import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import ic2.core.init.InternalName;
+import ic2.core.item.resources.ItemWindRotor;
+
+public class RotorBase extends ItemWindRotor{
+
+	private final int maxWindStrength;
+	private final int minWindStrength;
+	private final int radius;
+	private final float efficiency;
+	private final ResourceLocation renderTexture;
+	private final boolean water;
+
+	public RotorBase(final InternalName internalName, final int Radius, final int durability, final float efficiency, final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture)
+	{
+		super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
+
+
+
+		this.setMaxStackSize(1);
+		this.setMaxDamage(durability);
+
+		this.radius = Radius;
+		this.efficiency = efficiency;
+		this.renderTexture = RenderTexture;
+		this.minWindStrength = minWindStrength;
+		this.maxWindStrength = maxWindStrength;
+		this.water = true;
+	}
+
+	@Override
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b)
+	{
+		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) }));
+		IKineticRotor.GearboxType type = null;
+		if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) {
+			type = IKineticRotor.GearboxType.WATER;
+		} else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
+			type = IKineticRotor.GearboxType.WIND;
+		}
+		if (type != null) {
+			//info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
+		}
+	}
+
+	@Override
+	public String getTextureFolder()
+	{
+		return "rotors";
+	}
+
+	@Override
+	public int getDiameter(final ItemStack stack)
+	{
+		return this.radius;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack)
+	{
+		return this.renderTexture;
+	}
+
+	@Override
+	public float getEfficiency(final ItemStack stack)
+	{
+		return this.efficiency;
+	}
+
+	@Override
+	public int getMinWindStrength(final ItemStack stack)
+	{
+		return this.minWindStrength;
+	}
+
+	@Override
+	public int getMaxWindStrength(final ItemStack stack)
+	{
+		return this.maxWindStrength;
+	}
+
+	@Override
+	public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type)
+	{
+		return (type == IKineticRotor.GearboxType.WIND) || (this.water);
+	}
+}
+
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
new file mode 100644
index 0000000000..b9dffbd371
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java
@@ -0,0 +1,127 @@
+package gtPlusPlus.xmod.ic2.item;
+
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import ic2.api.item.IKineticRotor;
+import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
+import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
+import ic2.core.init.InternalName;
+import ic2.core.util.StackUtil;
+
+public class RotorIridium extends RotorBase{
+
+	private final int maxWindStrength;
+	private final int minWindStrength;
+	private final int radius;
+	private final float efficiency;
+	private final ResourceLocation renderTexture;
+	private final boolean water;
+
+	public RotorIridium(final InternalName internalName, final int Radius, final int durability, final float efficiency, final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture)
+	{
+		super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture);
+
+
+
+		this.setMaxStackSize(1);
+		this.setMaxDamage(Integer.MAX_VALUE);
+
+		this.radius = Radius;
+		this.efficiency = efficiency;
+		this.renderTexture = RenderTexture;
+		this.minWindStrength = minWindStrength;
+		this.maxWindStrength = maxWindStrength;
+		this.water = (internalName != InternalName.itemwoodrotor);
+	}
+
+	@Override
+	public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b)
+	{
+		info.add(StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) }));
+		IKineticRotor.GearboxType type = null;
+		if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) {
+			type = IKineticRotor.GearboxType.WATER;
+		} else if ((Minecraft.getMinecraft().currentScreen != null) && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) {
+			type = IKineticRotor.GearboxType.WIND;
+		}
+		if (type != null) {
+			//info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type)));
+		}
+	}
+
+	@Override
+	public String getTextureFolder()
+	{
+		return "rotors";
+	}
+
+	@Override
+	public int getDiameter(final ItemStack stack)
+	{
+		return this.radius;
+	}
+
+	@Override
+	public ResourceLocation getRotorRenderTexture(final ItemStack stack)
+	{
+		return this.renderTexture;
+	}
+
+	@Override
+	public float getEfficiency(final ItemStack stack)
+	{
+		return this.efficiency;
+	}
+
+	@Override
+	public int getMinWindStrength(final ItemStack stack)
+	{
+		return this.minWindStrength;
+	}
+
+	@Override
+	public int getMaxWindStrength(final ItemStack stack)
+	{
+		return this.maxWindStrength;
+	}
+
+	@Override
+	public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type)
+	{
+		return (type == IKineticRotor.GearboxType.WIND) || (this.water);
+	}
+
+
+	@Override
+	public void setCustomDamage(final ItemStack stack, final int damage)
+	{
+		final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack);
+		nbt.setInteger("advDmg", 0);
+
+		final int maxStackDamage = stack.getMaxDamage();
+		if (maxStackDamage > 2) {
+			//stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2));
+		}
+	}
+
+	@Override
+	public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src)
+	{
+		this.setCustomDamage(stack, this.getCustomDamage(stack) + damage);
+		return true;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+}
+
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java
new file mode 100644
index 0000000000..01151024c4
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java
@@ -0,0 +1,52 @@
+package gtPlusPlus.xmod.ic2.item.reactor;
+
+import ic2.api.reactor.IReactor;
+import ic2.api.reactor.IReactorComponent;
+import net.minecraft.item.ItemStack;
+
+public class IC2_FuelRod_Base implements IReactorComponent {
+
+	@Override
+	public void processChamber(IReactor var1, ItemStack var2, int var3, int var4, boolean var5) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public boolean acceptUraniumPulse(IReactor var1, ItemStack var2, ItemStack var3, int var4, int var5, int var6,
+			int var7, boolean var8) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean canStoreHeat(IReactor var1, ItemStack var2, int var3, int var4) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public int getMaxHeat(IReactor var1, ItemStack var2, int var3, int var4) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public int getCurrentHeat(IReactor var1, ItemStack var2, int var3, int var4) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public int alterHeat(IReactor var1, ItemStack var2, int var3, int var4, int var5) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public float influenceExplosion(IReactor var1, ItemStack var2) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
new file mode 100644
index 0000000000..1b090cc51a
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -0,0 +1,326 @@
+package gtPlusPlus.xmod.ic2.recipe;
+
+import static gtPlusPlus.core.recipe.RECIPES_Tools.*;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.ic2.item.IC2_Items;
+import ic2.core.Ic2Items;
+
+public class RECIPE_IC2 {
+
+	public static String plate_T1 = "plateEnergeticAlloy";
+	public static String plate_T2 = "plateTungstenSteel";
+	public static String plate_T3 = "plateVibrantAlloy";
+	public static String plate_T4 = "plateAlloyIridium";
+
+	public static ItemStack block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.EnergeticAlloy, 1L);
+	public static ItemStack block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L);
+	public static ItemStack block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.VibrantAlloy, 1L);
+	public static ItemStack block_T4 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L);
+
+	public static ItemStack shaft_block_T1 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.EnergeticAlloy, 1L);
+	public static ItemStack shaft_block_T2 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenSteel, 1L);
+	public static ItemStack shaft_block_T3 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.VibrantAlloy, 1L);
+	public static ItemStack shaft_block_T4 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iridium, 1L);
+
+	public static String ingot_T1 = "ingotEnergeticAlloy";
+	public static String ingot_T2 = "ingotTungstenSteel";
+	public static String ingot_T3 = "ingotVibrantAlloy";
+	public static String ingot_T4 = "ingotIridium";
+
+	public static String ring_T1 = "ringStainlessSteel";
+	public static String ring_T2 = "ringTungstenSteel";
+	public static String ring_T3 = "ringChrome";
+	public static String ring_T4 = "ringOsmiridium";
+
+
+	private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_1.getItem());
+	private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_2.getItem());
+	private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_3.getItem());
+	private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_4.getItem());
+
+	private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_1.getItem());
+	private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_2.getItem());
+	private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_3.getItem());
+	private static ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_4.getItem());
+
+	private static ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_1.getItem());
+	private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_2.getItem());
+	private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_3.getItem());
+	private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_4.getItem());
+
+	private static boolean checkForEnderIO(){
+		if(!LoadedMods.EnderIO){
+			plate_T1 = "plateMagnalium";
+			plate_T2 = "plateTungstenSteel";
+			plate_T3 = "plateUltimet";
+			plate_T4 = "plateAlloyIridium";
+
+			block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Magnalium, 1L);
+			block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L);
+			block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Ultimet, 1L);
+			block_T4 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L);
+
+			ingot_T1 = "ingotMagnalium";
+			ingot_T2 = "ingotTungstenSteel";
+			ingot_T3 = "ingotUltimet";
+			ingot_T4 = "ingotIridium";
+			return true;
+		}
+		return false;
+	}
+
+	public static void initRecipes() {
+		
+		checkForEnderIO();
+		addAdvancedHazmat();
+		
+		if (!CORE.GTNH) {
+			//Rotor Blade Recipes
+
+			RecipeUtils.addShapedRecipe(
+					plate_T1, ingot_T1, plate_T1,
+					plate_T1, ingot_T1, plate_T1,
+					plate_T1, ingot_T1, plate_T1,
+					rotor_blade_T1);
+
+			RecipeUtils.addShapedRecipe(
+					plate_T2, ingot_T2, plate_T2,
+					plate_T2, ingot_T2, plate_T2,
+					plate_T2, ingot_T2, plate_T2,
+					rotor_blade_T2);
+
+			RecipeUtils.addShapedRecipe(
+					plate_T3, ingot_T3, plate_T3,
+					plate_T3, ingot_T3, plate_T3,
+					plate_T3, ingot_T3, plate_T3,
+					rotor_blade_T3);
+
+			RecipeUtils.addShapedRecipe(
+					plate_T4, ingot_T4, plate_T4,
+					plate_T4, ingot_T4, plate_T4,
+					plate_T4, ingot_T4, plate_T4,
+					rotor_blade_T4);
+		}
+		if (CORE.GTNH) {
+
+			RecipeUtils.addShapedRecipe(
+					plate_T1, plate_T1, plate_T1,
+					plate_T1, ring_T1, plate_T1,
+					plate_T1, plate_T1, plate_T1,
+					rotor_blade_T1);
+
+			RecipeUtils.addShapedRecipe(
+					plate_T2, plate_T2, plate_T2,
+					plate_T2, ring_T2, plate_T2,
+					plate_T2, plate_T2, plate_T2,
+					rotor_blade_T2);
+
+			RecipeUtils.addShapedRecipe(
+					plate_T3, plate_T3, plate_T3,
+					plate_T3, ring_T3, plate_T3,
+					plate_T3, plate_T3, plate_T3,
+					rotor_blade_T3);
+
+			RecipeUtils.addShapedRecipe(
+					plate_T4, plate_T4, plate_T4,
+					plate_T4, ring_T4, plate_T4,
+					plate_T4, plate_T4, plate_T4,
+					rotor_blade_T4);
+
+		}
+
+		//Shaft Extruder Recipe
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkSteel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.DarkSteel)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.TungstenSteel)});
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Molybdenum), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Molybdenum)});
+		Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape");
+
+		
+		//Custm Recipes for Iron and Steel
+		ItemStack mShaftIron = ItemList.IC2_ShaftIron.get(1);
+		ItemStack mShaftSteel = ItemList.IC2_ShaftSteel.get(1);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L)), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), mShaftIron, 32*20, 120);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L)), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), mShaftIron, 32*20, 120);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.WroughtIron, 1L)), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), mShaftIron, 32*20, 120);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L)), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), mShaftIron, 32*20, 120);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L)), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), mShaftSteel, 64*20, 120);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Steel, 1L)), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), mShaftSteel, 64*20, 120);
+		
+		
+		//Shaft Recipes
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T1, 2560, 250);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, shaft_block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T1, 2560, 250);
+		if (LoadedMods.EnderIO || CORE.GTNH) {
+			Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]");
+		} else {
+			Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Magnalium]");
+		}
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T2, 5120, 500);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, shaft_block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T2, 5120, 500);
+
+		Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]");
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T3, 10240, 2000);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, shaft_block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T3, 10240, 2000);
+		if (LoadedMods.EnderIO || CORE.GTNH) {
+			Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]");
+		} else {
+			Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Ultimet]");
+		}
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T4, 20480, 4000);
+		GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, shaft_block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T4, 20480, 4000);
+		Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]");
+
+		if (!CORE.GTNH) {
+			//Rotor Recipes
+			RecipeUtils.addShapedRecipe(
+					null, rotor_blade_T1, null,
+					rotor_blade_T1, shaft_T1, rotor_blade_T1,
+					null, rotor_blade_T1, null,
+					rotor_T1);
+
+			RecipeUtils.addShapedRecipe(
+					null, rotor_blade_T2, null,
+					rotor_blade_T2, shaft_T2, rotor_blade_T2,
+					null, rotor_blade_T2, null,
+					rotor_T2);
+
+			RecipeUtils.addShapedRecipe(
+					null, rotor_blade_T3, null,
+					rotor_blade_T3, shaft_T3, rotor_blade_T3,
+					null, rotor_blade_T3, null,
+					rotor_T3);
+
+			RecipeUtils.addShapedRecipe(
+					null, rotor_blade_T4, null,
+					rotor_blade_T4, shaft_T4, rotor_blade_T4,
+					null, rotor_blade_T4, null,
+					rotor_T4);
+
+		}
+		if (CORE.GTNH) {
+			RecipeUtils.addShapedRecipe(
+					shaft_T1, rotor_blade_T1, craftingToolHardHammer,
+					rotor_blade_T1, ring_T1, rotor_blade_T1,
+					craftingToolWrench, rotor_blade_T1, shaft_T1,
+					rotor_T1);
+
+			RecipeUtils.addShapedRecipe(
+					shaft_T2, rotor_blade_T2, craftingToolHardHammer,
+					rotor_blade_T2, ring_T2, rotor_blade_T2,
+					craftingToolWrench, rotor_blade_T2, shaft_T2,
+					rotor_T2);
+
+			RecipeUtils.addShapedRecipe(
+					shaft_T3, rotor_blade_T3, craftingToolHardHammer,
+					rotor_blade_T3, ring_T3, rotor_blade_T3,
+					craftingToolWrench, rotor_blade_T3, shaft_T3,
+					rotor_T3);
+
+			RecipeUtils.addShapedRecipe(
+					shaft_T4, rotor_blade_T4, craftingToolHardHammer,
+					rotor_blade_T4, ring_T4, rotor_blade_T4,
+					craftingToolWrench, rotor_blade_T4, shaft_T4,
+					rotor_T4);
+		}
+
+
+	}
+
+	private static void addAdvancedHazmat() {
+
+		ItemStack[] aBasicHazmatPieces = new ItemStack[] {
+				Ic2Items.hazmatHelmet.copy(), 
+				Ic2Items.hazmatChestplate.copy(), 
+				Ic2Items.hazmatLeggings.copy(),
+				Ic2Items.hazmatBoots.copy()
+				};
+		
+		Material aRubber = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubber);
+		ItemStack aYellowWool = ItemUtils.getSimpleStack(Blocks.wool, 4, 1);
+		ItemStack aBlackWool = ItemUtils.getSimpleStack(Blocks.wool, 15, 1);
+		ItemStack aCoilIC2 = Ic2Items.coil;
+		ItemStack aPlateCobalt = CI.getTieredComponentOfMaterial(Materials.Cobalt, OrePrefixes.plate, 1);
+		ItemStack aGearSmallSteel = CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGtSmall, 1);
+		ItemStack aGearSmallAluminium = CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1);
+		ItemStack aGearPotin = ALLOY.TUMBAGA.getGear(1);
+		ItemStack aGearSiliconCarbide = ALLOY.SILICON_CARBIDE.getGear(1);		
+		
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[0],
+						ItemUtils.getSimpleStack(aYellowWool,16),
+						ItemUtils.getSimpleStack(aPlateCobalt, 4),
+						ItemUtils.getSimpleStack(aCoilIC2, 8),
+						ItemUtils.getSimpleStack(aGearSmallAluminium, 4),
+				}, 
+				aRubber.getFluidStack(144 * 4), 
+				GregtechItemList.Armour_Hazmat_Advanced_Helmet.get(1), 
+				30 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[1],
+						ItemUtils.getSimpleStack(aYellowWool, 64),
+						ItemUtils.getSimpleStack(aCoilIC2, 32),
+						ItemUtils.getSimpleStack(aPlateCobalt, 16),
+						ItemUtils.getSimpleStack(aGearSiliconCarbide, 8),
+				}, 
+				aRubber.getFluidStack(144 * 10), 
+				GregtechItemList.Armour_Hazmat_Advanced_Chest.get(1), 
+				90 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[2],
+						ItemUtils.getSimpleStack(aYellowWool, 32),
+						ItemUtils.getSimpleStack(aCoilIC2, 16),
+						ItemUtils.getSimpleStack(aPlateCobalt, 8),
+						ItemUtils.getSimpleStack(aGearSiliconCarbide, 4),
+				}, 
+				aRubber.getFluidStack(144 * 8), 
+				GregtechItemList.Armour_Hazmat_Advanced_Legs.get(1), 
+				75 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(2),
+						aBasicHazmatPieces[3],
+						ItemUtils.getSimpleStack(aBlackWool, 16),
+						ItemUtils.getSimpleStack(aCoilIC2, 6),
+						ItemUtils.getSimpleStack(aGearSmallSteel, 8),
+						ItemUtils.getSimpleStack(aGearPotin, 4),
+				}, 
+				aRubber.getFluidStack(144 * 6), 
+				GregtechItemList.Armour_Hazmat_Advanced_Boots.get(1), 
+				45 * 20, 
+				MaterialUtils.getVoltageForTier(2));
+		
+	}
+}