From 7d049b98a660e21934bc7c6befb6d49ff8768114 Mon Sep 17 00:00:00 2001
From: DarkGuardsman <rseifert.phone@gmail.com>
Date: Wed, 18 Dec 2013 16:01:18 -0500
Subject: [PATCH] Clean up and import changes

---
 src/dark/farmtech/FarmTech.java                        | 6 +++---
 src/dark/farmtech/item/ItemFarmFood.java               | 2 +-
 src/dark/farmtech/machines/TileEntityMechCompBox.java  | 7 ++++---
 src/dark/farmtech/machines/farmer/EntityFarmDrone.java | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/dark/farmtech/FarmTech.java b/src/dark/farmtech/FarmTech.java
index 6d955c34a..684e109fe 100644
--- a/src/dark/farmtech/FarmTech.java
+++ b/src/dark/farmtech/FarmTech.java
@@ -10,7 +10,8 @@ import net.minecraftforge.common.Configuration;
 import universalelectricity.prefab.TranslationHelper;
 
 import com.dark.DarkCore;
-import com.dark.ModObjectRegistry;
+import com.dark.CoreRegistry;
+import com.dark.prefab.ItemBlockHolder;
 
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
@@ -28,7 +29,6 @@ import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import dark.api.farm.CropAutomationHandler;
 import dark.api.farm.DecayMatterList;
-import dark.core.prefab.ItemBlockHolder;
 import dark.core.prefab.ModPrefab;
 import dark.farmtech.blocks.BlockFarmSoil;
 import dark.farmtech.entities.EntityFarmEgg;
@@ -112,7 +112,7 @@ public class FarmTech extends ModPrefab
     {
         CONFIGURATION.load();
 
-        blockFarmSoil = ModObjectRegistry.createNewBlock("FTBlockFarmSoil", FarmTech.MOD_ID, BlockFarmSoil.class, ItemBlockHolder.class);
+        blockFarmSoil = CoreRegistry.createNewBlock("FTBlockFarmSoil", FarmTech.MOD_ID, BlockFarmSoil.class, ItemBlockHolder.class);
 
         //String compostList = CONFIGURATION.get("DecayMatter", "List", "5::8000:1", "Items or blocks beyond the built in ones that can be turned into compost. Entries go BlockID:Meta:Time:Amount").getString();
         //DecayMatterList.parseConfigString(compostList);
diff --git a/src/dark/farmtech/item/ItemFarmFood.java b/src/dark/farmtech/item/ItemFarmFood.java
index 5b82f6b92..662b2514d 100644
--- a/src/dark/farmtech/item/ItemFarmFood.java
+++ b/src/dark/farmtech/item/ItemFarmFood.java
@@ -18,10 +18,10 @@ import universalelectricity.core.vector.Vector3;
 
 import com.dark.DarkCore;
 import com.dark.IExtraInfo.IExtraItemInfo;
+import com.dark.helpers.ItemWorldHelper;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.helpers.ItemWorldHelper;
 import dark.farmtech.FarmTech;
 
 /** Item for storing all kinds of food based items including meats, fruits, pies, cakes, breads, etc
diff --git a/src/dark/farmtech/machines/TileEntityMechCompBox.java b/src/dark/farmtech/machines/TileEntityMechCompBox.java
index d864556ac..6c555ea03 100644
--- a/src/dark/farmtech/machines/TileEntityMechCompBox.java
+++ b/src/dark/farmtech/machines/TileEntityMechCompBox.java
@@ -3,11 +3,12 @@ package dark.farmtech.machines;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.dark.prefab.tile.network.NetworkSharedPower;
+import com.dark.tile.network.INetworkEnergyPart;
+import com.dark.tile.network.ITileNetwork;
+
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import dark.api.tilenetwork.INetworkEnergyPart;
-import dark.api.tilenetwork.ITileNetwork;
-import dark.core.prefab.tilenetwork.NetworkSharedPower;
 
 /** Advanced version of the compBox that can link to other boxes and process matter at a higher rate.
  * Cost some minor power and will have some mechanical animation of flipping dirt & items
diff --git a/src/dark/farmtech/machines/farmer/EntityFarmDrone.java b/src/dark/farmtech/machines/farmer/EntityFarmDrone.java
index a2a128dc2..9fe037ce8 100644
--- a/src/dark/farmtech/machines/farmer/EntityFarmDrone.java
+++ b/src/dark/farmtech/machines/farmer/EntityFarmDrone.java
@@ -1,12 +1,13 @@
 package dark.farmtech.machines.farmer;
 
+import com.dark.helpers.ItemWorldHelper;
+
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import universalelectricity.core.block.IElectricalStorage;
 import universalelectricity.core.vector.Vector3;
-import dark.core.helpers.ItemWorldHelper;
 
 public class EntityFarmDrone extends EntityLiving implements IElectricalStorage
 {