From 4dc5be944f7d8c3fcb116aba5e314816da255d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 8 Feb 2014 19:14:16 +0100 Subject: [PATCH] more refactoring --- .../handler}/HandlerAtomicScience.java | 8 ++++---- .../li/cil/occ/handler/HandlerIndustrialCraft2.java | 2 +- src/main/java/li/cil/occ/handler/HandlerMekanism.java | 5 ++--- .../li/cil/occ/handler/appeng/DriverCellProvider.java | 2 +- .../cil/occ/handler/appeng/DriverGridTileEntity.java | 2 +- .../cil/occ/handler/appeng/DriverTileController.java | 2 +- .../handler}/atomicscience/DriverReactor.java | 10 ++++------ .../handler}/atomicscience/DriverTemperature.java | 10 ++++------ .../handler}/mekanism/DriverBasicMachine.java | 9 ++++----- .../handler}/mekanism/DriverDigitalMiner.java | 9 ++++----- .../handler}/mekanism/DriverElectrolyticSeperator.java | 9 ++++----- .../li/cil/occ/handler/mekanism/DriverEnergyCube.java | 3 +-- .../driver => occ/handler}/mekanism/DriverFactory.java | 9 ++++----- .../li/cil/occ/handler/mekanism/DriverGenerator.java | 3 +-- .../handler/mekanism/DriverMetallurgicInfuser.java} | 9 ++++----- .../handler}/mekanism/DriverTeleporter.java | 9 ++++----- 16 files changed, 44 insertions(+), 57 deletions(-) rename src/main/java/li/cil/{oc/driver/atomicscience => occ/handler}/HandlerAtomicScience.java (67%) rename src/main/java/li/cil/{oc/driver => occ/handler}/atomicscience/DriverReactor.java (76%) rename src/main/java/li/cil/{oc/driver => occ/handler}/atomicscience/DriverTemperature.java (76%) rename src/main/java/li/cil/{oc/driver => occ/handler}/mekanism/DriverBasicMachine.java (55%) rename src/main/java/li/cil/{oc/driver => occ/handler}/mekanism/DriverDigitalMiner.java (55%) rename src/main/java/li/cil/{oc/driver => occ/handler}/mekanism/DriverElectrolyticSeperator.java (57%) rename src/main/java/li/cil/{oc/driver => occ/handler}/mekanism/DriverFactory.java (54%) rename src/main/java/li/cil/{oc/driver/mekanism/DriverMEtallurgicInfuser.java => occ/handler/mekanism/DriverMetallurgicInfuser.java} (56%) rename src/main/java/li/cil/{oc/driver => occ/handler}/mekanism/DriverTeleporter.java (54%) diff --git a/src/main/java/li/cil/oc/driver/atomicscience/HandlerAtomicScience.java b/src/main/java/li/cil/occ/handler/HandlerAtomicScience.java similarity index 67% rename from src/main/java/li/cil/oc/driver/atomicscience/HandlerAtomicScience.java rename to src/main/java/li/cil/occ/handler/HandlerAtomicScience.java index 1ef6a385a..a485f2a47 100644 --- a/src/main/java/li/cil/oc/driver/atomicscience/HandlerAtomicScience.java +++ b/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"; diff --git a/src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java b/src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java index 7b8bc46db..4d296d1e6 100644 --- a/src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java +++ b/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"; diff --git a/src/main/java/li/cil/occ/handler/HandlerMekanism.java b/src/main/java/li/cil/occ/handler/HandlerMekanism.java index a8a35a431..24c6358c0 100644 --- a/src/main/java/li/cil/occ/handler/HandlerMekanism.java +++ b/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"; diff --git a/src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java b/src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java index 169611089..ef064ee01 100644 --- a/src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java +++ b/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; diff --git a/src/main/java/li/cil/occ/handler/appeng/DriverGridTileEntity.java b/src/main/java/li/cil/occ/handler/appeng/DriverGridTileEntity.java index b6a9cc43e..b19089377 100644 --- a/src/main/java/li/cil/occ/handler/appeng/DriverGridTileEntity.java +++ b/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; diff --git a/src/main/java/li/cil/occ/handler/appeng/DriverTileController.java b/src/main/java/li/cil/occ/handler/appeng/DriverTileController.java index 2a75bdc60..80685b0b9 100644 --- a/src/main/java/li/cil/occ/handler/appeng/DriverTileController.java +++ b/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 diff --git a/src/main/java/li/cil/oc/driver/atomicscience/DriverReactor.java b/src/main/java/li/cil/occ/handler/atomicscience/DriverReactor.java similarity index 76% rename from src/main/java/li/cil/oc/driver/atomicscience/DriverReactor.java rename to src/main/java/li/cil/occ/handler/atomicscience/DriverReactor.java index 5c0356e50..7f3184731 100644 --- a/src/main/java/li/cil/oc/driver/atomicscience/DriverReactor.java +++ b/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)); } diff --git a/src/main/java/li/cil/oc/driver/atomicscience/DriverTemperature.java b/src/main/java/li/cil/occ/handler/atomicscience/DriverTemperature.java similarity index 76% rename from src/main/java/li/cil/oc/driver/atomicscience/DriverTemperature.java rename to src/main/java/li/cil/occ/handler/atomicscience/DriverTemperature.java index 71a1b4c0f..23d31004a 100644 --- a/src/main/java/li/cil/oc/driver/atomicscience/DriverTemperature.java +++ b/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)); } diff --git a/src/main/java/li/cil/oc/driver/mekanism/DriverBasicMachine.java b/src/main/java/li/cil/occ/handler/mekanism/DriverBasicMachine.java similarity index 55% rename from src/main/java/li/cil/oc/driver/mekanism/DriverBasicMachine.java rename to src/main/java/li/cil/occ/handler/mekanism/DriverBasicMachine.java index e1685f8eb..16e84c977 100644 --- a/src/main/java/li/cil/oc/driver/mekanism/DriverBasicMachine.java +++ b/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 diff --git a/src/main/java/li/cil/oc/driver/mekanism/DriverDigitalMiner.java b/src/main/java/li/cil/occ/handler/mekanism/DriverDigitalMiner.java similarity index 55% rename from src/main/java/li/cil/oc/driver/mekanism/DriverDigitalMiner.java rename to src/main/java/li/cil/occ/handler/mekanism/DriverDigitalMiner.java index 88b0e59cc..5792f2371 100644 --- a/src/main/java/li/cil/oc/driver/mekanism/DriverDigitalMiner.java +++ b/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 diff --git a/src/main/java/li/cil/oc/driver/mekanism/DriverElectrolyticSeperator.java b/src/main/java/li/cil/occ/handler/mekanism/DriverElectrolyticSeperator.java similarity index 57% rename from src/main/java/li/cil/oc/driver/mekanism/DriverElectrolyticSeperator.java rename to src/main/java/li/cil/occ/handler/mekanism/DriverElectrolyticSeperator.java index 3987bd1a9..0e15e3446 100644 --- a/src/main/java/li/cil/oc/driver/mekanism/DriverElectrolyticSeperator.java +++ b/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 diff --git a/src/main/java/li/cil/occ/handler/mekanism/DriverEnergyCube.java b/src/main/java/li/cil/occ/handler/mekanism/DriverEnergyCube.java index c535bf046..b22c2c463 100644 --- a/src/main/java/li/cil/occ/handler/mekanism/DriverEnergyCube.java +++ b/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 diff --git a/src/main/java/li/cil/oc/driver/mekanism/DriverFactory.java b/src/main/java/li/cil/occ/handler/mekanism/DriverFactory.java similarity index 54% rename from src/main/java/li/cil/oc/driver/mekanism/DriverFactory.java rename to src/main/java/li/cil/occ/handler/mekanism/DriverFactory.java index d8e1159a8..5f391c8ca 100644 --- a/src/main/java/li/cil/oc/driver/mekanism/DriverFactory.java +++ b/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 diff --git a/src/main/java/li/cil/occ/handler/mekanism/DriverGenerator.java b/src/main/java/li/cil/occ/handler/mekanism/DriverGenerator.java index 6a650408c..dd1791aa7 100644 --- a/src/main/java/li/cil/occ/handler/mekanism/DriverGenerator.java +++ b/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 diff --git a/src/main/java/li/cil/oc/driver/mekanism/DriverMEtallurgicInfuser.java b/src/main/java/li/cil/occ/handler/mekanism/DriverMetallurgicInfuser.java similarity index 56% rename from src/main/java/li/cil/oc/driver/mekanism/DriverMEtallurgicInfuser.java rename to src/main/java/li/cil/occ/handler/mekanism/DriverMetallurgicInfuser.java index ce91f860c..ca9f3277a 100644 --- a/src/main/java/li/cil/oc/driver/mekanism/DriverMEtallurgicInfuser.java +++ b/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 diff --git a/src/main/java/li/cil/oc/driver/mekanism/DriverTeleporter.java b/src/main/java/li/cil/occ/handler/mekanism/DriverTeleporter.java similarity index 54% rename from src/main/java/li/cil/oc/driver/mekanism/DriverTeleporter.java rename to src/main/java/li/cil/occ/handler/mekanism/DriverTeleporter.java index ca9303d43..5824479d9 100644 --- a/src/main/java/li/cil/oc/driver/mekanism/DriverTeleporter.java +++ b/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