more refactoring

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

@@ -1,13 +1,13 @@
-package li.cil.oc.driver.atomicscience;
-
+package li.cil.occ.handler;
 
 import li.cil.oc.api.Driver;
-import li.cil.oc.driver.IModHandler;
+import li.cil.occ.handler.atomicscience.DriverReactor;
+import li.cil.occ.handler.atomicscience.DriverTemperature;
 import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public class HandlerAtomicScience implements IModHandler {
+public final class HandlerAtomicScience implements IHandler {
     @Override
     public String getModId() {
         return "AtomicScience";

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

@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
 
 import java.util.Map;
 
-public class HandlerIndustrialCraft2 implements IHandler {
+public final class HandlerIndustrialCraft2 implements IHandler {
     @Override
     public String getModId() {
         return "IC2";

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

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

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

@@ -18,7 +18,7 @@ import net.minecraft.world.World;
 import java.util.ArrayList;
 import java.util.Map;
 
-public class DriverCellProvider extends DriverTileEntity {
+public final class DriverCellProvider extends DriverTileEntity {
     @Override
     public Class<?> getTileEntityClass() {
         return ICellProvider.class;

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

@@ -9,7 +9,7 @@ import li.cil.oc.api.prefab.DriverTileEntity;
 import li.cil.occ.handler.ManagedTileEntityEnvironment;
 import net.minecraft.world.World;
 
-public class DriverGridTileEntity extends DriverTileEntity {
+public final class DriverGridTileEntity extends DriverTileEntity {
     @Override
     public Class<?> getTileEntityClass() {
         return IGridTileEntity.class;

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

@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-public class DriverTileController extends DriverTileEntity {
+public final class DriverTileController extends DriverTileEntity {
     private static final Class<?> TileController = Reflection.getClass("appeng.me.tile.TileController");
 
     @Override

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

@@ -1,24 +1,22 @@
-package li.cil.oc.driver.atomicscience;
+package li.cil.occ.handler.atomicscience;
 
 import atomicscience.api.IReactor;
-import buildcraft.core.IMachine;
 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.world.World;
 
-
-public class DriverReactor extends DriverTileEntity {
+public final class DriverReactor extends DriverTileEntity {
     @Override
     public Class<?> getTileEntityClass() {
         return IReactor.class;
     }
 
     @Override
-    public ManagedEnvironment createEnvironment(World world, int x, int y, int z) {
+    public ManagedEnvironment createEnvironment(final World world, final int x, final int y, final int z) {
         return new Environment((IReactor) world.getBlockTileEntity(x, y, z));
     }
 

src/main/java/li/cil/occ/handler/atomicscience/DriverTemperature.java

@@ -1,24 +1,22 @@
-package li.cil.oc.driver.atomicscience;
+package li.cil.occ.handler.atomicscience;
 
-import atomicscience.api.IReactor;
 import atomicscience.api.ITemperature;
 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.world.World;
 
-
-public class DriverTemperature extends DriverTileEntity {
+public final class DriverTemperature extends DriverTileEntity {
     @Override
     public Class<?> getTileEntityClass() {
         return ITemperature.class;
     }
 
     @Override
-    public ManagedEnvironment createEnvironment(World world, int x, int y, int z) {
+    public ManagedEnvironment createEnvironment(final World world, final int x, final int y, final int z) {
         return new Environment((ITemperature) world.getBlockTileEntity(x, y, z));
     }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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