AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 19:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

more refactoring

Browse Source
This commit is contained in:
Florian Nücke 2014-02-08 19:14:16 +01:00
parent 3e879f5473
commit 4dc5be944f
16 changed files with 44 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/li/cil/oc/driver/atomicscience/HandlerAtomicScience.java → src/main/java/li/cil/occ/handler/HandlerAtomicScience.java
View File

@ -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.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 net.minecraft.item.ItemStack;
import java.util.Map; import java.util.Map;
public class HandlerAtomicScience implements IModHandler { public final class HandlerAtomicScience implements IHandler {
@Override @Override
public String getModId() { public String getModId() {
return "AtomicScience"; return "AtomicScience";

2
src/main/java/li/cil/occ/handler/HandlerIndustrialCraft2.java
View File

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

5
src/main/java/li/cil/occ/handler/HandlerMekanism.java
View File

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

2
src/main/java/li/cil/occ/handler/appeng/DriverCellProvider.java
View File

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

2
src/main/java/li/cil/occ/handler/appeng/DriverGridTileEntity.java
View File

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

2
src/main/java/li/cil/occ/handler/appeng/DriverTileController.java
View File

@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; 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"); private static final Class<?> TileController = Reflection.getClass("appeng.me.tile.TileController");
@Override @Override

10
src/main/java/li/cil/oc/driver/atomicscience/DriverReactor.java → src/main/java/li/cil/occ/handler/atomicscience/DriverReactor.java
View File

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

10
src/main/java/li/cil/oc/driver/atomicscience/DriverTemperature.java → src/main/java/li/cil/occ/handler/atomicscience/DriverTemperature.java
View File

@ -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 atomicscience.api.ITemperature;
import li.cil.oc.api.network.Arguments; import li.cil.oc.api.network.Arguments;
import li.cil.oc.api.network.Callback; import li.cil.oc.api.network.Callback;
import li.cil.oc.api.network.Context; import li.cil.oc.api.network.Context;
import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.network.ManagedEnvironment;
import li.cil.oc.api.prefab.DriverTileEntity; 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.minecraft.world.World;
public final class DriverTemperature extends DriverTileEntity {
public class DriverTemperature extends DriverTileEntity {
@Override @Override
public Class<?> getTileEntityClass() { public Class<?> getTileEntityClass() {
return ITemperature.class; return ITemperature.class;
} }
@Override @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)); return new Environment((ITemperature) world.getBlockTileEntity(x, y, z));
} }

9
src/main/java/li/cil/oc/driver/mekanism/DriverBasicMachine.java → src/main/java/li/cil/occ/handler/mekanism/DriverBasicMachine.java
View File

@ -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; public final class DriverBasicMachine extends DriverPeripheral {
import li.cil.oc.util.Reflection;
public class DriverBasicMachine extends DriverPeripheral {
private static final Class<?> TileEntityBasicMachine = Reflection.getClass("mekanism.common.tileentity.TileEntityBasicMachine"); private static final Class<?> TileEntityBasicMachine = Reflection.getClass("mekanism.common.tileentity.TileEntityBasicMachine");
@Override @Override

9
src/main/java/li/cil/oc/driver/mekanism/DriverDigitalMiner.java → src/main/java/li/cil/occ/handler/mekanism/DriverDigitalMiner.java
View File

@ -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; public final class DriverDigitalMiner extends DriverPeripheral {
import li.cil.oc.util.Reflection;
public class DriverDigitalMiner extends DriverPeripheral {
private static final Class<?> TileEntityDigitalMiner = Reflection.getClass("mekanism.common.tileentity.TileEntityDigitalMiner"); private static final Class<?> TileEntityDigitalMiner = Reflection.getClass("mekanism.common.tileentity.TileEntityDigitalMiner");
@Override @Override

9
src/main/java/li/cil/oc/driver/mekanism/DriverElectrolyticSeperator.java → src/main/java/li/cil/occ/handler/mekanism/DriverElectrolyticSeperator.java
View File

@ -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; public final class DriverElectrolyticSeperator extends DriverPeripheral {
import li.cil.oc.util.Reflection;
public class DriverElectrolyticSeperator extends DriverPeripheral {
private static final Class<?> TileEntityElectrolyticSeparator = Reflection.getClass("mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator"); private static final Class<?> TileEntityElectrolyticSeparator = Reflection.getClass("mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator");
@Override @Override

3
src/main/java/li/cil/occ/handler/mekanism/DriverEnergyCube.java
View File

@ -1,10 +1,9 @@
package li.cil.occ.handler.mekanism; package li.cil.occ.handler.mekanism;
import li.cil.occ.handler.computercraft.DriverPeripheral; import li.cil.occ.handler.computercraft.DriverPeripheral;
import li.cil.occ.util.Reflection; 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"); private static final Class<?> TileentityEnergyCube = Reflection.getClass("mekanism.common.tileentity.TileEntityEnergyCube");
@Override @Override

9
src/main/java/li/cil/oc/driver/mekanism/DriverFactory.java → src/main/java/li/cil/occ/handler/mekanism/DriverFactory.java
View File

@ -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; public final class DriverFactory extends DriverPeripheral {
import li.cil.oc.util.Reflection;
public class DriverFactory extends DriverPeripheral {
private static final Class<?> TileEntityFactory = Reflection.getClass("mekanism.common.tileentity.TileEntityFactory"); private static final Class<?> TileEntityFactory = Reflection.getClass("mekanism.common.tileentity.TileEntityFactory");
@Override @Override

3
src/main/java/li/cil/occ/handler/mekanism/DriverGenerator.java
View File

@ -1,10 +1,9 @@
package li.cil.occ.handler.mekanism; package li.cil.occ.handler.mekanism;
import li.cil.occ.handler.computercraft.DriverPeripheral; import li.cil.occ.handler.computercraft.DriverPeripheral;
import li.cil.occ.util.Reflection; 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"); private static final Class<?> TileGenerator = Reflection.getClass("mekanism.generators.common.tileentity.TileEntityGenerator");
@Override @Override

9
src/main/java/li/cil/oc/driver/mekanism/DriverMEtallurgicInfuser.java → src/main/java/li/cil/occ/handler/mekanism/DriverMetallurgicInfuser.java
View File

@ -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; public final class DriverMetallurgicInfuser extends DriverPeripheral {
import li.cil.oc.util.Reflection;
public class DriverMetallurgicInfuser extends DriverPeripheral {
private static final Class<?> TileEntityMetallurgicInfuser = Reflection.getClass("mekanism.common.tileentity.TileEntityMetallurgicInfuser"); private static final Class<?> TileEntityMetallurgicInfuser = Reflection.getClass("mekanism.common.tileentity.TileEntityMetallurgicInfuser");
@Override @Override

9
src/main/java/li/cil/oc/driver/mekanism/DriverTeleporter.java → src/main/java/li/cil/occ/handler/mekanism/DriverTeleporter.java
View File

@ -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; public final class DriverTeleporter extends DriverPeripheral {
import li.cil.oc.util.Reflection;
public class DriverTeleporter extends DriverPeripheral {
private static final Class<?> TileEntityTeleporter = Reflection.getClass("mekanism.common.tileentity.TileEntityTeleporter"); private static final Class<?> TileEntityTeleporter = Reflection.getClass("mekanism.common.tileentity.TileEntityTeleporter");
@Override @Override