From 3ebd225c6adbf9adda2b8ba9bc163e12725d4bd2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 16 Sep 2019 10:34:10 +0200 Subject: [PATCH] Updated OpenComputers LUA to be direct calls, same as ComputerCraft --- .../block/TileEntityAbstractEnergyBase.java | 4 ++-- .../TileEntityAbstractEnergyConsumer.java | 2 +- .../block/TileEntityAbstractInterfaced.java | 10 ++++----- .../block/TileEntityAbstractLaser.java | 6 ++--- .../block/TileEntityAbstractMachine.java | 6 ++--- .../block/TileEntityChunkLoader.java | 4 ++-- .../cr0s/warpdrive/block/TileEntityLaser.java | 6 ++--- .../block/TileEntitySecurityStation.java | 2 +- .../TileEntityAcceleratorControlPoint.java | 4 ++-- .../atomic/TileEntityAcceleratorCore.java | 16 +++++++------- .../block/building/TileEntityShipScanner.java | 8 +++---- .../collection/TileEntityLaserTreeFarm.java | 10 ++++----- .../collection/TileEntityMiningLaser.java | 8 +++---- .../block/detection/TileEntityCamera.java | 2 +- .../block/detection/TileEntityMonitor.java | 2 +- .../block/detection/TileEntityRadar.java | 14 ++++++------ .../TileEntityEnanReactorController.java | 10 ++++----- .../energy/TileEntityEnanReactorLaser.java | 4 ++-- .../TileEntityAbstractForceField.java | 2 +- .../TileEntityForceFieldProjector.java | 10 ++++----- .../TileEntityAbstractShipController.java | 22 +++++++++---------- .../block/movement/TileEntityLift.java | 4 ++-- .../movement/TileEntityTransporterBeacon.java | 2 +- .../movement/TileEntityTransporterCore.java | 14 ++++++------ .../block/weapon/TileEntityLaserCamera.java | 2 +- 25 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyBase.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyBase.java index 7417aa31..7f1de966 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyBase.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyBase.java @@ -97,13 +97,13 @@ public abstract class TileEntityAbstractEnergyBase extends TileEntityAbstractMac public abstract Object[] getEnergyStatus(); // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] energyDisplayUnits(final Context context, final Arguments arguments) { return energyDisplayUnits(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getEnergyStatus(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyConsumer.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyConsumer.java index 7a5d735d..9561d879 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyConsumer.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergyConsumer.java @@ -33,7 +33,7 @@ public abstract class TileEntityAbstractEnergyConsumer extends TileEntityAbstrac public abstract Object[] getEnergyRequired(); // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getEnergyRequired(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java index 869ff06e..9d8ff12f 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java @@ -647,35 +647,35 @@ public abstract class TileEntityAbstractInterfaced extends TileEntityAbstractBas } // OpenComputers methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] isInterfaced(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return isInterfaced(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getLocalPosition(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getLocalPosition(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getUpgrades(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getUpgrades(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getTier(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getTier(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getVersion(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractLaser.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractLaser.java index 66af4703..a484c4c9 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractLaser.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractLaser.java @@ -227,21 +227,21 @@ public abstract class TileEntityAbstractLaser extends TileEntityAbstractEnergyBa } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getEnergyRequired(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getEnergyRequired(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] laserMediumDirection(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return laserMediumDirection(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] laserMediumCount(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractMachine.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractMachine.java index e706ad33..9e98d8c5 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractMachine.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractMachine.java @@ -264,19 +264,19 @@ public abstract class TileEntityAbstractMachine extends TileEntityAbstractInterf } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] name(final Context context, final Arguments arguments) { return name(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] enable(final Context context, final Arguments arguments) { return enable(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getAssemblyStatus(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java b/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java index 543e0be1..c1b9ae25 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java @@ -201,13 +201,13 @@ public class TileEntityChunkLoader extends TileEntityAbstractChunkLoading { } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] bounds(final Context context, final Arguments arguments) { return bounds(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] radius(final Context context, final Arguments arguments) { return radius(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityLaser.java b/src/main/java/cr0s/warpdrive/block/TileEntityLaser.java index 619f6e44..5f9869df 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityLaser.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityLaser.java @@ -749,19 +749,19 @@ public class TileEntityLaser extends TileEntityAbstractLaser implements IBeamFre } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] emitBeam(final Context context, final Arguments arguments) { return emitBeam(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] beamFrequency(final Context context, final Arguments arguments) { return beamFrequency(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getScanResult(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/TileEntitySecurityStation.java b/src/main/java/cr0s/warpdrive/block/TileEntitySecurityStation.java index 96e83c63..e95ab048 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntitySecurityStation.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntitySecurityStation.java @@ -146,7 +146,7 @@ public class TileEntitySecurityStation extends TileEntityAbstractMachine impleme } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getAttachedPlayers(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorControlPoint.java b/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorControlPoint.java index 995ecf67..22cbae1e 100644 --- a/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorControlPoint.java +++ b/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorControlPoint.java @@ -154,13 +154,13 @@ public class TileEntityAcceleratorControlPoint extends TileEntityAbstractMachine } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] controlChannel(final Context context, final Arguments arguments) { return controlChannel(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorCore.java b/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorCore.java index 5ffbb3ab..457da0e0 100644 --- a/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorCore.java +++ b/src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorCore.java @@ -872,53 +872,53 @@ public class TileEntityAcceleratorCore extends TileEntityAbstractEnergyCoreOrCon } // OpenComputer callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getControlPoints(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getControlPoints(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getControlPointsCount(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getControlPointsCount(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] injectionPeriod(final Context context, final Arguments arguments) { return injectionPeriod(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getParameters(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getParameters(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getParametersControlChannels(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getParametersControlChannels(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] parameter(final Context context, final Arguments arguments) { return parameter(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] getControlPoint(final Context context, final Arguments arguments) { return getControlPoint(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java b/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java index cf33d4c0..fde16b5f 100644 --- a/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java +++ b/src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java @@ -670,27 +670,27 @@ public class TileEntityShipScanner extends TileEntityAbstractMachine implements } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] scan(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return scan(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] filename(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return filename(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] deploy(final Context context, final Arguments arguments) { return deploy(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java b/src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java index 1ec62e2b..131d3a7d 100644 --- a/src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java +++ b/src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java @@ -924,32 +924,32 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner { } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return state(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] radius(final Context context, final Arguments arguments) { return radius(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] breakLeaves(final Context context, final Arguments arguments) { return breakLeaves(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] silktouch(final Context context, final Arguments arguments) { return silktouch(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] tapTrees(final Context context, final Arguments arguments) { return tapTrees(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java b/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java index 0408a61e..cb3a5a42 100644 --- a/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java +++ b/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java @@ -494,26 +494,26 @@ public class TileEntityMiningLaser extends TileEntityAbstractMiner { } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return state(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] offset(final Context context, final Arguments arguments) { return offset(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] onlyOres(final Context context, final Arguments arguments) { return onlyOres(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] silktouch(final Context context, final Arguments arguments) { return silktouch(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/detection/TileEntityCamera.java b/src/main/java/cr0s/warpdrive/block/detection/TileEntityCamera.java index a0501bfd..7acea018 100644 --- a/src/main/java/cr0s/warpdrive/block/detection/TileEntityCamera.java +++ b/src/main/java/cr0s/warpdrive/block/detection/TileEntityCamera.java @@ -143,7 +143,7 @@ public class TileEntityCamera extends TileEntityAbstractMachine implements IVide } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] videoChannel(final Context context, final Arguments arguments) { return videoChannel(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/detection/TileEntityMonitor.java b/src/main/java/cr0s/warpdrive/block/detection/TileEntityMonitor.java index 7adf2f92..a2241ef4 100644 --- a/src/main/java/cr0s/warpdrive/block/detection/TileEntityMonitor.java +++ b/src/main/java/cr0s/warpdrive/block/detection/TileEntityMonitor.java @@ -104,7 +104,7 @@ public class TileEntityMonitor extends TileEntityAbstractMachine implements IVid } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] videoChannel(final Context context, final Arguments arguments) { return videoChannel(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/detection/TileEntityRadar.java b/src/main/java/cr0s/warpdrive/block/detection/TileEntityRadar.java index de297c6f..ac741b83 100644 --- a/src/main/java/cr0s/warpdrive/block/detection/TileEntityRadar.java +++ b/src/main/java/cr0s/warpdrive/block/detection/TileEntityRadar.java @@ -256,48 +256,48 @@ public class TileEntityRadar extends TileEntityAbstractEnergyConsumer { } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getGlobalPosition(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getGlobalPosition(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] radius(final Context context, final Arguments arguments) { return radius(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getScanDuration(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getScanDuration(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] start(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return start(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getResults(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getResults(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getResultsCount(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getResultsCount(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getResult(final Context context, final Arguments arguments) { return getResult(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorController.java b/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorController.java index d34a5703..99ee33b6 100644 --- a/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorController.java +++ b/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorController.java @@ -141,32 +141,32 @@ public class TileEntityEnanReactorController extends TileEntityAbstractEnergyCor } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getInstabilities(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getInstabilities(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] instabilityTarget(final Context context, final Arguments arguments) { return instabilityTarget(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] outputMode(final Context context, final Arguments arguments) { return outputMode(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] stabilizerEnergy(final Context context, final Arguments arguments) { return stabilizerEnergy(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorLaser.java b/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorLaser.java index 6366e812..8e2a2a1f 100644 --- a/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorLaser.java +++ b/src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorLaser.java @@ -309,13 +309,13 @@ public class TileEntityEnanReactorLaser extends TileEntityAbstractLaser implemen } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] stabilize(final Context context, final Arguments arguments) { return stabilize(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] side(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityAbstractForceField.java b/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityAbstractForceField.java index 52ccfad0..5212e388 100644 --- a/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityAbstractForceField.java +++ b/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityAbstractForceField.java @@ -156,7 +156,7 @@ public abstract class TileEntityAbstractForceField extends TileEntityAbstractEne } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] beamFrequency(final Context context, final Arguments arguments) { return beamFrequency(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java b/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java index 4f99a86f..664e77d8 100644 --- a/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java +++ b/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java @@ -1215,32 +1215,32 @@ public class TileEntityForceFieldProjector extends TileEntityAbstractForceField } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return state(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] min(final Context context, final Arguments arguments) { return min(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] max(final Context context, final Arguments arguments) { return max(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] rotation(final Context context, final Arguments arguments) { return rotation(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] translation(final Context context, final Arguments arguments) { return translation(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/movement/TileEntityAbstractShipController.java b/src/main/java/cr0s/warpdrive/block/movement/TileEntityAbstractShipController.java index 48b66aae..bbbd99af 100644 --- a/src/main/java/cr0s/warpdrive/block/movement/TileEntityAbstractShipController.java +++ b/src/main/java/cr0s/warpdrive/block/movement/TileEntityAbstractShipController.java @@ -373,72 +373,72 @@ public abstract class TileEntityAbstractShipController extends TileEntityAbstrac } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getOrientation(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getOrientation(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] isInSpace(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return isInSpace(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] isInHyperspace(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return isInHyperspace(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] dim_positive(final Context context, final Arguments arguments) { return dim_positive(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] dim_negative(final Context context, final Arguments arguments) { return dim_negative(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] command(final Context context, final Arguments arguments) { return command(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getShipSize(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getShipSize(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getMaxJumpDistance(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getMaxJumpDistance(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] movement(final Context context, final Arguments arguments) { return movement(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] rotationSteps(final Context context, final Arguments arguments) { return rotationSteps(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] targetName(final Context context, final Arguments arguments) { return targetName(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/movement/TileEntityLift.java b/src/main/java/cr0s/warpdrive/block/movement/TileEntityLift.java index f78f27c2..4331fba0 100644 --- a/src/main/java/cr0s/warpdrive/block/movement/TileEntityLift.java +++ b/src/main/java/cr0s/warpdrive/block/movement/TileEntityLift.java @@ -255,7 +255,7 @@ public class TileEntityLift extends TileEntityAbstractEnergyConsumer implements } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] mode(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); @@ -266,7 +266,7 @@ public class TileEntityLift extends TileEntityAbstractEnergyConsumer implements ); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); diff --git a/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterBeacon.java b/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterBeacon.java index 8c35b3f1..7ee24187 100644 --- a/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterBeacon.java +++ b/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterBeacon.java @@ -173,7 +173,7 @@ public class TileEntityTransporterBeacon extends TileEntityAbstractEnergyConsume } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] isActive(final Context context, final Arguments arguments) { return isActive(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterCore.java b/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterCore.java index 411baf66..aa3cad4d 100644 --- a/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterCore.java +++ b/src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterCore.java @@ -1773,45 +1773,45 @@ public class TileEntityTransporterCore extends TileEntityAbstractEnergyCoreOrCon } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] beamFrequency(final Context context, final Arguments arguments) { return beamFrequency(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] state(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return state(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] remoteLocation(final Context context, final Arguments arguments) { return remoteLocation(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] lock(final Context context, final Arguments arguments) { return lock(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] energyFactor(final Context context, final Arguments arguments) { return energyFactor(OC_convertArgumentsAndLogCall(context, arguments)); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] getLockStrength(final Context context, final Arguments arguments) { OC_convertArgumentsAndLogCall(context, arguments); return getLockStrength(); } - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] energize(final Context context, final Arguments arguments) { return energize(OC_convertArgumentsAndLogCall(context, arguments)); diff --git a/src/main/java/cr0s/warpdrive/block/weapon/TileEntityLaserCamera.java b/src/main/java/cr0s/warpdrive/block/weapon/TileEntityLaserCamera.java index c50b31ad..e4e3b668 100644 --- a/src/main/java/cr0s/warpdrive/block/weapon/TileEntityLaserCamera.java +++ b/src/main/java/cr0s/warpdrive/block/weapon/TileEntityLaserCamera.java @@ -133,7 +133,7 @@ public class TileEntityLaserCamera extends TileEntityLaser implements IVideoChan } // OpenComputers callback methods - @Callback + @Callback(direct = true) @Optional.Method(modid = "opencomputers") public Object[] videoChannel(final Context context, final Arguments arguments) { return videoChannel(OC_convertArgumentsAndLogCall(context, arguments));