From 087be46083d4193641417948f3babf2269883a37 Mon Sep 17 00:00:00 2001 From: Kirby7871 <123486466+Kirby7871@users.noreply.github.com> Date: Thu, 29 May 2025 02:01:39 +0200 Subject: [PATCH 1/5] Update TileEntityLaunchPadBase.java Added another OC (OpenComputers) function, getPos(). It returns the position of the launch pad. (x,y,z) --- .../hbm/tileentity/bomb/TileEntityLaunchPadBase.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java index 051e69092..623f78370 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java @@ -528,6 +528,12 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl return new Object[] {false}; } + @Callback(direct = true) + @Optional.Method(modid = "OpenComputers") + public Object[] getPos(Context context, Arguments args) { + return new Object[] {xCoord, yCoord, zCoord}; + } + @Override @Optional.Method(modid = "OpenComputers") public String[] methods() { @@ -536,7 +542,8 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl "getFluid", "canLaunch", "getTier", - "launch" + "launch", + "getPos" }; } @@ -554,6 +561,8 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl return getTier(context, args); case ("launch"): return launch(context, args); + case ("getPos"): + return getPos(context, args); } throw new NoSuchMethodException(); } From 65f1866e8c9d4324dc5c61564925691fdf5b27e9 Mon Sep 17 00:00:00 2001 From: Kirby7871 <123486466+Kirby7871@users.noreply.github.com> Date: Thu, 29 May 2025 02:06:40 +0200 Subject: [PATCH 2/5] Update TileEntityTurretBaseNT.java Added an OpenComputers function, getPos(). It returns the (x,y,z) coordinates of the turret in question --- .../hbm/tileentity/turret/TileEntityTurretBaseNT.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 18b960f67..8c7c15646 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -995,6 +995,12 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple return new Object[] {this.aligned}; } + @Callback(direct = true) + @Optional.Method(modid = "OpenComputers") + public Object[] getPos(Context context, Arguments args) { + return new Object[] {xCoord, yCoord, zCoord}; + } + @Override @Optional.Method(modid = "OpenComputers") public boolean canConnectNode(ForgeDirection side) { @@ -1016,6 +1022,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple "hasTarget", "getAngle", "isAligned" + "getPos" }; } @@ -1045,6 +1052,8 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple return getAngle(context, args); case "isAligned": return isAligned(context, args); + case "getPos": + return getPos(context, args); } throw new NoSuchMethodException(); } From 3a8e0048a3567e0543d4d67ed840e99210e334f8 Mon Sep 17 00:00:00 2001 From: Kirby7871 <123486466+Kirby7871@users.noreply.github.com> Date: Thu, 29 May 2025 02:12:39 +0200 Subject: [PATCH 3/5] Update TileEntityMachineRadarNT.java Added an OpenComputers function, getPos(). It retuns the position of this radar. --- .../hbm/tileentity/machine/TileEntityMachineRadarNT.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java index 5e4cae3c7..7006399c0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java @@ -694,6 +694,12 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I return new Object[]{false, e.posX, e.posY, e.posZ, type}; } + @Callback(direct = true) + @Optional.Method(modid = "OpenComputers") + public Object[] getPos(Context context, Arguments args) { + return new Object[] {xCoord, yCoord, zCoord}; + } + @Override @Optional.Method(modid = "OpenComputers") public String[] methods() { @@ -707,6 +713,7 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I "isIndexPlayer", "getIndexType", "getEntityAtIndex" + "getPos" }; } @@ -732,6 +739,8 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I return getIndexType(context, args); case ("getEntityAtIndex"): return getEntityAtIndex(context, args); + case("getPos"): + return getPos(context, args); } throw new NoSuchMethodException(); } From d01f54d1bac85c072293a8f21ca3c07f7e14d5cd Mon Sep 17 00:00:00 2001 From: Kirby7871 <123486466+Kirby7871@users.noreply.github.com> Date: Thu, 29 May 2025 02:36:36 +0200 Subject: [PATCH 4/5] Update TileEntityMachineRadarNT.java Fixed a comma typo --- .../com/hbm/tileentity/machine/TileEntityMachineRadarNT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java index 7006399c0..9e3c6e6fc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java @@ -712,7 +712,7 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I "getAmount", "isIndexPlayer", "getIndexType", - "getEntityAtIndex" + "getEntityAtIndex", "getPos" }; } From 4f975293a5ca51373887bfff9a42fe9c8b9dbd32 Mon Sep 17 00:00:00 2001 From: Kirby7871 <123486466+Kirby7871@users.noreply.github.com> Date: Thu, 29 May 2025 02:37:27 +0200 Subject: [PATCH 5/5] Update TileEntityTurretBaseNT.java Fixed Comma typo --- .../java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 8c7c15646..67455333e 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -1021,7 +1021,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple "getTargeting", "hasTarget", "getAngle", - "isAligned" + "isAligned", "getPos" }; }