xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #760 from Voxelstice/more-oc-stuff

Browse Source 
More opencomputer stuff
This commit is contained in:
HbmMods 2022-10-04 19:33:55 +02:00 committed by GitHub
commit a94cd9b7fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java
View File

@ -8,6 +8,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Vec3; 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 class TileEntityRBMKControlManual extends TileEntityRBMKControl implements IControlReceiver {
public RBMKColor color; public RBMKColor color;
@ -121,4 +127,10 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement
return data; return data;
} }
@Callback
@Optional.Method(modid = "OpenComputers")
public Object[] getColor(Context context, Arguments args) {
return new Object[] {this.color};
}
} }

9
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRodReaSim.java
View File

@ -57,13 +57,4 @@ public class TileEntityRBMKRodReaSim extends TileEntityRBMKRod {
public ColumnType getConsoleType() { public ColumnType getConsoleType() {
return ColumnType.FUEL_SIM; 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";
}
} }

6
src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java
View File

@ -131,10 +131,4 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery {
{ {
return 65536.0D; 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";
}
} }