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

Little bit of cleanup.

Browse Source
This commit is contained in:
Florian Nücke 2014-09-10 23:40:50 +02:00
parent e0ea7e9fab
commit 3e508b4844
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -66,7 +66,7 @@ dependencies {
provided "com.mod-buildcraft:buildcraft:${config.bc.version}:dev" provided "com.mod-buildcraft:buildcraft:${config.bc.version}:dev"
provided "li.cil.oc:OpenComputers:MC${config.minecraft.version}-${config.oc.version}:api" provided "li.cil.oc:OpenComputers:MC${config.minecraft.version}-${config.oc.version}:api"
provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:api" provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:api"
provided "com.gregoriust.gregtech:gregtech_${config.minecraft.version}:${config.gt.version}:dev" provided "com.gregoriust.gregtech:gregtech_${config.minecraft.version}:${config.gt.version}:dev"
} }
sourceSets.main.compileClasspath += configurations.provided sourceSets.main.compileClasspath += configurations.provided

2
src/main/java/li/cil/occ/OpenComponents.java
View File

@ -76,8 +76,8 @@ public class OpenComponents {
Registry.add(new ModCoFHEnergy()); Registry.add(new ModCoFHEnergy());
Registry.add(new ModCoFHTileEntity()); Registry.add(new ModCoFHTileEntity());
Registry.add(new ModCoFHTransport()); Registry.add(new ModCoFHTransport());
Registry.add(new ModGregtech());
Registry.add(new ModForestry()); Registry.add(new ModForestry());
Registry.add(new ModGregtech());
Registry.add(new ModIndustrialCraft2()); Registry.add(new ModIndustrialCraft2());
Registry.add(new ModMystcraft()); Registry.add(new ModMystcraft());
Registry.add(new ModRailcraft()); Registry.add(new ModRailcraft());

5
src/main/java/li/cil/occ/mods/gregtech/DriverEnergyContainer.java
View File

@ -41,13 +41,11 @@ public final class DriverEnergyContainer extends DriverTileEntity {
return new Object[]{tileEntity.getSteamCapacity()}; return new Object[]{tileEntity.getSteamCapacity()};
} }
@Callback(doc = "function():number -- Returns the amount of Steam contained in this Block, in EU units!") @Callback(doc = "function():number -- Returns the amount of Steam contained in this Block, in EU units!")
public Object[] getStoredSteam(final Context context, final Arguments args) { public Object[] getStoredSteam(final Context context, final Arguments args) {
return new Object[]{tileEntity.getStoredSteam()}; return new Object[]{tileEntity.getStoredSteam()};
} }
@Callback(doc = "function():number -- Gets the Output in EU/p.") @Callback(doc = "function():number -- Gets the Output in EU/p.")
public Object[] getOutputVoltage(final Context context, final Arguments args) { public Object[] getOutputVoltage(final Context context, final Arguments args) {
return new Object[]{tileEntity.getOutputVoltage()}; return new Object[]{tileEntity.getOutputVoltage()};
@ -58,7 +56,6 @@ public final class DriverEnergyContainer extends DriverTileEntity {
return new Object[]{tileEntity.getOutputAmperage()}; return new Object[]{tileEntity.getOutputAmperage()};
} }
@Callback(doc = "function():number -- Gets the maximum Input in EU/p.") @Callback(doc = "function():number -- Gets the maximum Input in EU/p.")
public Object[] getInputVoltage(final Context context, final Arguments args) { public Object[] getInputVoltage(final Context context, final Arguments args) {
return new Object[]{tileEntity.getInputVoltage()}; return new Object[]{tileEntity.getInputVoltage()};
@ -69,11 +66,9 @@ public final class DriverEnergyContainer extends DriverTileEntity {
return new Object[]{tileEntity.getAverageElectricInput()}; return new Object[]{tileEntity.getAverageElectricInput()};
} }
@Callback(doc = "function():number -- Returns the amount of Electricity, outputted by this Block the last 5 ticks as Average.") @Callback(doc = "function():number -- Returns the amount of Electricity, outputted by this Block the last 5 ticks as Average.")
public Object[] getAverageElectricOutput(final Context context, final Arguments args) { public Object[] getAverageElectricOutput(final Context context, final Arguments args) {
return new Object[]{tileEntity.getAverageElectricOutput()}; return new Object[]{tileEntity.getAverageElectricOutput()};
} }
} }
} }

2
src/main/java/li/cil/occ/mods/gregtech/ModGregtech.java
View File

@ -3,7 +3,7 @@ package li.cil.occ.mods.gregtech;
import li.cil.oc.api.Driver; import li.cil.oc.api.Driver;
import li.cil.occ.mods.IMod; import li.cil.occ.mods.IMod;
public class ModGregtech implements IMod { public final class ModGregtech implements IMod {
public static final String MOD_ID = "gregtech"; public static final String MOD_ID = "gregtech";
@Override @Override

4
src/main/java/li/cil/occ/mods/ic2/DriverReactor.java
View File

@ -47,6 +47,10 @@ public final class DriverReactor extends DriverTileEntity implements NamedBlock
return new Object[]{tileEntity.getReactorEnergyOutput()}; return new Object[]{tileEntity.getReactorEnergyOutput()};
} }
@Callback(doc = "Get the reactor's base EU/t value.")
public Object[] getReactorEUOutput(final Context context, final Arguments args) {
return new Object[]{tileEntity.getReactorEUEnergyOutput()};
}
@Callback(doc = "Get whether the reactor is active and supposed to produce energy.") @Callback(doc = "Get whether the reactor is active and supposed to produce energy.")
public Object[] producesEnergy(final Context context, final Arguments args) { public Object[] producesEnergy(final Context context, final Arguments args) {