From f19e42cf93cc107e1f5c764987b876805b81b407 Mon Sep 17 00:00:00 2001 From: Voxelstice Date: Tue, 4 Oct 2022 18:35:05 +0300 Subject: [PATCH] h --- .../machine/rbmk/TileEntityRBMKControlManual.java | 12 ++++++++++++ .../machine/rbmk/TileEntityRBMKRodReaSim.java | 9 --------- .../machine/storage/TileEntityMachineFENSU.java | 6 ------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java index 13c13830a..f261885ba 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java @@ -8,6 +8,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import cpw.mods.fml.common.Optional; +import li.cil.oc.api.machine.Arguments; +import li.cil.oc.api.machine.Callback; +import li.cil.oc.api.machine.Context; +import li.cil.oc.api.network.SimpleComponent; + public class TileEntityRBMKControlManual extends TileEntityRBMKControl implements IControlReceiver { public RBMKColor color; @@ -121,4 +127,10 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement return data; } + + @Callback + @Optional.Method(modid = "OpenComputers") + public Object[] getColor(Context context, Arguments args) { + return new Object[] {this.color}; + } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRodReaSim.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRodReaSim.java index 9ba5e8b0a..e8e284a07 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRodReaSim.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRodReaSim.java @@ -57,13 +57,4 @@ public class TileEntityRBMKRodReaSim extends TileEntityRBMKRod { public ColumnType getConsoleType() { return ColumnType.FUEL_SIM; } - - // do some opencomputer stuff - @Override - public String getComponentName() { - if (isModerated() == true) { - return "rbmk_moderated_fuel_rod_reasim"; - } - return "rbmk_fuel_rod_reasim"; - } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java index b65e9ed39..541e4c9ad 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java @@ -131,10 +131,4 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery { { return 65536.0D; } - - // override the name because when connecting the machine to opencomputers it's gonna say "ntm_energy_storage" - @Override - public String getComponentName() { - return "ntm_fensu"; - } }