From c86e52f5c026f6d2609b2f7c0dc6a77177d4082c Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Tue, 28 Nov 2023 21:28:54 -0600 Subject: [PATCH] pretty important fix where crane consoles would move 4x faster than possible --- src/main/java/com/hbm/handler/CompatHandler.java | 5 ++++- .../machine/rbmk/TileEntityCraneConsole.java | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hbm/handler/CompatHandler.java b/src/main/java/com/hbm/handler/CompatHandler.java index 07d7fd20a..a8fec64c9 100644 --- a/src/main/java/com/hbm/handler/CompatHandler.java +++ b/src/main/java/com/hbm/handler/CompatHandler.java @@ -10,12 +10,14 @@ import com.hbm.inventory.fluid.Fluids; * Mostly just functions used across many TEs. */ public class CompatHandler { + public static Object[] steamTypeToInt(FluidType type) { - if(type == Fluids.STEAM) {return new Object[] {0};} + if(type == Fluids.STEAM) {return new Object[] {0};} //switches break because objects else if(type == Fluids.HOTSTEAM) {return new Object[] {1};} else if(type == Fluids.SUPERHOTSTEAM) {return new Object[] {2};} return new Object[] {3}; } + public static FluidType intToSteamType(int arg) { switch(arg) { default: @@ -28,4 +30,5 @@ public class CompatHandler { return Fluids.ULTRAHOTSTEAM; } } + } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java index 75097cd48..9f85dfc9e 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java @@ -339,12 +339,13 @@ public class TileEntityCraneConsole extends TileEntity implements INBTPacketRece return "rbmk_crane"; } - @Callback(direct = true, limit = 4) + @Callback(direct = true, limit = 2) //yknow computers are more efficient than humans, lets give an incentive to use OC @Optional.Method(modid = "OpenComputers") public Object[] move(Context context, Arguments args) { if(setUpCrane) { - String textbruh = args.checkString(0); - switch(textbruh) { + String direction = args.checkString(0); + + switch(direction) { case "up": tiltFront = 30; if(!worldObj.isRemote) posFront += speed; @@ -368,7 +369,7 @@ public class TileEntityCraneConsole extends TileEntity implements INBTPacketRece return new Object[] {"Crane not found"}; } - @Callback(direct = true, limit = 4) + @Callback @Optional.Method(modid = "OpenComputers") public Object[] load(Context context, Arguments args) { if (setUpCrane) { @@ -395,4 +396,9 @@ public class TileEntityCraneConsole extends TileEntity implements INBTPacketRece } return new Object[] {"N/A"}; } + @Callback(direct = true) + @Optional.Method(modid = "OpenComputers") + public Object[] getCoords(Context context, Arguments args) { + return new Object[] {xCoord, yCoord, zCoord}; + } }