started refactor into own package

src/main/java/li/cil/occ/OpenComponents.java

@@ -1,18 +1,9 @@
-package li.cil.oc;
+package li.cil.occ;
 
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import li.cil.oc.driver.Registry;
-import li.cil.oc.driver.appeng.HandlerAppEng;
-import li.cil.oc.driver.buildcraft.HandlerBuildCraft;
-import li.cil.oc.driver.computercraft.HandlerComputerCraft;
-import li.cil.oc.driver.enderstorage.HandlerEnderStorage;
-import li.cil.oc.driver.ic2.HandlerIndustrialCraft2;
-import li.cil.oc.driver.mekanism.HandlerMekanism;
-import li.cil.oc.driver.redstoneinmotion.HandlerRedstoneInMotion;
-import li.cil.oc.driver.thermalexpansion.HandlerThermalExpansion;
-import li.cil.oc.driver.vanilla.HandlerVanilla;
+import li.cil.occ.handler.*;
 import net.minecraftforge.common.Configuration;
 
 import java.util.logging.Logger;

src/main/java/li/cil/occ/handler/HandlerAppEng.java

@@ -1,15 +1,16 @@
-package li.cil.oc.driver.appeng;
+package li.cil.occ.handler;
 
 
 import appeng.api.IAEItemStack;
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
-import li.cil.oc.driver.Registry;
+import li.cil.occ.handler.appeng.DriverCellProvider;
+import li.cil.occ.handler.appeng.DriverGridTileEntity;
+import li.cil.occ.handler.appeng.DriverTileController;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerAppEng implements IModHandler {
+public final class HandlerAppEng implements IHandler {
     @Override
     public String getModId() {
         return "AppliedEnergistics";
@@ -26,7 +27,7 @@ public final class HandlerAppEng implements IModHandler {
     public void populate(final Map<String, Object> map, final ItemStack stack) {
     }
 
-    static Map<String, Object> toMap(final IAEItemStack stack) {
+    public static Map<String, Object> toMap(final IAEItemStack stack) {
         // TODO Do we want to add more (isCraftable?) here? If not, inline.
         // (Do we even need the 'requestable'?)
         final Map<String, Object> map = Registry.toMap(stack.getItemStack());

src/main/java/li/cil/occ/handler/HandlerBuildCraft.java

@@ -1,12 +1,15 @@
-package li.cil.oc.driver.buildcraft;
+package li.cil.occ.handler;
 
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.buildcraft.DriverMachine;
+import li.cil.occ.handler.buildcraft.DriverPipe;
+import li.cil.occ.handler.buildcraft.DriverPipeTE;
+import li.cil.occ.handler.buildcraft.DriverPowerReceptor;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerBuildCraft implements IModHandler {
+public final class HandlerBuildCraft implements IHandler {
     @Override
     public String getModId() {
         return "BuildCraft|Core";

src/main/java/li/cil/occ/handler/HandlerComputerCraft.java

@@ -1,13 +1,13 @@
-package li.cil.oc.driver.computercraft;
+package li.cil.occ.handler;
 
-import li.cil.oc.OpenComponents;
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.OpenComponents;
+import li.cil.occ.handler.computercraft.DriverPeripheral;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerComputerCraft implements IModHandler {
+public final class HandlerComputerCraft implements IHandler {
     @Override
     public String getModId() {
         return "ComputerCraft";

src/main/java/li/cil/occ/handler/HandlerEnderStorage.java

@@ -1,12 +1,12 @@
-package li.cil.oc.driver.enderstorage;
+package li.cil.occ.handler;
 
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.enderstorage.DriverFrequencyOwner;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerEnderStorage implements IModHandler {
+public final class HandlerEnderStorage implements IHandler {
     @Override
     public String getModId() {
         return "EnderStorage";

src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java

@@ -1,15 +1,15 @@
-package li.cil.oc.driver.ic2;
+package li.cil.occ.handler;
 
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.ic2.*;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public class HandlerIndustrialCraft2 implements IModHandler {
+public class HandlerIndustrialCraft2 implements IHandler {
     @Override
     public String getModId() {
         return "IC2";

src/main/java/li/cil/occ/handler/HandlerMekanism.java

@@ -1,12 +1,13 @@
-package li.cil.oc.driver.mekanism;
+package li.cil.occ.handler;
 
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.mekanism.DriverEnergyCube;
+import li.cil.occ.handler.mekanism.DriverGenerator;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public class HandlerMekanism implements IModHandler {
+public class HandlerMekanism implements IHandler {
     @Override
     public String getModId() {
         return "Mekanism";

src/main/java/li/cil/occ/handler/HandlerRedstoneInMotion.java

@@ -1,12 +1,12 @@
-package li.cil.oc.driver.redstoneinmotion;
+package li.cil.occ.handler;
 
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.redstoneinmotion.DriverCarriageController;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerRedstoneInMotion implements IModHandler {
+public final class HandlerRedstoneInMotion implements IHandler {
     @Override
     public String getModId() {
         return "JAKJ_RedstoneInMotion";

src/main/java/li/cil/occ/handler/HandlerThermalExpansion.java

@@ -1,14 +1,14 @@
-package li.cil.oc.driver.thermalexpansion;
+package li.cil.occ.handler;
 
 import cofh.api.energy.IEnergyContainerItem;
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.thermalexpansion.*;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerThermalExpansion implements IModHandler {
+public final class HandlerThermalExpansion implements IHandler {
     @Override
     public String getModId() {
         return "ThermalExpansion";

src/main/java/li/cil/occ/handler/HandlerVanilla.java

@@ -1,12 +1,12 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler;
 
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.vanilla.*;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public final class HandlerVanilla implements IModHandler {
+public final class HandlerVanilla implements IHandler {
     @Override
     public String getModId() {
         return null;

src/main/java/li/cil/occ/handler/IHandler.java

@@ -1,10 +1,10 @@
-package li.cil.oc.driver;
+package li.cil.occ.handler;
 
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public interface IModHandler {
+public interface IHandler {
     String getModId();
 
     void initialize();

src/main/java/li/cil/occ/handler/ManagedTileEntityEnvironment.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver;
+package li.cil.occ.handler;
 
 import li.cil.oc.api.Network;
 import li.cil.oc.api.network.Visibility;

src/main/java/li/cil/occ/handler/Registry.java

@@ -1,24 +1,30 @@
-package li.cil.oc.driver;
+package li.cil.occ.handler;
 
 import cpw.mods.fml.common.Loader;
+import li.cil.occ.OpenComponents;
 import net.minecraft.item.ItemStack;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;
 
 public final class Registry {
-    private static final Set<IModHandler> handlers = new HashSet<IModHandler>();
+    private static final Set<IHandler> handlers = new HashSet<IHandler>();
 
     private Registry() {
     }
 
-    public static void add(final IModHandler mod) {
+    public static void add(final IHandler mod) {
         final boolean alwaysEnabled = mod.getModId() == null || mod.getModId().isEmpty();
         if ((alwaysEnabled || Loader.isModLoaded(mod.getModId())) && handlers.add(mod)) {
-            // TODO Log message? Use logger instead of println if so.
-            mod.initialize();
+            OpenComponents.Log.info(String.format("Initializing handler for '%s'.", mod.getModId()));
+            try {
+                mod.initialize();
+            } catch (Throwable e) {
+                OpenComponents.Log.log(Level.WARNING, String.format("Error initializing handler for '%s'", mod.getModId()), e);
+            }
         }
     }
 
@@ -27,7 +33,7 @@ public final class Registry {
             return null;
         }
         final Map<String, Object> map = new HashMap<String, Object>();
-        for (IModHandler handler : handlers) {
+        for (IHandler handler : handlers) {
             handler.populate(map, value);
         }
         return map;

src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.appeng;
+package li.cil.occ.handler.appeng;
 
 import appeng.api.IAEItemStack;
 import appeng.api.Util;
@@ -9,8 +9,9 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
-import li.cil.oc.driver.Registry;
+import li.cil.occ.handler.HandlerAppEng;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.Registry;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/appeng/DriverGridTileEntity.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.appeng;
+package li.cil.occ.handler.appeng;
 
 import appeng.api.me.tiles.IGridTileEntity;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public class DriverGridTileEntity extends DriverTileEntity {

src/main/java/li/cil/occ/handler/appeng/DriverTileController.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.appeng;
+package li.cil.occ.handler.appeng;
 
 import appeng.api.exceptions.AppEngTileMissingException;
 import appeng.api.me.tiles.IGridTileEntity;
@@ -9,9 +9,9 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
-import li.cil.oc.driver.Registry;
-import li.cil.oc.util.Reflection;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.Registry;
+import li.cil.occ.util.Reflection;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/buildcraft/DriverMachine.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.buildcraft;
+package li.cil.occ.handler.buildcraft;
 
 
 import buildcraft.core.IMachine;
@@ -7,7 +7,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverMachine extends DriverTileEntity {

src/main/java/li/cil/occ/handler/buildcraft/DriverPipe.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.buildcraft;
+package li.cil.occ.handler.buildcraft;
 
 import buildcraft.api.transport.IPipe;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverPipe extends DriverTileEntity {

src/main/java/li/cil/occ/handler/buildcraft/DriverPipeTE.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.buildcraft;
+package li.cil.occ.handler.buildcraft;
 
 import buildcraft.api.transport.IPipe;
 import buildcraft.api.transport.IPipeTile;
@@ -7,7 +7,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverPipeTE extends DriverTileEntity {

src/main/java/li/cil/occ/handler/buildcraft/DriverPowerReceptor.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.buildcraft;
+package li.cil.occ.handler.buildcraft;
 
 import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerHandler;
@@ -7,7 +7,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 

src/main/java/li/cil/occ/handler/computercraft/DriverPeripheral.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.computercraft;
+package li.cil.occ.handler.computercraft;
 
 import dan200.computer.api.IPeripheral;
 import li.cil.oc.api.network.ManagedEnvironment;

src/main/java/li/cil/occ/handler/enderstorage/DriverFrequencyOwner.java

@@ -1,12 +1,12 @@
-package li.cil.oc.driver.enderstorage;
+package li.cil.occ.handler.enderstorage;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
-import li.cil.oc.util.Reflection;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
+import li.cil.occ.util.Reflection;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/ic2/DriverEnergyConductor.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.ic2;
+package li.cil.occ.handler.ic2;
 
 import ic2.api.energy.tile.IEnergyConductor;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverEnergyConductor extends DriverTileEntity {

src/main/java/li/cil/occ/handler/ic2/DriverEnergySink.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.ic2;
+package li.cil.occ.handler.ic2;
 
 import ic2.api.energy.tile.IEnergySink;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverEnergySink extends DriverTileEntity {

src/main/java/li/cil/occ/handler/ic2/DriverEnergySource.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.ic2;
+package li.cil.occ.handler.ic2;
 
 import ic2.api.energy.tile.IEnergySource;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverEnergySource extends DriverTileEntity {

src/main/java/li/cil/occ/handler/ic2/DriverEnergyStorage.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.ic2;
+package li.cil.occ.handler.ic2;
 
 import ic2.api.tile.IEnergyStorage;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverEnergyStorage extends DriverTileEntity {

src/main/java/li/cil/occ/handler/ic2/DriverReactor.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.ic2;
+package li.cil.occ.handler.ic2;
 
 import ic2.api.reactor.IReactor;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverReactor extends DriverTileEntity {

src/main/java/li/cil/occ/handler/ic2/DriverReactorChamber.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.ic2;
+package li.cil.occ.handler.ic2;
 
 import ic2.api.reactor.IReactor;
 import ic2.api.reactor.IReactorChamber;
@@ -7,7 +7,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverReactorChamber extends DriverTileEntity {

src/main/java/li/cil/occ/handler/mekanism/DriverEnergyCube.java

@@ -1,8 +1,8 @@
-package li.cil.oc.driver.mekanism;
+package li.cil.occ.handler.mekanism;
 
 
-import li.cil.oc.driver.computercraft.DriverPeripheral;
-import li.cil.oc.util.Reflection;
+import li.cil.occ.handler.computercraft.DriverPeripheral;
+import li.cil.occ.util.Reflection;
 
 public class DriverEnergyCube extends DriverPeripheral {
     private static final Class<?> TileentityEnergyCube = Reflection.getClass("mekanism.common.tileentity.TileEntityEnergyCube");

src/main/java/li/cil/occ/handler/mekanism/DriverGenerator.java

@@ -1,8 +1,8 @@
-package li.cil.oc.driver.mekanism;
+package li.cil.occ.handler.mekanism;
 
 
-import li.cil.oc.driver.computercraft.DriverPeripheral;
-import li.cil.oc.util.Reflection;
+import li.cil.occ.handler.computercraft.DriverPeripheral;
+import li.cil.occ.util.Reflection;
 
 public class DriverGenerator extends DriverPeripheral {
     private static final Class<?> TileGenerator = Reflection.getClass("mekanism.generators.common.tileentity.TileEntityGenerator");

src/main/java/li/cil/occ/handler/redstoneinmotion/DriverCarriageController.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.redstoneinmotion;
+package li.cil.occ.handler.redstoneinmotion;
 
 import li.cil.oc.api.driver.NamedBlock;
 import li.cil.oc.api.network.Arguments;
@@ -6,8 +6,8 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
-import li.cil.oc.util.Reflection;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
+import li.cil.occ.util.Reflection;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;

src/main/java/li/cil/occ/handler/thermalexpansion/DriverEnderAttuned.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.thermalexpansion;
+package li.cil.occ.handler.thermalexpansion;
 
 import cofh.api.transport.IEnderAttuned;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverEnderAttuned extends DriverTileEntity {

src/main/java/li/cil/occ/handler/thermalexpansion/DriverEnergyHandler.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.thermalexpansion;
+package li.cil.occ.handler.thermalexpansion;
 
 import cofh.api.energy.IEnergyHandler;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 

src/main/java/li/cil/occ/handler/thermalexpansion/DriverEnergyInfo.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.thermalexpansion;
+package li.cil.occ.handler.thermalexpansion;
 
 import cofh.api.tileentity.IEnergyInfo;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverEnergyInfo extends DriverTileEntity {

src/main/java/li/cil/occ/handler/thermalexpansion/DriverRedstoneControl.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.thermalexpansion;
+package li.cil.occ.handler.thermalexpansion;
 
 import cofh.api.tileentity.IRedstoneControl;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
 public final class DriverRedstoneControl extends DriverTileEntity {

src/main/java/li/cil/occ/handler/thermalexpansion/DriverSecureTile.java

@@ -1,4 +1,4 @@
-package li.cil.oc.driver.thermalexpansion;
+package li.cil.occ.handler.thermalexpansion;
 
 import cofh.api.tileentity.ISecureTile;
 import li.cil.oc.api.network.Arguments;
@@ -6,7 +6,7 @@ import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 import org.apache.commons.lang3.text.WordUtils;
 

src/main/java/li/cil/occ/handler/vanilla/DriverBeacon.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.potion.Potion;
 import net.minecraft.tileentity.TileEntityBeacon;
 import net.minecraft.world.World;

src/main/java/li/cil/occ/handler/vanilla/DriverBrewingStand.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.tileentity.TileEntityBrewingStand;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/vanilla/DriverCommandBlock.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.tileentity.TileEntityCommandBlock;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/vanilla/DriverComparator.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.tileentity.TileEntityComparator;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/vanilla/DriverFluidHandler.java

@@ -1,12 +1,12 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
-import li.cil.oc.util.TypeConversion;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
+import li.cil.occ.util.TypeConversion;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;

src/main/java/li/cil/occ/handler/vanilla/DriverFluidTank.java

@@ -1,12 +1,12 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
-import li.cil.oc.util.TypeConversion;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
+import li.cil.occ.util.TypeConversion;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidTank;

src/main/java/li/cil/occ/handler/vanilla/DriverFurnace.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/vanilla/DriverInventory.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

src/main/java/li/cil/occ/handler/vanilla/DriverMobSpawner.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.tileentity.TileEntityMobSpawner;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/handler/vanilla/DriverNoteBlock.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntityNote;
 import net.minecraft.world.World;

src/main/java/li/cil/occ/handler/vanilla/DriverRecordPlayer.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.item.ItemRecord;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityRecordPlayer;

src/main/java/li/cil/occ/handler/vanilla/DriverSign.java

@@ -1,11 +1,11 @@
-package li.cil.oc.driver.vanilla;
+package li.cil.occ.handler.vanilla;
 
 import li.cil.oc.api.network.Arguments;
 import li.cil.oc.api.network.Callback;
 import li.cil.oc.api.network.Context;
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
-import li.cil.oc.driver.ManagedTileEntityEnvironment;
+import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.tileentity.TileEntitySign;
 import net.minecraft.world.World;
 

src/main/java/li/cil/occ/util/Reflection.java

@@ -1,4 +1,4 @@
-package li.cil.oc.util;
+package li.cil.occ.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;

src/main/java/li/cil/occ/util/TypeConversion.java

@@ -1,4 +1,4 @@
-package li.cil.oc.util;
+package li.cil.occ.util;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidTankInfo;