Merge branch 'master-MC1.7.10' of https://github.com/gdude2002/OpenComputers into master-MC1.7.10

src/main/scala/li/cil/oc/integration/ic2/DriverReactorRedstonePort.java

@@ -0,0 +1,97 @@
+package li.cil.oc.integration.ic2;
+
+import ic2.api.reactor.IReactor;
+import ic2.api.reactor.IReactorChamber;
+import ic2.core.block.reactor.tileentity.TileEntityReactorRedstonePort;
+import li.cil.oc.api.driver.NamedBlock;
+import li.cil.oc.api.machine.Arguments;
+import li.cil.oc.api.machine.Callback;
+import li.cil.oc.api.machine.Context;
+import li.cil.oc.api.network.ManagedEnvironment;
+import li.cil.oc.api.prefab.DriverTileEntity;
+import li.cil.oc.integration.ManagedTileEntityEnvironment;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public final class DriverReactorRedstonePort extends DriverTileEntity {
+    @Override
+    public Class<?> getTileEntityClass() {
+        return TileEntityReactorRedstonePort.class;
+    }
+
+    @Override
+    public ManagedEnvironment createEnvironment(final World world, final int x, final int y, final int z) {
+        return new Environment((TileEntityReactorRedstonePort) world.getTileEntity(x, y, z));
+    }
+
+    public static final class Environment extends ManagedTileEntityEnvironment<TileEntityReactorRedstonePort> implements NamedBlock {
+        public Environment(final TileEntityReactorRedstonePort tileEntity) {
+            super(tileEntity, "reactor_redstone_port");
+        }
+
+        @Override
+        public String preferredName() {
+            return "reactor_redstone_port";
+        }
+
+        @Override
+        public int priority() {
+            return 0;
+        }
+
+        private IReactor getReactor() {
+            final TileEntity reactorInventory = tileEntity.getReactor();
+
+            if (reactorInventory instanceof IReactor) {
+                return (IReactor) reactorInventory;
+            } else {
+                return ((IReactor) ((IReactorChamber) reactorInventory).getReactor());
+            }
+        }
+
+        @Callback(doc = "function():number -- Get the reactor's heat.")
+        public Object[] getHeat(final Context context, final Arguments args) {
+            final IReactor reactor = getReactor();
+            if (reactor != null) {
+                return new Object[]{reactor.getHeat()};
+            } else {
+                return new Object[]{0};
+            }
+        }
+
+        @Callback(doc = "function():number -- Get the reactor's maximum heat before exploding.")
+        public Object[] getMaxHeat(final Context context, final Arguments args) {
+            final IReactor reactor = getReactor();
+            if (reactor != null) {
+                return new Object[]{reactor.getMaxHeat()};
+            } else {
+                return new Object[]{0};
+            }
+        }
+
+        @Callback(doc = "function():number -- Get the reactor's energy output. Not multiplied with the base EU/t value.")
+        public Object[] getReactorEnergyOutput(final Context context, final Arguments args) {
+            final IReactor reactor = getReactor();
+            if (reactor != null) {
+                return new Object[]{reactor.getReactorEnergyOutput()};
+            } else {
+                return new Object[]{0};
+            }
+        }
+
+        @Callback(doc = "function():number -- Get the reactor's base EU/t value.")
+        public Object[] getReactorEUOutput(final Context context, final Arguments args) {
+            return new Object[]{getReactor().getReactorEUEnergyOutput()};
+        }
+
+        @Callback(doc = "function():boolean -- Get whether the reactor is active and supposed to produce energy.")
+        public Object[] producesEnergy(final Context context, final Arguments args) {
+            final IReactor reactor = getReactor();
+            if (reactor != null) {
+                return new Object[]{reactor.produceEnergy()};
+            } else {
+                return new Object[]{false};
+            }
+        }
+    }
+}

src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala

@@ -27,6 +27,7 @@ object ModIndustrialCraft2 extends ModProxy {
     Driver.add(new DriverMassFab)
     Driver.add(new DriverReactor)
     Driver.add(new DriverReactorChamber)
+    Driver.add(new DriverReactorRedstonePort)
 
     Driver.add(new ConverterElectricItem)
   }