From 9d23c8a057a4cb84d5d83c4cc49a88647194b987 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Tue, 28 Mar 2023 09:20:57 -0500 Subject: [PATCH 1/2] Update TileEntityRBMKRod.java --- .../tileentity/machine/rbmk/TileEntityRBMKRod.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java index c9b3f22e8..7f8e7e5a4 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -411,6 +411,15 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM } return new Object[] {"N/A"}; } + + @Callback + @Optional.Method(modid = "OpenComputers") + public Object[] getFuelType(Context context, Arguments args) { + if(slots[0] != null && slots[0].getItem() instanceof ItemRBMKRod) { + return new Object[] {slots[0].getItem()}; + } + return new Object[] {"N/A"}; + } @Callback @Optional.Method(modid = "OpenComputers") @@ -444,14 +453,17 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM public Object[] getInfo(Context context, Arguments args) { Object OC_enrich_buf; Object OC_poison_buf; + Object OC_fuelType; if(slots[0] != null && slots[0].getItem() instanceof ItemRBMKRod) { OC_enrich_buf = ItemRBMKRod.getEnrichment(slots[0]); OC_poison_buf = ItemRBMKRod.getPoison(slots[0]); + OC_fuelType = slots[0].getItem(); } else { OC_enrich_buf = "N/A"; OC_poison_buf = "N/A"; + OC_fuelType = "N/A"; } - return new Object[] {heat, fluxSlow, fluxFast, OC_enrich_buf, OC_poison_buf}; + return new Object[] {heat, fluxSlow, fluxFast, OC_enrich_buf, OC_poison_buf, OC_fuelType}; } @Override From 9b449899fbc420a93451fb6f984f7dec05523413 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Thu, 30 Mar 2023 09:40:16 -0500 Subject: [PATCH 2/2] testing rod names --- .../com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java index 7f8e7e5a4..1a3562334 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -416,7 +416,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM @Optional.Method(modid = "OpenComputers") public Object[] getFuelType(Context context, Arguments args) { if(slots[0] != null && slots[0].getItem() instanceof ItemRBMKRod) { - return new Object[] {slots[0].getItem()}; + return new Object[] {rod.getName()}; } return new Object[] {"N/A"}; } @@ -457,7 +457,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM if(slots[0] != null && slots[0].getItem() instanceof ItemRBMKRod) { OC_enrich_buf = ItemRBMKRod.getEnrichment(slots[0]); OC_poison_buf = ItemRBMKRod.getPoison(slots[0]); - OC_fuelType = slots[0].getItem(); + OC_fuelType = rod.getName(); } else { OC_enrich_buf = "N/A"; OC_poison_buf = "N/A";