Begin modularization

archaic/main/java/resonantinduction/archaic/engineering/TileEngineeringTable.java

@@ -1,6 +1,5 @@
 package resonantinduction.archaic.engineering;
 
-import java.util.List;
 import java.util.Set;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -19,11 +18,8 @@ import net.minecraftforge.common.ForgeDirection;
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import resonantinduction.api.IArmbot;
-import resonantinduction.api.IArmbotUseable;
 import resonantinduction.archaic.imprint.ItemImprint;
 import resonantinduction.core.ResonantInduction;
-import resonantinduction.electrical.encoder.coding.args.ArgumentData;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.gui.ContainerDummy;
 import calclavia.lib.network.IPacketReceiver;
@@ -37,7 +33,7 @@ import calclavia.lib.utility.inventory.AutoCraftingManager.IAutoCrafter;
 import com.builtbroken.common.Pair;
 import com.google.common.io.ByteArrayDataInput;
 
-public class TileEngineeringTable extends TileAdvanced implements IPacketReceiver, IRotatable, ISidedInventory, IArmbotUseable, ISlotPickResult, IAutoCrafter
+public class TileEngineeringTable extends TileAdvanced implements IPacketReceiver, IRotatable, ISidedInventory, ISlotPickResult, IAutoCrafter
 {
 	public static final int CRAFTING_MATRIX_END = 9;
 	public static final int CRAFTING_OUTPUT_END = CRAFTING_MATRIX_END + 1;
@@ -380,30 +376,6 @@ public class TileEngineeringTable extends TileAdvanced implements IPacketReceive
 		}
 	}
 
-	/** Tries to let the Armbot craft an item. */
-	@Override
-	public boolean onUse(IArmbot armbot, List<ArgumentData> data)
-	{
-		this.onInventoryChanged();
-
-		/*
-		 * if (this.imprinterMatrix[craftingOutputSlot] != null)
-		 * {
-		 * AutoCraftEvent.PreCraft event = new AutoCraftEvent.PreCraft(this.worldObj, new
-		 * Vector3(this), this, this.imprinterMatrix[craftingOutputSlot]);
-		 * MinecraftForge.EVENT_BUS.post(event);
-		 * if (!event.isCanceled())
-		 * {
-		 * armbot.grabObject(this.imprinterMatrix[craftingOutputSlot].copy());
-		 * this.onPickUpFromSlot(null, 2, this.imprinterMatrix[craftingOutputSlot]);
-		 * this.imprinterMatrix[craftingOutputSlot] = null;
-		 * return true;
-		 * }
-		 * }
-		 */
-		return false;
-	}
-
 	// ///////////////////////////////////////
 	// // Save And Data processing //////
 	// ///////////////////////////////////////

build-old.gradle

@@ -0,0 +1,84 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+    }
+}
+
+apply plugin: 'forge'
+
+ext.buildProps = file "build.properties"
+
+buildProps.withReader {
+    def prop = new Properties()
+    prop.load(it)
+    ext.config = new ConfigSlurper().parse prop
+}
+
+version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}"
+group = "resonantinduction"
+archivesBaseName = "Resonant-Induction"
+
+minecraft {
+    version = "${config.version.minecraft}-${config.version.forge}"
+	
+	replaceIn "Reference.java"
+	replace "@MAJOR@", config.version.mod.major
+	replace "@MINOR@", config.version.mod.minor
+	replace "@REVIS@", config.version.mod.revis
+	replace "@BUILD@", System.getenv("BUILD_NUMBER")
+}
+
+if (System.getenv("BUILD_NUMBER") != null)
+    version += ".${System.getenv("BUILD_NUMBER")}"
+
+
+processResources {
+	from 'build.properties'
+}
+
+task copyBuildXml(type: Copy) {
+    from 'build.properties'
+    into 'output'
+}
+
+task apiZip(type: Zip) {
+    classifier = 'api'
+    from sourceSets*.allSource
+    include 'resonantinduction/api/**'
+    destinationDir = file 'output'
+}
+
+artifacts {
+    archives apiZip
+}
+
+jar {
+    dependsOn copyBuildXml
+    classifier = ''
+    destinationDir = file 'output'
+}
+
+repositories {
+    maven {
+		name 'Calclavia Maven'
+		url 'http://calclavia.com/maven'
+	}
+	
+	ivy {
+			name 'CB FS'
+			artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]"
+	}
+}
+dependencies {
+	compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${config.version.universalelectricity}", classifier: "dev"
+	compile group: 'calclaviacore', name: 'calclavia-core', version: "${config.version.calclaviacore}", classifier: "dev"
+	compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar'
+	compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar'
+}

build.gradle

@@ -10,75 +10,132 @@ buildscript {
         classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
     }
 }
-
+ 
 apply plugin: 'forge'
+apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 ext.buildProps = file "build.properties"
-
+ 
 buildProps.withReader {
     def prop = new Properties()
     prop.load(it)
     ext.config = new ConfigSlurper().parse prop
 }
-
-version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}"
-group = "resonantinduction"
+ 
+group = "resonant-induction"
 archivesBaseName = "Resonant-Induction"
-
+ 
 minecraft {
-    version = "${config.version.minecraft}-${config.version.forge}"
-	
-	replaceIn "Reference.java"
-	replace "@MAJOR@", config.version.mod.major
-	replace "@MINOR@", config.version.mod.minor
-	replace "@REVIS@", config.version.mod.revis
-	replace "@BUILD@", System.getenv("BUILD_NUMBER")
+    version = "${rootProject.config.version.minecraft}-${rootProject.config.version.forge}"
+    
+    replaceIn "Reference.java"
+    replace "@MAJOR@", rootProject.config.version.mod.major
+    replace "@MINOR@", rootProject.config.version.mod.minor
+    replace "@REVIS@", rootProject.config.version.mod.revis
+    replace "@BUILD@", "${System.getenv().BUILD_NUMBER}"
 }
-
-if (System.getenv("BUILD_NUMBER") != null)
-    version += ".${System.getenv("BUILD_NUMBER")}"
-
-
+ 
+allprojects {
+    apply plugin: 'java'
+    
+    version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}"
+    
+    if (System.getenv("BUILD_NUMBER") != null)
+        version += ".${System.getenv("BUILD_NUMBER")}"
+        
+    repositories {
+        maven {
+            name 'Calclavia Maven'
+            url 'http://calclavia.com/maven'
+        }
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+		ivy {
+			name 'CB FS'
+			artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]"
+		}
+        mavenCentral()
+    }
+    
+    dependencies {
+        compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${rootProject.config.version.universalelectricity}", classifier: "dev"
+        compile group: 'calclaviacore', name: 'calclavia-core', version: "${rootProject.config.version.calclaviacore}", classifier: "dev"
+    	compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar'
+		compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar'
+	}
+    
+    jar {
+		classifier = project.name
+        dependsOn ":copyBuildXml"
+        destinationDir = file (rootProject.getRootDir().getPath() + '/output')
+    }
+	
+	publishing {
+		publications {
+			mavenJava(MavenPublication) {
+				artifact jar
+			}
+		}
+		repositories {
+			maven {
+				url "file://var/www/maven"
+			}
+		}
+	}
+}
+ 
+subprojects {
+    archivesBaseName = "Resonant-Induction"
+    
+    dependencies {
+        compile rootProject
+    }
+    
+    rootProject.tasks.reobf {
+		reobf.setUseRetroGuard(true)
+        reobf(tasks.jar) { spec ->
+            spec.classpath = sourceSets.main.compileClasspath
+        }
+    }
+}
+ 
 processResources {
 	from 'build.properties'
 }
-
+ 
 task copyBuildXml(type: Copy) {
     from 'build.properties'
     into 'output'
 }
-
+ 
 task apiZip(type: Zip) {
     classifier = 'api'
     from sourceSets*.allSource
     include 'resonantinduction/api/**'
     destinationDir = file 'output'
 }
-
+ 
 artifacts {
     archives apiZip
 }
 
-jar {
-    dependsOn copyBuildXml
-    classifier = ''
-    destinationDir = file 'output'
+import net.minecraftforge.gradle.tasks.dev.ChangelogTask
+import net.minecraftforge.gradle.common.Constants
+import net.minecraftforge.gradle.delayed.*
+
+task createChangelog(type: ChangelogTask) {
+    def jobName = "${System.getenv().JOB_NAME}"
+    def buildNumber = "${System.getenv().BUILD_NUMBER}"
+    
+    setServerRoot(new DelayedString(project, 'http://ci.calclavia.com/'))
+    setJobName(new DelayedString(project, jobName.toString()));
+    setAuthName(new DelayedString(project, 'console_script'));
+    setAuthPassword(new DelayedString(project, '625d2ac53190be3422faa0c474fb299b'));
+    setTargetBuild({buildNumber.toString()});
+    setOutput(new DelayedFile(project, 'output/' + jobName + "-${project.version}" + '-changelog' + '.txt'));
 }
 
-repositories {
-    maven {
-		name 'Calclavia Maven'
-		url 'http://calclavia.com/maven'
-	}
-	
-	ivy {
-			name 'CB FS'
-			artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]"
-	}
-}
-dependencies {
-	compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${config.version.universalelectricity}", classifier: "dev"
-	compile group: 'calclaviacore', name: 'calclavia-core', version: "${config.version.calclaviacore}", classifier: "dev"
-	compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar'
-	compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar'
-}
+build.dependsOn "apiZip", "copyBuildXml", "createChangelog"

electrical/main/java/resonantinduction/electrical/ClientProxy.java

@@ -0,0 +1,88 @@
+package resonantinduction.electrical;
+
+import calclavia.lib.render.item.GlobalItemRenderer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.client.MinecraftForgeClient;
+import resonantinduction.electrical.battery.RenderBattery;
+import resonantinduction.electrical.battery.TileBattery;
+import resonantinduction.electrical.charger.RenderCharger;
+import resonantinduction.electrical.charger.TileCharger;
+import resonantinduction.electrical.encoder.TileEncoder;
+import resonantinduction.electrical.encoder.gui.GuiEncoderInventory;
+import resonantinduction.electrical.generator.solar.RenderSolarPanel;
+import resonantinduction.electrical.generator.solar.TileSolarPanel;
+import resonantinduction.electrical.levitator.RenderLevitator;
+import resonantinduction.electrical.levitator.TileLevitator;
+import resonantinduction.electrical.multimeter.GuiMultimeter;
+import resonantinduction.electrical.multimeter.PartMultimeter;
+import resonantinduction.electrical.multimeter.RenderMultimeter;
+import resonantinduction.electrical.render.FXElectricBolt;
+import resonantinduction.electrical.tesla.RenderTesla;
+import resonantinduction.electrical.tesla.TileTesla;
+import resonantinduction.electrical.transformer.RenderTransformer;
+import universalelectricity.api.vector.Vector3;
+import codechicken.multipart.TMultiPart;
+import codechicken.multipart.TileMultipart;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/** @author Calclavia */
+@SideOnly(Side.CLIENT)
+public class ClientProxy extends CommonProxy
+{
+	@Override
+	public void preInit()
+	{
+		MinecraftForgeClient.registerItemRenderer(Electrical.blockBattery.blockID, GlobalItemRenderer.INSTANCE);
+		GlobalItemRenderer.register(Electrical.blockBattery.blockID, RenderBattery.INSTANCE);
+		MinecraftForgeClient.registerItemRenderer(Electrical.itemMultimeter.itemID, GlobalItemRenderer.INSTANCE);
+		GlobalItemRenderer.register(Electrical.itemMultimeter.itemID, RenderMultimeter.INSTANCE);
+		MinecraftForgeClient.registerItemRenderer(Electrical.itemTransformer.itemID, GlobalItemRenderer.INSTANCE);
+		GlobalItemRenderer.register(Electrical.itemTransformer.itemID, RenderTransformer.INSTANCE);
+		ClientRegistry.bindTileEntitySpecialRenderer(TileTesla.class, new RenderTesla());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileLevitator.class, new RenderLevitator());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileBattery.class, new RenderBattery());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileSolarPanel.class, new RenderSolarPanel());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileCharger.class, new RenderCharger());
+	}
+
+	@Override
+	public void postInit()
+	{
+	}
+
+	@Override
+	public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z)
+	{
+		TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
+
+		if (tileEntity instanceof TileMultipart)
+		{
+			TMultiPart part = ((TileMultipart) tileEntity).partMap(id);
+
+			if (part instanceof PartMultimeter)
+			{
+				return new GuiMultimeter(player.inventory, (PartMultimeter) part);
+			}
+		}
+		else if (tileEntity instanceof TileEncoder)
+		{
+			return new GuiEncoderInventory(player.inventory, (TileEncoder) tileEntity);
+		}
+
+		return null;
+	}
+
+	@Override
+	public void renderElectricShock(World world, Vector3 start, Vector3 target, float r, float g, float b, boolean split)
+	{
+		if (world.isRemote)
+		{
+			FMLClientHandler.instance().getClient().effectRenderer.addEffect(new FXElectricBolt(world, start, target, split).setColor(r, g, b));
+		}
+	}
+}

electrical/main/java/resonantinduction/electrical/armbot/IArmbot.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.electrical.armbot;
 
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.electrical.encoder.coding.IProgrammableMachine;

electrical/main/java/resonantinduction/electrical/armbot/IArmbotUseable.java

@@ -1,8 +1,8 @@
-package resonantinduction.api;
+package resonantinduction.electrical.armbot;
 
 import java.util.List;
 
-import resonantinduction.electrical.encoder.coding.args.ArgumentData;
+import resonantinduction.core.ArgumentData;
 
 /**
  * The IUseable inteface is used by the ArmBot so that it may interact with Tile Entities. onUse

electrical/main/java/resonantinduction/electrical/armbot/TaskBase.java

@@ -5,10 +5,10 @@ import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
+import resonantinduction.core.ArgumentData;
 import resonantinduction.electrical.encoder.coding.IProgram;
 import resonantinduction.electrical.encoder.coding.IProgrammableMachine;
 import resonantinduction.electrical.encoder.coding.ITask;
-import resonantinduction.electrical.encoder.coding.args.ArgumentData;
 import universalelectricity.api.vector.Vector2;
 import calclavia.lib.utility.nbt.NBTUtility;
 

electrical/main/java/resonantinduction/electrical/armbot/TaskBaseArmbot.java

@@ -1,6 +1,5 @@
 package resonantinduction.electrical.armbot;
 
-import resonantinduction.api.IArmbot;
 import resonantinduction.electrical.encoder.coding.IProgrammableMachine;
 
 public abstract class TaskBaseArmbot extends TaskBaseProcess

electrical/main/java/resonantinduction/electrical/armbot/TileArmbot.java

@@ -9,7 +9,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.api.IArmbot;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.electrical.armbot.task.TaskDrop;
 import resonantinduction.electrical.armbot.task.TaskGOTO;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskBreak.java

@@ -7,7 +7,7 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.ITask;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskDrop.java

@@ -1,6 +1,6 @@
 package resonantinduction.electrical.armbot.task;
 
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import universalelectricity.api.vector.Vector2;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskFire.java

@@ -9,7 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.args.ArgumentFloatData;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskGive.java

@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.args.ArgumentIntData;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskGrabEntity.java

@@ -9,9 +9,9 @@ import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import resonantinduction.api.EntityDictionary;
-import resonantinduction.api.IArmbot;
+import resonantinduction.core.ArgumentData;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
-import resonantinduction.electrical.encoder.coding.args.ArgumentData;
 
 public class TaskGrabEntity extends TaskGrabPrefab
 {

electrical/main/java/resonantinduction/electrical/armbot/task/TaskGrabItem.java

@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.AxisAlignedBB;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.args.ArgumentIntData;
 

electrical/main/java/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java

@@ -2,8 +2,8 @@ package resonantinduction.electrical.armbot.task;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.api.IArmbot;
 import resonantinduction.api.IBelt;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import universalelectricity.api.vector.Vector2;
 import universalelectricity.api.vector.Vector3;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskIF.java

@@ -3,10 +3,10 @@ package resonantinduction.electrical.armbot.task;
 import java.util.ArrayList;
 import java.util.List;
 
+import resonantinduction.core.ArgumentData;
 import resonantinduction.electrical.armbot.TaskBaseLogic;
 import resonantinduction.electrical.encoder.coding.IProgrammableMachine;
 import resonantinduction.electrical.encoder.coding.ITask;
-import resonantinduction.electrical.encoder.coding.args.ArgumentData;
 import universalelectricity.api.vector.Vector2;
 
 /** @author DarkGuardsman */

electrical/main/java/resonantinduction/electrical/armbot/task/TaskIdle.java

@@ -3,9 +3,9 @@ package resonantinduction.electrical.armbot.task;
 import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
+import resonantinduction.core.ArgumentData;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.IProgrammableMachine;
-import resonantinduction.electrical.encoder.coding.args.ArgumentData;
 
 import com.builtbroken.common.science.units.UnitHelper;
 

electrical/main/java/resonantinduction/electrical/armbot/task/TaskPlace.java

@@ -6,7 +6,7 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.IPlantable;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import universalelectricity.api.vector.Vector3;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskRotateBy.java

@@ -3,7 +3,7 @@ package resonantinduction.electrical.armbot.task;
 import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.args.ArgumentIntData;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskRotateTo.java

@@ -3,7 +3,7 @@ package resonantinduction.electrical.armbot.task;
 import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.args.ArgumentIntData;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskTake.java

@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.args.ArgumentIntData;

electrical/main/java/resonantinduction/electrical/armbot/task/TaskUse.java

@@ -5,8 +5,8 @@ import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import resonantinduction.api.IArmbot;
-import resonantinduction.api.IArmbotUseable;
+import resonantinduction.electrical.armbot.IArmbot;
+import resonantinduction.electrical.armbot.IArmbotUseable;
 import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.IProcessTask;

electrical/main/java/resonantinduction/electrical/battery/BlockBattery.java

@@ -14,7 +14,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import resonantinduction.core.Reference;
-import resonantinduction.core.Settings;
 import resonantinduction.core.render.RIBlockRenderingHandler;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.UniversalElectricity;

electrical/main/java/resonantinduction/electrical/battery/RenderBattery.java

@@ -12,7 +12,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.IItemRenderer.ItemRenderType;
 import net.minecraftforge.client.model.AdvancedModelLoader;
 import net.minecraftforge.client.model.obj.WavefrontObject;
 import net.minecraftforge.common.ForgeDirection;
@@ -20,8 +19,11 @@ import net.minecraftforge.common.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.electrical.battery.ItemBlockBattery;
+import resonantinduction.electrical.battery.TileBattery;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.render.RenderUtility;
+import calclavia.lib.render.item.ISimpleItemRenderer;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -31,7 +33,7 @@ import cpw.mods.fml.relauncher.SideOnly;
  * 
  */
 @SideOnly(Side.CLIENT)
-public class RenderBattery extends TileEntitySpecialRenderer
+public class RenderBattery extends TileEntitySpecialRenderer implements ISimpleItemRenderer
 {
 	public static RenderBattery INSTANCE = new RenderBattery();
 
@@ -39,7 +41,7 @@ public class RenderBattery extends TileEntitySpecialRenderer
 	public static final ResourceLocation TEXTURE_CASE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "battery/bat_case_tex.png");
 	public static final WavefrontObject MODEL = (WavefrontObject) AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "battery/battery.obj");
 
-	public void renderInventory(ItemRenderType type, ItemStack itemStack, Object... data)
+	public void renderInventoryItem(ItemStack itemStack)
 	{
 		glPushMatrix();
 		GL11.glTranslated(0.5f, 0, 0.5f);

electrical/main/java/resonantinduction/electrical/charger/RenderCharger.java

@@ -1,12 +1,12 @@
 package resonantinduction.electrical.charger;
 
-import calclavia.lib.render.RenderUtility;
 import net.minecraft.tileentity.TileEntity;
 import resonantinduction.core.render.RenderItemOverlayTile;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import universalelectricity.api.vector.Vector3;
+import calclavia.lib.render.RenderUtility;
 
 /** Renderer for electric item charger
  * 

electrical/main/java/resonantinduction/electrical/charger/TileCharger.java

@@ -7,8 +7,6 @@ import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IEnergyInterface;
-import universalelectricity.api.vector.Vector3;
-import calclavia.lib.network.IPacketReceiver;
 import calclavia.lib.network.IPacketReceiverWithID;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.prefab.tile.IRotatable;

electrical/main/java/resonantinduction/electrical/encoder/coding/ITask.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import resonantinduction.electrical.encoder.coding.args.ArgumentData;
+import resonantinduction.core.ArgumentData;
 import universalelectricity.api.vector.Vector2;
 import calclavia.lib.utility.nbt.ISaveObj;
 

electrical/main/java/resonantinduction/electrical/encoder/coding/TaskRegistry.java

@@ -5,7 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 
-import resonantinduction.api.IArmbot;
+import resonantinduction.electrical.armbot.IArmbot;
 
 /**
  * Used to both register task and fake machines for the encoder to use to create new programs.

electrical/main/java/resonantinduction/electrical/encoder/coding/args/ArgumentDoubleData.java

@@ -1,6 +1,7 @@
 package resonantinduction.electrical.encoder.coding.args;
 
 import net.minecraft.util.MathHelper;
+import resonantinduction.core.ArgumentData;
 import universalelectricity.api.energy.UnitDisplay;
 
 /**

electrical/main/java/resonantinduction/electrical/encoder/coding/args/ArgumentFloatData.java

@@ -1,6 +1,7 @@
 package resonantinduction.electrical.encoder.coding.args;
 
 import net.minecraft.util.MathHelper;
+import resonantinduction.core.ArgumentData;
 import universalelectricity.api.energy.UnitDisplay;
 
 /**

electrical/main/java/resonantinduction/electrical/encoder/coding/args/ArgumentIntData.java

@@ -1,6 +1,7 @@
 package resonantinduction.electrical.encoder.coding.args;
 
 import net.minecraft.util.MathHelper;
+import resonantinduction.core.ArgumentData;
 
 /**
  * Used to create argument data for the encoder. Should only be used if the value needs to be

electrical/main/java/resonantinduction/electrical/encoder/coding/args/ArgumentListData.java

@@ -1,5 +1,7 @@
 package resonantinduction.electrical.encoder.coding.args;
 
+import resonantinduction.core.ArgumentData;
+
 /**
  * Used to store lists of data that the user can scroll threw to select one.
  *