From 9830e85293ed2f571777dce426ebbfc16a1ecbfc Mon Sep 17 00:00:00 2001 From: DaSH Date: Fri, 1 May 2026 21:55:44 +0200 Subject: [PATCH 1/3] RBMK Crane get fuel info --- .../machine/rbmk/TileEntityCraneConsole.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) 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 56baaa762..b9bbf3e4a 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java @@ -437,20 +437,18 @@ public class TileEntityCraneConsole extends TileEntityLoadedBase implements Simp @Callback(direct = true) @Optional.Method(modid = "OpenComputers") - public Object[] getDepletion(Context context, Arguments args) { + public Object[] getFuelInfo(Context context, Arguments args) { + java.util.LinkedHashMap map = new java.util.LinkedHashMap<>(); if(loadedItem != null && loadedItem.getItem() instanceof ItemRBMKRod) { - return new Object[] {ItemRBMKRod.getEnrichment(loadedItem)}; + map.put("coreSkinTemp", ItemRBMKRod.getHullHeat(loadedItem)); + map.put("coreTemp", ItemRBMKRod.getCoreHeat(loadedItem)); + map.put("enrichment", ItemRBMKRod.getEnrichment(loadedItem)); + map.put("xenon", ItemRBMKRod.getPoisonLevel(loadedItem)); + map.put("rodName", loadedItem.getItem().getUnlocalizedName()); + } else { + return new Object[] {false, "No fuel loaded"}; } - return new Object[] {"N/A"}; - } - - @Callback(direct = true) - @Optional.Method(modid = "OpenComputers") - public Object[] getXenonPoison(Context context, Arguments args) { - if(loadedItem != null && loadedItem.getItem() instanceof ItemRBMKRod) { - return new Object[] {ItemRBMKRod.getPoison(loadedItem)}; - } - return new Object[] {"N/A"}; + return new Object[] {map}; } @Callback(direct = true) From 8837cb51f4786a0bbc004f77e6d7e04009886541 Mon Sep 17 00:00:00 2001 From: DaSH Date: Fri, 1 May 2026 22:46:03 +0200 Subject: [PATCH 2/3] minor change --- .../hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b9bbf3e4a..f5ac75bc2 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java @@ -437,7 +437,7 @@ public class TileEntityCraneConsole extends TileEntityLoadedBase implements Simp @Callback(direct = true) @Optional.Method(modid = "OpenComputers") - public Object[] getFuelInfo(Context context, Arguments args) { + public Object[] getRodInfo(Context context, Arguments args) { java.util.LinkedHashMap map = new java.util.LinkedHashMap<>(); if(loadedItem != null && loadedItem.getItem() instanceof ItemRBMKRod) { map.put("coreSkinTemp", ItemRBMKRod.getHullHeat(loadedItem)); @@ -446,7 +446,7 @@ public class TileEntityCraneConsole extends TileEntityLoadedBase implements Simp map.put("xenon", ItemRBMKRod.getPoisonLevel(loadedItem)); map.put("rodName", loadedItem.getItem().getUnlocalizedName()); } else { - return new Object[] {false, "No fuel loaded"}; + return new Object[] {false, "No rod loaded"}; } return new Object[] {map}; } From 48dd2a1e64b12c9d835ee9ac1f760125dc093304 Mon Sep 17 00:00:00 2001 From: DaSH Date: Fri, 1 May 2026 22:50:17 +0200 Subject: [PATCH 3/3] Shouldn't have removed the old methods as that may break other people's OC scripts --- .../machine/rbmk/TileEntityCraneConsole.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 f5ac75bc2..82459165e 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java @@ -451,6 +451,24 @@ public class TileEntityCraneConsole extends TileEntityLoadedBase implements Simp return new Object[] {map}; } + @Callback(direct = true) + @Optional.Method(modid = "OpenComputers") + public Object[] getDepletion(Context context, Arguments args) { + if(loadedItem != null && loadedItem.getItem() instanceof ItemRBMKRod) { + return new Object[] {ItemRBMKRod.getEnrichment(loadedItem)}; + } + return new Object[] {"N/A"}; + } + + @Callback(direct = true) + @Optional.Method(modid = "OpenComputers") + public Object[] getXenonPoison(Context context, Arguments args) { + if(loadedItem != null && loadedItem.getItem() instanceof ItemRBMKRod) { + return new Object[] {ItemRBMKRod.getPoison(loadedItem)}; + } + return new Object[] {"N/A"}; + } + @Callback(direct = true) @Optional.Method(modid = "OpenComputers") //if this doesnt work im going to die public Object[] getCranePos(Context context, Arguments args) {