Moved all files to old and starting to recode and organize everything

src/main/java/resonantinduction/api/recipe/MachineRecipes.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.api;
+package resonantinduction.api.recipe;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -7,9 +7,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import net.minecraft.item.ItemStack;
-import resonantinduction.core.api.RecipeUtils.ItemStackResource;
-import resonantinduction.core.api.RecipeUtils.OreDictResource;
-import resonantinduction.core.api.RecipeUtils.Resource;
+import resonantinduction.api.recipe.RecipeUtils.ItemStackResource;
+import resonantinduction.api.recipe.RecipeUtils.OreDictResource;
+import resonantinduction.api.recipe.RecipeUtils.Resource;
 
 public final class MachineRecipes
 {

src/main/java/resonantinduction/api/recipe/OreDetectionBlackList.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.api;
+package resonantinduction.api.recipe;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

src/main/java/resonantinduction/api/recipe/RecipeUtils.java

@@ -1,4 +1,4 @@
-package resonantinduction.core.api;
+package resonantinduction.api.recipe;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/resonantinduction/archaic/Archaic.java

@@ -3,9 +3,9 @@ package resonantinduction.archaic;
 import java.util.Arrays;
 import java.util.logging.Logger;
 
-import resonantinduction.Reference;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
+import resonantinduction.old.Reference;
 import calclavia.lib.utility.LanguageUtility;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -29,7 +29,7 @@ public class Archaic
 	public static final String ID = "ResonantInduction|Archaic";
 
 	@Instance(ID)
-	public static ResonantInduction INSTANCE;
+	public static Archaic INSTANCE;
 
 	@SidedProxy(clientSide = "resonantinduction.archaic.ClientProxy", serverSide = "resonantinduction.archaic.CommonProxy")
 	public static CommonProxy proxy;

src/main/java/resonantinduction/core/ResonantInduction.java

@@ -1,20 +1,15 @@
 package resonantinduction.core;
 
-import java.util.Arrays;
 import java.util.logging.Logger;
 
-import net.minecraftforge.common.MinecraftForge;
-
 import org.modstats.ModstatInfo;
 import org.modstats.Modstats;
 
-import resonantinduction.Reference;
-import resonantinduction.energy.CommonProxy;
-import resonantinduction.energy.LinkEvent;
+import resonantinduction.core.multipart.PacketMultiPart;
+import resonantinduction.old.Reference;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.network.PacketTile;
 import calclavia.lib.utility.LanguageUtility;
-import codechicken.lib.colour.ColourRGBA;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -26,64 +21,50 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 
-/** The core module of Resonant Induction
+/**
+ * The core module of Resonant Induction
  * 
- * @author Calclavia */
+ * @author Calclavia
+ */
 @Mod(modid = ResonantInduction.ID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:CalclaviaCore;before:ThermalExpansion;before:IC2")
-@NetworkMod(channels = ResonantInduction.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
+@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
 @ModstatInfo(prefix = "resonantin")
 public class ResonantInduction
 {
-    /** Mod Information */
-    public static final String ID = "ResonantInduction|Core";
-    public static final String CHANNEL = "RESIND";
+	/** Mod Information */
+	public static final String ID = "ResonantInduction|Core";
 
-    @Instance(ID)
-    public static ResonantInduction INSTANCE;
+	@Instance(ID)
+	public static ResonantInduction INSTANCE;
 
-    @SidedProxy(clientSide = "resonantinduction.core.ClientProxy", serverSide = "resonantinduction.core.CommonProxy")
-    public static CommonProxy proxy;
+	@SidedProxy(clientSide = "resonantinduction.core.ClientProxy", serverSide = "resonantinduction.core.CommonProxy")
+	public static CommonProxy proxy;
 
-    @Mod.Metadata(ID)
-    public static ModMetadata metadata;
+	@Mod.Metadata(ID)
+	public static ModMetadata metadata;
 
-    public static final Logger LOGGER = Logger.getLogger(Reference.NAME);
+	public static final Logger LOGGER = Logger.getLogger(Reference.NAME);
 
-    /** Packets */
-    public static final PacketTile PACKET_TILE = new PacketTile(CHANNEL);
-    public static final PacketMultiPart PACKET_MULTIPART = new PacketMultiPart(CHANNEL);
-    public static final ColourRGBA[] DYE_COLORS = new ColourRGBA[] { new ColourRGBA(255, 255, 255, 255), new ColourRGBA(1, 0, 0, 1d), new ColourRGBA(0, 0.608, 0.232, 1d), new ColourRGBA(0.588, 0.294, 0, 1d), new ColourRGBA(0, 0, 1, 1d), new ColourRGBA(0.5, 0, 05, 1d), new ColourRGBA(0, 1, 1, 1d), new ColourRGBA(0.8, 0.8, 0.8, 1d), new ColourRGBA(0.3, 0.3, 0.3, 1d), new ColourRGBA(1, 0.412, 0.706, 1d), new ColourRGBA(0.616, 1, 0, 1d), new ColourRGBA(1, 1, 0, 1d), new ColourRGBA(0.46f, 0.932, 1, 1d), new ColourRGBA(0.5, 0.2, 0.5, 1d), new ColourRGBA(0.7, 0.5, 0.1, 1d), new ColourRGBA(1, 1, 1, 1d) };
+	/** Packets */
+	public static final PacketTile PACKET_TILE = new PacketTile(Reference.CHANNEL);
+	public static final PacketMultiPart PACKET_MULTIPART = new PacketMultiPart(Reference.CHANNEL);
 
-    @EventHandler
-    public void preInit(FMLPreInitializationEvent evt)
-    {
-        ResonantInduction.LOGGER.setParent(FMLLog.getLogger());
-        NetworkRegistry.instance().registerGuiHandler(this, ResonantInduction.proxy);
-        Modstats.instance().getReporter().registerMod(this);
+	@EventHandler
+	public void preInit(FMLPreInitializationEvent evt)
+	{
+		ResonantInduction.LOGGER.setParent(FMLLog.getLogger());
+		NetworkRegistry.instance().registerGuiHandler(this, proxy);
+		Modstats.instance().getReporter().registerMod(this);
+		Settings.load();
+	}
 
-        /** Set reference itemstacks */
-        // ResonantInductionTabs.ITEMSTACK = new ItemStack(null);
-        MinecraftForge.EVENT_BUS.register(new LinkEvent());
-        Settings.load();
-    }
-
-    @EventHandler
-    public void init(FMLInitializationEvent evt)
-    {
-        ResonantInduction.LOGGER.fine("Languages Loaded:" + LanguageUtility.loadLanguages(Reference.LANGUAGE_DIRECTORY, Reference.LANGUAGES));
-
-        metadata.modId = ID;
-        metadata.name = Reference.NAME;
-        metadata.description = LanguageUtility.getLocal("meta.resonantinduction.description");
-        metadata.url = "http://calclavia.com/resonant-induction";
-        metadata.logoFile = "ri_logo.png";
-        metadata.version = Reference.VERSION + "." + Reference.BUILD_VERSION;
-        metadata.authorList = Arrays.asList(new String[] { "Calclavia", "DarkCow" });
-        metadata.credits = LanguageUtility.getLocal("meta.resonantinduction.credits");
-        metadata.autogenerated = false;
-
-        MultipartRI.INSTANCE = new MultipartRI();
-        Settings.save();
-    }
+	@EventHandler
+	public void init(FMLInitializationEvent evt)
+	{
+		// Load Languages
+		ResonantInduction.LOGGER.fine("Languages Loaded:" + LanguageUtility.loadLanguages(Reference.LANGUAGE_DIRECTORY, Reference.LANGUAGES));
+		// Set Mod Metadata
+		Settings.setModMetadata(metadata, ID);
+	}
 
 }

src/main/java/resonantinduction/core/Settings.java

@@ -1,102 +1,125 @@
 package resonantinduction.core;
 
 import java.io.File;
+import java.util.Arrays;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.Configuration;
-import resonantinduction.Reference;
-import resonantinduction.transport.levitator.TileEMLevitator;
+import resonantinduction.old.Reference;
+import calclavia.lib.utility.LanguageUtility;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.ModMetadata;
 
 /** @author Calclavia */
 public class Settings
 {
-    /** Auto ID Management */
-    /** Block ID by Jyzarc */
-    private static final int BLOCK_ID_PREFIX = 3200;
-    /** Item ID by Horfius */
-    private static final int ITEM_ID_PREFIX = 20150;
-    public static int MAX_CONTRACTOR_DISTANCE = 200;
+	/** Auto ID Management */
+	/** Block ID by Jyzarc */
+	private static final int BLOCK_ID_PREFIX = 3200;
+	/** Item ID by Horfius */
+	private static final int ITEM_ID_PREFIX = 20150;
 
-    private static int NEXT_BLOCK_ID = BLOCK_ID_PREFIX;
-    private static int NEXT_ITEM_ID = ITEM_ID_PREFIX;
+	private static int NEXT_BLOCK_ID = BLOCK_ID_PREFIX;
+	private static int NEXT_ITEM_ID = ITEM_ID_PREFIX;
 
-    public static int getNextBlockID()
-    {
-        int id = NEXT_BLOCK_ID;
+	public static int getNextBlockID()
+	{
+		int id = NEXT_BLOCK_ID;
 
-        while (id > 255 && id < (Block.blocksList.length - 1))
-        {
-            Block block = Block.blocksList[id];
-            if (block == null)
-            {
-                break;
-            }
-            id++;
-        }
-        NEXT_BLOCK_ID = id + 1;
-        return id;
-    }
+		while (id > 255 && id < (Block.blocksList.length - 1))
+		{
+			Block block = Block.blocksList[id];
+			if (block == null)
+			{
+				break;
+			}
+			id++;
+		}
+		NEXT_BLOCK_ID = id + 1;
+		return id;
+	}
 
-    public static int getNextItemID()
-    {
-        int id = NEXT_ITEM_ID;
-        while (id > 255 && id < (Item.itemsList.length - 1))
-        {
-            Item item = Item.itemsList[id];
-            if (item == null)
-            {
-                break;
-            }
-            id++;
-        }
-        NEXT_ITEM_ID = id + 1;
-        return id;
-    }
+	public static int getNextItemID()
+	{
+		int id = NEXT_ITEM_ID;
+		while (id > 255 && id < (Item.itemsList.length - 1))
+		{
+			Item item = Item.itemsList[id];
+			if (item == null)
+			{
+				break;
+			}
+			id++;
+		}
+		NEXT_ITEM_ID = id + 1;
+		return id;
+	}
 
-    /** Settings */
-    public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), Reference.NAME + ".cfg"));
-    public static int FURNACE_WATTAGE = 50000;
-    public static boolean SOUND_FXS = true;
-    public static boolean LO_FI_INSULATION = false;
-    public static boolean SHINY_SILVER = true;
-    public static boolean REPLACE_FURNACE = true;
+	/** Settings */
+	public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), Reference.NAME + ".cfg"));
+	public static int FURNACE_WATTAGE = 50000;
+	public static boolean SOUND_FXS = true;
+	public static boolean LO_FI_INSULATION = false;
+	public static boolean SHINY_SILVER = true;
+	public static boolean REPLACE_FURNACE = true;
+	public static int MAX_CONTRACTOR_DISTANCE = 200;
 
-    public static void load()
-    {
-        CONFIGURATION.load();
+	/**
+	 * Called from RI's core.
+	 */
+	public static void load()
+	{
+		CONFIGURATION.load();
 
-        // Config
-        FURNACE_WATTAGE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Furnace Wattage Per Tick", FURNACE_WATTAGE).getInt(FURNACE_WATTAGE);
-        SOUND_FXS = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Tesla Sound FXs", SOUND_FXS).getBoolean(SOUND_FXS);
-        LO_FI_INSULATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Use lo-fi insulation texture", LO_FI_INSULATION).getBoolean(LO_FI_INSULATION);
-        SHINY_SILVER = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Shiny silver wires", SHINY_SILVER).getBoolean(SHINY_SILVER);
-        MAX_CONTRACTOR_DISTANCE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Max EM Contractor Path", MAX_CONTRACTOR_DISTANCE).getInt(MAX_CONTRACTOR_DISTANCE);
-        REPLACE_FURNACE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Replace vanilla furnace", REPLACE_FURNACE).getBoolean(REPLACE_FURNACE);
+		// Config
+		FURNACE_WATTAGE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Furnace Wattage Per Tick", FURNACE_WATTAGE).getInt(FURNACE_WATTAGE);
+		SOUND_FXS = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Tesla Sound FXs", SOUND_FXS).getBoolean(SOUND_FXS);
+		LO_FI_INSULATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Use lo-fi insulation texture", LO_FI_INSULATION).getBoolean(LO_FI_INSULATION);
+		SHINY_SILVER = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Shiny silver wires", SHINY_SILVER).getBoolean(SHINY_SILVER);
+		MAX_CONTRACTOR_DISTANCE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Max EM Contractor Path", MAX_CONTRACTOR_DISTANCE).getInt(MAX_CONTRACTOR_DISTANCE);
+		REPLACE_FURNACE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Replace vanilla furnace", REPLACE_FURNACE).getBoolean(REPLACE_FURNACE);
 
-        TileEMLevitator.ACCELERATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Acceleration", TileEMLevitator.ACCELERATION).getDouble(TileEMLevitator.ACCELERATION);
-        TileEMLevitator.MAX_REACH = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Reach", TileEMLevitator.MAX_REACH).getInt(TileEMLevitator.MAX_REACH);
-        TileEMLevitator.MAX_SPEED = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Speed", TileEMLevitator.MAX_SPEED).getDouble(TileEMLevitator.MAX_SPEED);
-        TileEMLevitator.PUSH_DELAY = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Push Delay", TileEMLevitator.PUSH_DELAY).getInt(TileEMLevitator.PUSH_DELAY);
-    }
+		Settings.LEVITATOR_ACCELERATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Acceleration", Settings.LEVITATOR_ACCELERATION).getDouble(Settings.LEVITATOR_ACCELERATION);
+		Settings.LEVITATOR_MAX_REACH = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Reach", Settings.LEVITATOR_MAX_REACH).getInt(Settings.LEVITATOR_MAX_REACH);
+		Settings.LEVITATOR_MAX_SPEED = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Speed", Settings.LEVITATOR_MAX_SPEED).getDouble(Settings.LEVITATOR_MAX_SPEED);
+		Settings.LEVITATOR_PUSH_DELAY = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Push Delay", Settings.LEVITATOR_PUSH_DELAY).getInt(Settings.LEVITATOR_PUSH_DELAY);
+	}
 
-    public static void save()
-    {
-        CONFIGURATION.save();
-    }
+	public static void save()
+	{
+		CONFIGURATION.save();
+	}
 
-    public static boolean isOp(String username)
-    {
-        MinecraftServer theServer = FMLCommonHandler.instance().getMinecraftServerInstance();
+	public static void setModMetadata(ModMetadata metadata, String ID)
+	{
+		metadata.modId = ID;
+		metadata.name = Reference.NAME + " Archaic Tier";
+		metadata.description = LanguageUtility.getLocal("meta.resonantinduction.description");
+		metadata.url = "http://calclavia.com/resonant-induction";
+		metadata.logoFile = "ri_logo.png";
+		metadata.version = Reference.VERSION + "." + Reference.BUILD_VERSION;
+		metadata.authorList = Arrays.asList(new String[] { "Calclavia", "DarkCow" });
+		metadata.credits = LanguageUtility.getLocal("meta.resonantinduction.credits");
+		metadata.autogenerated = false;
+	}
 
-        if (theServer != null)
-        {
-            return theServer.getConfigurationManager().getOps().contains(username.trim().toLowerCase());
-        }
+	public static boolean isOp(String username)
+	{
+		MinecraftServer theServer = FMLCommonHandler.instance().getMinecraftServerInstance();
 
-        return false;
-    }
+		if (theServer != null)
+		{
+			return theServer.getConfigurationManager().getOps().contains(username.trim().toLowerCase());
+		}
+
+		return false;
+	}
+
+	public static int LEVITATOR_MAX_REACH = 40;
+	public static int LEVITATOR_PUSH_DELAY = 5;
+	public static double LEVITATOR_MAX_SPEED = .2;
+	public static double LEVITATOR_ACCELERATION = .02;
 }

src/main/java/resonantinduction/core/SoundHandler.java

@@ -5,7 +5,7 @@ package resonantinduction.core;
 
 import net.minecraftforge.client.event.sound.SoundLoadEvent;
 import net.minecraftforge.event.ForgeSubscribe;
-import resonantinduction.Reference;
+import resonantinduction.old.Reference;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/core/Utility.java

@@ -11,6 +11,8 @@ import codechicken.lib.vec.BlockCoord;
 import codechicken.multipart.TileMultipart;
 
 /**
+ * General Utilities
+ * 
  * @author Calclavia
  * 
  */

src/main/java/resonantinduction/core/api/ICapacitor.java

@@ -1,12 +0,0 @@
-package resonantinduction.core.api;
-
-import universalelectricity.api.item.IEnergyItem;
-
-/**
- * @author Calclavia
- * 
- */
-public interface ICapacitor extends IEnergyItem
-{
-
-}

src/main/java/resonantinduction/core/base/BlockBase.java

@@ -4,9 +4,9 @@
 package resonantinduction.core.base;
 
 import net.minecraftforge.common.Configuration;
-import resonantinduction.Reference;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
+import resonantinduction.old.Reference;
 import universalelectricity.api.UniversalElectricity;
 import calclavia.lib.prefab.block.BlockAdvanced;
 

src/main/java/resonantinduction/core/base/BlockIOBase.java

@@ -5,9 +5,9 @@ package resonantinduction.core.base;
 
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.Configuration;
-import resonantinduction.Reference;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
+import resonantinduction.old.Reference;
 import calclavia.lib.prefab.block.BlockSidedIO;
 
 /**

src/main/java/resonantinduction/core/base/BlockRotatableBase.java

@@ -4,9 +4,9 @@
 package resonantinduction.core.base;
 
 import net.minecraftforge.common.Configuration;
-import resonantinduction.Reference;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
+import resonantinduction.old.Reference;
 import universalelectricity.api.UniversalElectricity;
 import calclavia.lib.prefab.block.BlockRotatable;
 

src/main/java/resonantinduction/core/base/ItemBase.java

@@ -2,9 +2,9 @@ package resonantinduction.core.base;
 
 import net.minecraft.item.Item;
 import net.minecraftforge.common.Configuration;
-import resonantinduction.Reference;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
+import resonantinduction.old.Reference;
 
 /**
  * 

src/main/java/resonantinduction/core/base/ItemMultipartBase.java

@@ -1,9 +1,9 @@
 package resonantinduction.core.base;
 
 import net.minecraftforge.common.Configuration;
-import resonantinduction.Reference;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
+import resonantinduction.old.Reference;
 import codechicken.multipart.JItemMultiPart;
 
 /**

src/main/java/resonantinduction/core/debug/BlockDebug.java

@@ -13,8 +13,8 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.core.ResonantInductionTabs;
-import resonantinduction.lib.prefab.BlockMachine;
-import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.old.lib.prefab.BlockMachine;
+import resonantinduction.old.transport.ResonantInductionTransport;
 
 import com.builtbroken.common.Pair;
 

src/main/java/resonantinduction/core/debug/TileEntityInfLoad.java

@@ -1,6 +1,6 @@
 package resonantinduction.core.debug;
 
-import resonantinduction.lib.prefab.TileEntityEnergyMachine;
+import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
 import net.minecraftforge.common.ForgeDirection;
 
 public class TileEntityInfLoad extends TileEntityEnergyMachine

src/main/java/resonantinduction/core/debug/TileEntityInfSupply.java

@@ -2,7 +2,7 @@ package resonantinduction.core.debug;
 
 import java.util.EnumSet;
 
-import resonantinduction.lib.prefab.TileEntityEnergyMachine;
+import resonantinduction.old.lib.prefab.TileEntityEnergyMachine;
 import net.minecraftforge.common.ForgeDirection;
 
 public class TileEntityInfSupply extends TileEntityEnergyMachine

src/main/java/resonantinduction/core/misc/EnumBird.java

@@ -7,7 +7,7 @@ import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.passive.EntityChicken;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.old.transport.ResonantInductionTransport;
 import cpw.mods.fml.common.registry.EntityRegistry;
 
 /**

src/main/java/resonantinduction/core/misc/EnumTool.java

@@ -7,7 +7,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import resonantinduction.core.recipe.RecipeLoader;
-import resonantinduction.lib.EnumMaterial;
+import resonantinduction.old.lib.EnumMaterial;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/core/misc/ItemColoredDust.java

@@ -7,9 +7,9 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
-import resonantinduction.Reference;
 import resonantinduction.core.Settings;
-import resonantinduction.lib.helpers.ColorCode;
+import resonantinduction.old.Reference;
+import resonantinduction.old.lib.helpers.ColorCode;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/core/misc/ItemCommonTool.java

@@ -30,10 +30,10 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.entity.player.UseHoeEvent;
 import net.minecraftforge.oredict.OreDictionary;
-import resonantinduction.Reference;
 import resonantinduction.core.Settings;
-import resonantinduction.lib.EnumMaterial;
-import resonantinduction.lib.IExtraInfo.IExtraItemInfo;
+import resonantinduction.old.Reference;
+import resonantinduction.old.lib.EnumMaterial;
+import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 
 import com.google.common.collect.Multimap;
 

src/main/java/resonantinduction/core/multipart/MultipartRI.java

@@ -1,11 +1,11 @@
-package resonantinduction.core;
+package resonantinduction.core.multipart;
 
-import resonantinduction.energy.multimeter.PartMultimeter;
-import resonantinduction.energy.transformer.PartTransformer;
-import resonantinduction.energy.wire.flat.PartFlatSwitchWire;
-import resonantinduction.energy.wire.flat.PartFlatWire;
-import resonantinduction.energy.wire.framed.PartFramedSwitchWire;
-import resonantinduction.energy.wire.framed.PartFramedWire;
+import resonantinduction.old.energy.multimeter.PartMultimeter;
+import resonantinduction.old.energy.transformer.PartTransformer;
+import resonantinduction.old.energy.wire.flat.PartFlatSwitchWire;
+import resonantinduction.old.energy.wire.flat.PartFlatWire;
+import resonantinduction.old.energy.wire.framed.PartFramedSwitchWire;
+import resonantinduction.old.energy.wire.framed.PartFramedWire;
 import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.MultiPartRegistry.IPartFactory;
 import codechicken.multipart.MultipartGenerator;

src/main/java/resonantinduction/core/multipart/PacketMultiPart.java

@@ -1,4 +1,4 @@
-package resonantinduction.core;
+package resonantinduction.core.multipart;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/core/recipe/RecipeLoader.java

@@ -13,15 +13,15 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import resonantinduction.core.misc.EnumTool;
 import resonantinduction.core.resource.ItemOreDirv;
 import resonantinduction.core.resource.ItemParts.Parts;
-import resonantinduction.lib.EnumMaterial;
-import resonantinduction.lib.EnumOrePart;
-import resonantinduction.lib.helpers.ColorCode;
-import resonantinduction.lib.interfaces.IReadOut.EnumTools;
-import resonantinduction.lib.recipes.MachineRecipeHandler;
-import resonantinduction.lib.recipes.ProcessorType;
-import resonantinduction.mechanics.processor.BlockProcessor;
-import resonantinduction.transport.crate.BlockCrate;
-import resonantinduction.transport.fluid.pipes.FluidPartsMaterial;
+import resonantinduction.old.lib.EnumMaterial;
+import resonantinduction.old.lib.EnumOrePart;
+import resonantinduction.old.lib.helpers.ColorCode;
+import resonantinduction.old.lib.interfaces.IReadOut.EnumTools;
+import resonantinduction.old.lib.recipes.MachineRecipeHandler;
+import resonantinduction.old.lib.recipes.ProcessorType;
+import resonantinduction.old.mechanics.processor.BlockProcessor;
+import resonantinduction.old.transport.crate.BlockCrate;
+import resonantinduction.old.transport.fluid.pipes.FluidPartsMaterial;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class RecipeLoader

src/main/java/resonantinduction/core/render/BlockRenderingHandler.java

@@ -12,12 +12,12 @@ import static org.lwjgl.opengl.GL11.glTranslatef;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-import resonantinduction.energy.battery.BlockBattery;
-import resonantinduction.energy.battery.RenderBattery;
-import resonantinduction.energy.tesla.BlockTesla;
-import resonantinduction.energy.tesla.RenderTesla;
-import resonantinduction.transport.levitator.BlockLevitator;
-import resonantinduction.transport.levitator.RenderLevitator;
+import resonantinduction.old.energy.battery.BlockBattery;
+import resonantinduction.old.energy.battery.RenderBattery;
+import resonantinduction.old.energy.tesla.BlockTesla;
+import resonantinduction.old.energy.tesla.RenderTesla;
+import resonantinduction.old.transport.levitator.BlockLevitator;
+import resonantinduction.old.transport.levitator.RenderLevitator;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;

src/main/java/resonantinduction/core/render/RenderRIItem.java

@@ -5,10 +5,10 @@ import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.core.multimeter.ItemMultimeter;
-import resonantinduction.core.multimeter.RenderMultimeter;
-import resonantinduction.energy.transformer.ItemTransformer;
-import resonantinduction.energy.transformer.RenderTransformer;
+import resonantinduction.old.electrical.multimeter.ItemMultimeter;
+import resonantinduction.old.electrical.multimeter.RenderMultimeter;
+import resonantinduction.old.energy.transformer.ItemTransformer;
+import resonantinduction.old.energy.transformer.RenderTransformer;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/core/resource/ItemBlockOre.java

@@ -2,8 +2,8 @@ package resonantinduction.core.resource;
 
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import resonantinduction.Reference;
-import resonantinduction.blocks.BlockOre.OreData;
+import resonantinduction.old.Reference;
+import resonantinduction.old.blocks.BlockOre.OreData;
 
 public class ItemBlockOre extends ItemBlock
 {

src/main/java/resonantinduction/core/resource/ItemOreDirv.java

@@ -11,13 +11,13 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.oredict.OreDictionary;
-import resonantinduction.Reference;
-import resonantinduction.api.events.LaserEvent;
 import resonantinduction.core.Settings;
 import resonantinduction.core.base.ItemBase;
-import resonantinduction.lib.EnumMaterial;
-import resonantinduction.lib.EnumOrePart;
-import resonantinduction.lib.IExtraInfo.IExtraItemInfo;
+import resonantinduction.old.Reference;
+import resonantinduction.old.api.events.LaserEvent;
+import resonantinduction.old.lib.EnumMaterial;
+import resonantinduction.old.lib.EnumOrePart;
+import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/core/resource/ItemParts.java

@@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.oredict.OreDictionary;
-import resonantinduction.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.base.ItemBase;
-import resonantinduction.lib.IExtraInfo.IExtraItemInfo;
+import resonantinduction.old.Reference;
+import resonantinduction.old.lib.IExtraInfo.IExtraItemInfo;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/core/resource/ResourceGenerator.java

@@ -17,10 +17,10 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.oredict.OreDictionary;
-import resonantinduction.Reference;
-import resonantinduction.core.api.MachineRecipes;
-import resonantinduction.core.api.MachineRecipes.RecipeType;
-import resonantinduction.mechanics.item.ItemDust;
+import resonantinduction.api.recipe.MachineRecipes;
+import resonantinduction.api.recipe.MachineRecipes.RecipeType;
+import resonantinduction.old.Reference;
+import resonantinduction.old.mechanics.item.ItemDust;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/old/Reference.java

@@ -1,4 +1,4 @@
-package resonantinduction;
+package resonantinduction.old;
 
 /**
  * A class for static references.

src/main/java/resonantinduction/old/api/AutoCraftEvent.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

src/main/java/resonantinduction/old/api/EntityDictionary.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/resonantinduction/old/api/IArmbot.java

@@ -1,7 +1,7 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
 import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.api.coding.IProgrammableMachine;
+import resonantinduction.old.api.coding.IProgrammableMachine;
 import universalelectricity.api.vector.Vector2;
 import universalelectricity.api.vector.Vector3;
 

src/main/java/resonantinduction/old/api/IArmbotUseable.java

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

src/main/java/resonantinduction/old/api/IBelt.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
 import java.util.List;
 

src/main/java/resonantinduction/old/api/IFilterable.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/resonantinduction/old/api/IManipulator.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
 /**
  * Interface applied to the manipulator.

src/main/java/resonantinduction/old/api/IProcessable.java

@@ -1,6 +1,6 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
-import resonantinduction.lib.recipes.ProcessorType;
+import resonantinduction.old.lib.recipes.ProcessorType;
 import net.minecraft.item.ItemStack;
 
 /**

src/main/java/resonantinduction/old/api/MachineMiningEvent.java

@@ -1,4 +1,4 @@
-package resonantinduction.api;
+package resonantinduction.old.api;
 
 import java.util.List;
 

src/main/java/resonantinduction/old/api/coding/IDataItem.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import net.minecraft.nbt.NBTTagCompound;
 

src/main/java/resonantinduction/old/api/coding/ILogicTask.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import java.util.List;
 

src/main/java/resonantinduction/old/api/coding/IMemorySlot.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import java.util.HashMap;
 

src/main/java/resonantinduction/old/api/coding/IProcessTask.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import dan200.computer.api.IComputerAccess;
 import dan200.computer.api.ILuaContext;

src/main/java/resonantinduction/old/api/coding/IProgram.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import java.util.HashMap;
 

src/main/java/resonantinduction/old/api/coding/IProgramItem.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 /**
  * IDs that an item can load/save a program

src/main/java/resonantinduction/old/api/coding/IProgrammableMachine.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import net.minecraft.world.World;
 import universalelectricity.api.vector.Vector3;

src/main/java/resonantinduction/old/api/coding/IRedirectTask.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 /**
  * Used to tell the program that this task is used to tell the program were to go next. Used by

src/main/java/resonantinduction/old/api/coding/ITask.java

@@ -1,10 +1,10 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import resonantinduction.api.coding.args.ArgumentData;
+import resonantinduction.old.api.coding.args.ArgumentData;
 import universalelectricity.api.vector.Vector2;
 import calclavia.lib.utility.ISaveObj;
 

src/main/java/resonantinduction/old/api/coding/ProgramHelper.java

@@ -1,10 +1,10 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import java.util.HashMap;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import resonantinduction.api.coding.IProcessTask.ProcessReturn;
+import resonantinduction.old.api.coding.IProcessTask.ProcessReturn;
 import universalelectricity.api.vector.Vector3;
 
 /**

src/main/java/resonantinduction/old/api/coding/TaskRegistry.java

@@ -1,11 +1,11 @@
-package resonantinduction.api.coding;
+package resonantinduction.old.api.coding;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 
-import resonantinduction.api.IArmbot;
+import resonantinduction.old.api.IArmbot;
 
 /**
  * Used to both register task and fake machines for the encoder to use to create new programs.

src/main/java/resonantinduction/old/api/coding/args/ArgumentData.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding.args;
+package resonantinduction.old.api.coding.args;
 
 import net.minecraft.nbt.NBTTagCompound;
 import calclavia.lib.utility.ISaveObj;

src/main/java/resonantinduction/old/api/coding/args/ArgumentDoubleData.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding.args;
+package resonantinduction.old.api.coding.args;
 
 import net.minecraft.util.MathHelper;
 import universalelectricity.api.energy.UnitDisplay;

src/main/java/resonantinduction/old/api/coding/args/ArgumentEntityList.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding.args;
+package resonantinduction.old.api.coding.args;
 
 import net.minecraft.entity.Entity;
 

src/main/java/resonantinduction/old/api/coding/args/ArgumentFloatData.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding.args;
+package resonantinduction.old.api.coding.args;
 
 import net.minecraft.util.MathHelper;
 import universalelectricity.api.energy.UnitDisplay;

src/main/java/resonantinduction/old/api/coding/args/ArgumentIntData.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding.args;
+package resonantinduction.old.api.coding.args;
 
 import net.minecraft.util.MathHelper;
 

src/main/java/resonantinduction/old/api/coding/args/ArgumentListData.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.coding.args;
+package resonantinduction.old.api.coding.args;
 
 /**
  * Used to store lists of data that the user can scroll threw to select one.

src/main/java/resonantinduction/old/api/events/LaserEvent.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.events;
+package resonantinduction.old.api.events;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/old/api/fluid/FluidMasterList.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.fluid;
+package resonantinduction.old.api.fluid;
 
 import java.util.HashMap;
 

src/main/java/resonantinduction/old/api/fluid/FluidMixingEvent.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.fluid;
+package resonantinduction.old.api.fluid;
 
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;

src/main/java/resonantinduction/old/api/fluid/IDrain.java

@@ -1,8 +1,8 @@
-package resonantinduction.api.fluid;
+package resonantinduction.old.api.fluid;
 
 import java.util.Set;
 
-import resonantinduction.lib.interfaces.IRotatable;
+import resonantinduction.old.lib.interfaces.IRotatable;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.IFluidHandler;
 import universalelectricity.api.vector.Vector3;

src/main/java/resonantinduction/old/api/fluid/INetworkFluidPart.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.fluid;
+package resonantinduction.old.api.fluid;
 
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/resonantinduction/old/api/fluid/INetworkPipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.api.fluid;
+package resonantinduction.old.api.fluid;
 
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/resonantinduction/old/blocks/BlockColorGlass.java

@@ -1,4 +1,4 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
 import java.util.Random;
 

src/main/java/resonantinduction/old/blocks/BlockColorGlowGlass.java

@@ -1,4 +1,4 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
 public class BlockColorGlowGlass extends BlockColorGlass
 {

src/main/java/resonantinduction/old/blocks/BlockColorSand.java

@@ -1,4 +1,4 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
 import java.util.Random;
 

src/main/java/resonantinduction/old/blocks/BlockColored.java

@@ -1,4 +1,4 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
 import java.util.List;
 
@@ -9,8 +9,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
-import resonantinduction.Reference;
-import resonantinduction.lib.helpers.ColorCode;
+import resonantinduction.old.Reference;
+import resonantinduction.old.lib.helpers.ColorCode;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/old/blocks/BlockGasOre.java

@@ -1,4 +1,4 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
 import java.awt.Color;
 import java.util.List;
@@ -19,9 +19,9 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidBlock;
-import resonantinduction.Reference;
 import resonantinduction.core.Settings;
-import resonantinduction.transport.fluid.EnumGas;
+import resonantinduction.old.Reference;
+import resonantinduction.old.transport.fluid.EnumGas;
 import universalelectricity.api.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/old/blocks/BlockOre.java

@@ -1,4 +1,4 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
 import java.util.List;
 import java.util.Set;
@@ -14,11 +14,11 @@ import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.oredict.OreDictionary;
-import resonantinduction.Reference;
 import resonantinduction.core.Settings;
 import resonantinduction.core.recipe.RecipeLoader;
-import resonantinduction.lib.EnumMaterial;
-import resonantinduction.lib.IExtraInfo.IExtraBlockInfo;
+import resonantinduction.old.Reference;
+import resonantinduction.old.lib.EnumMaterial;
+import resonantinduction.old.lib.IExtraInfo.IExtraBlockInfo;
 import calclavia.lib.ore.OreGenReplaceStone;
 
 import com.builtbroken.common.Pair;

src/main/java/resonantinduction/old/blocks/GasOreGenerator.java

@@ -1,4 +1,4 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
 import java.util.Random;
 

src/main/java/resonantinduction/old/blocks/ItemBlockColored.java

@@ -1,6 +1,6 @@
-package resonantinduction.blocks;
+package resonantinduction.old.blocks;
 
-import resonantinduction.lib.helpers.ColorCode;
+import resonantinduction.old.lib.helpers.ColorCode;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;

src/main/java/resonantinduction/old/client/ClientProxy.java

@@ -1,4 +1,4 @@
-package resonantinduction.client;
+package resonantinduction.old.client;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.entity.RenderSnowball;
@@ -7,38 +7,38 @@ import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
-import resonantinduction.client.gui.GuiEncoderCoder;
-import resonantinduction.client.gui.GuiEncoderHelp;
-import resonantinduction.client.gui.GuiEncoderInventory;
-import resonantinduction.client.gui.GuiImprinter;
-import resonantinduction.client.gui.GuiProcessor;
-import resonantinduction.client.render.BlockRenderHelper;
-import resonantinduction.client.render.BlockRenderingHandler;
-import resonantinduction.client.render.ItemPipeRenderer;
-import resonantinduction.client.render.ItemRenderFluidCan;
-import resonantinduction.client.render.ItemTankRenderer;
-import resonantinduction.client.render.RenderConstructionPump;
-import resonantinduction.client.render.RenderPipe;
-import resonantinduction.client.render.RenderPump;
-import resonantinduction.client.render.RenderReleaseValve;
-import resonantinduction.client.render.RenderSink;
-import resonantinduction.client.render.RenderTank;
-import resonantinduction.client.render.RenderTestCar;
-import resonantinduction.client.render.RenderTurkey;
 import resonantinduction.core.misc.EntityFarmEgg;
 import resonantinduction.core.misc.EntityTurkey;
 import resonantinduction.core.recipe.RecipeLoader;
-import resonantinduction.mechanics.CommonProxy;
-import resonantinduction.mechanics.processor.TileEntityProcessor;
-import resonantinduction.transport.encoder.TileEntityEncoder;
-import resonantinduction.transport.fluid.TileEntityReleaseValve;
-import resonantinduction.transport.fluid.TileEntityTank;
-import resonantinduction.transport.fluid.TileKitchenSink;
-import resonantinduction.transport.fluid.pipes.TileEntityPipe;
-import resonantinduction.transport.fluid.pump.TileEntityConstructionPump;
-import resonantinduction.transport.fluid.pump.TileEntityStarterPump;
-import resonantinduction.transport.imprinter.TileEntityImprinter;
-import resonantinduction.transport.vechicle.EntityTestCar;
+import resonantinduction.old.client.gui.GuiEncoderCoder;
+import resonantinduction.old.client.gui.GuiEncoderHelp;
+import resonantinduction.old.client.gui.GuiEncoderInventory;
+import resonantinduction.old.client.gui.GuiImprinter;
+import resonantinduction.old.client.gui.GuiProcessor;
+import resonantinduction.old.client.render.BlockRenderHelper;
+import resonantinduction.old.client.render.BlockRenderingHandler;
+import resonantinduction.old.client.render.ItemPipeRenderer;
+import resonantinduction.old.client.render.ItemRenderFluidCan;
+import resonantinduction.old.client.render.ItemTankRenderer;
+import resonantinduction.old.client.render.RenderConstructionPump;
+import resonantinduction.old.client.render.RenderPipe;
+import resonantinduction.old.client.render.RenderPump;
+import resonantinduction.old.client.render.RenderReleaseValve;
+import resonantinduction.old.client.render.RenderSink;
+import resonantinduction.old.client.render.RenderTank;
+import resonantinduction.old.client.render.RenderTestCar;
+import resonantinduction.old.client.render.RenderTurkey;
+import resonantinduction.old.mechanics.CommonProxy;
+import resonantinduction.old.mechanics.processor.TileEntityProcessor;
+import resonantinduction.old.transport.encoder.TileEntityEncoder;
+import resonantinduction.old.transport.fluid.TileEntityReleaseValve;
+import resonantinduction.old.transport.fluid.TileEntityTank;
+import resonantinduction.old.transport.fluid.TileKitchenSink;
+import resonantinduction.old.transport.fluid.pipes.TileEntityPipe;
+import resonantinduction.old.transport.fluid.pump.TileEntityConstructionPump;
+import resonantinduction.old.transport.fluid.pump.TileEntityStarterPump;
+import resonantinduction.old.transport.imprinter.TileEntityImprinter;
+import resonantinduction.old.transport.vechicle.EntityTestCar;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;

src/main/java/resonantinduction/old/client/gui/EnumTaskIcon.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 /** Used to reference icons in the gui coder sheet
  * 

src/main/java/resonantinduction/old/client/gui/GuiEditTask.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
@@ -8,12 +8,12 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.Reference;
-import resonantinduction.api.coding.ITask;
-import resonantinduction.api.coding.args.ArgumentData;
-import resonantinduction.lib.prefab.invgui.GuiBase;
-import resonantinduction.lib.prefab.invgui.GuiMessageBox;
-import resonantinduction.lib.prefab.invgui.IMessageBoxDialog;
+import resonantinduction.old.Reference;
+import resonantinduction.old.api.coding.ITask;
+import resonantinduction.old.api.coding.args.ArgumentData;
+import resonantinduction.old.lib.prefab.invgui.GuiBase;
+import resonantinduction.old.lib.prefab.invgui.GuiMessageBox;
+import resonantinduction.old.lib.prefab.invgui.IMessageBoxDialog;
 import universalelectricity.api.vector.Vector2;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;

src/main/java/resonantinduction/old/client/gui/GuiEncoderBase.java

@@ -1,11 +1,11 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
-import resonantinduction.lib.prefab.TileEntityMachine;
-import resonantinduction.lib.prefab.invgui.ContainerFake;
-import resonantinduction.lib.prefab.invgui.GuiMachineContainer;
-import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.old.lib.prefab.TileEntityMachine;
+import resonantinduction.old.lib.prefab.invgui.ContainerFake;
+import resonantinduction.old.lib.prefab.invgui.GuiMachineContainer;
+import resonantinduction.old.transport.ResonantInductionTransport;
 
 public class GuiEncoderBase extends GuiMachineContainer
 {

src/main/java/resonantinduction/old/client/gui/GuiEncoderCoder.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -6,9 +6,9 @@ import net.minecraft.entity.player.InventoryPlayer;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
-import resonantinduction.lib.prefab.invgui.GuiButtonImage;
-import resonantinduction.lib.prefab.invgui.GuiButtonImage.ButtonIcon;
-import resonantinduction.transport.encoder.TileEntityEncoder;
+import resonantinduction.old.lib.prefab.invgui.GuiButtonImage;
+import resonantinduction.old.lib.prefab.invgui.GuiButtonImage.ButtonIcon;
+import resonantinduction.old.transport.encoder.TileEntityEncoder;
 
 public class GuiEncoderCoder extends GuiEncoderBase
 {

src/main/java/resonantinduction/old/client/gui/GuiEncoderHelp.java

@@ -1,9 +1,9 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
-import resonantinduction.Reference;
-import resonantinduction.transport.encoder.TileEntityEncoder;
+import resonantinduction.old.Reference;
+import resonantinduction.old.transport.encoder.TileEntityEncoder;
 
 public class GuiEncoderHelp extends GuiEncoderBase
 {

src/main/java/resonantinduction/old/client/gui/GuiEncoderInventory.java

@@ -1,13 +1,13 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.Reference;
-import resonantinduction.transport.encoder.ContainerEncoder;
-import resonantinduction.transport.encoder.TileEntityEncoder;
+import resonantinduction.old.Reference;
+import resonantinduction.old.transport.encoder.ContainerEncoder;
+import resonantinduction.old.transport.encoder.TileEntityEncoder;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/old/client/gui/GuiImprinter.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -6,9 +6,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.Reference;
-import resonantinduction.transport.imprinter.ContainerImprinter;
-import resonantinduction.transport.imprinter.TileEntityImprinter;
+import resonantinduction.old.Reference;
+import resonantinduction.old.transport.imprinter.ContainerImprinter;
+import resonantinduction.old.transport.imprinter.TileEntityImprinter;
 import calclavia.lib.utility.LanguageUtility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/old/client/gui/GuiProcessor.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
@@ -7,9 +7,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.Reference;
-import resonantinduction.mechanics.processor.ContainerProcessor;
-import resonantinduction.mechanics.processor.TileEntityProcessor;
+import resonantinduction.old.Reference;
+import resonantinduction.old.mechanics.processor.ContainerProcessor;
+import resonantinduction.old.mechanics.processor.TileEntityProcessor;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/old/client/gui/GuiTask.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -7,9 +7,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.Reference;
-import resonantinduction.api.coding.IRedirectTask;
-import resonantinduction.api.coding.ITask;
+import resonantinduction.old.Reference;
+import resonantinduction.old.api.coding.IRedirectTask;
+import resonantinduction.old.api.coding.ITask;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/old/client/gui/GuiTaskList.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.gui;
+package resonantinduction.old.client.gui;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
@@ -6,14 +6,14 @@ import net.minecraft.tileentity.TileEntity;
 
 import org.lwjgl.opengl.GL11;
 
-import resonantinduction.api.coding.IProgram;
-import resonantinduction.api.coding.IRedirectTask;
-import resonantinduction.api.coding.ITask;
-import resonantinduction.lib.interfaces.IScroll;
-import resonantinduction.mechanics.armbot.command.TaskEnd;
-import resonantinduction.mechanics.armbot.command.TaskIdle;
-import resonantinduction.mechanics.armbot.command.TaskStart;
-import resonantinduction.transport.encoder.TileEntityEncoder;
+import resonantinduction.old.api.coding.IProgram;
+import resonantinduction.old.api.coding.IRedirectTask;
+import resonantinduction.old.api.coding.ITask;
+import resonantinduction.old.lib.interfaces.IScroll;
+import resonantinduction.old.mechanics.armbot.command.TaskEnd;
+import resonantinduction.old.mechanics.armbot.command.TaskIdle;
+import resonantinduction.old.mechanics.armbot.command.TaskStart;
+import resonantinduction.old.transport.encoder.TileEntityEncoder;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
 

src/main/java/resonantinduction/old/client/model/ModelAdvancedHopper.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelAngledBelt.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelArmbot.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelCenterTank.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelConstructionPump.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelConveyorBelt.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelCopperWire.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelCornerTank.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelCrusher.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelElecFurnace.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/main/java/resonantinduction/old/client/model/ModelEngine.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelFrackingPipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelFurnace.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelGearPiston.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelGearRod.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelGenerator.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelGrinder.java

@@ -4,7 +4,7 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/resonantinduction/old/client/model/ModelHelper.java

@@ -1,4 +1,4 @@
-package resonantinduction.client.model;
+package resonantinduction.old.client.model;
 
 import static org.lwjgl.opengl.GL11.GL_QUADS;
 import static org.lwjgl.opengl.GL11.glBegin;