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

ok this one is a pretty big bug; restructured some radar compat.

Browse Source
This commit is contained in:
BallOfEnergy 2024-06-27 22:41:47 -05:00
parent 0a5c4271f4
commit 6c141e3841
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java
View File

@ -650,27 +650,35 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I
@Callback(direct = true) @Callback(direct = true)
@Optional.Method(modid = "OpenComputers") @Optional.Method(modid = "OpenComputers")
public Object[] isIndexPlayer(Context context, Arguments args) { public Object[] isIndexPlayer(Context context, Arguments args) {
int index = args.checkInteger(0); int index = args.checkInteger(0) - 1;
RadarEntry e = entries.get(0); if(index > entries.size() || index < 0) {
return new Object[] {null, "No entity exists at that index."};
}
RadarEntry e = entries.get(index);
return new Object[] {e.blipLevel == IRadarDetectableNT.PLAYER}; return new Object[] {e.blipLevel == IRadarDetectableNT.PLAYER};
} }
@Callback(direct = true) @Callback(direct = true)
@Optional.Method(modid = "OpenComputers") @Optional.Method(modid = "OpenComputers")
public Object[] getIndexType(Context context, Arguments args) { public Object[] getIndexType(Context context, Arguments args) {
int index = args.checkInteger(0); int index = args.checkInteger(0) - 1;
RadarEntry e = entries.get(0); if(index > entries.size() || index < 0) {
return new Object[] {null, "No entity exists at that index."};
}
RadarEntry e = entries.get(index);
return new Object[] {e.blipLevel}; return new Object[] {e.blipLevel};
} }
@Callback(direct = true) @Callback(direct = true)
@Optional.Method(modid = "OpenComputers") @Optional.Method(modid = "OpenComputers")
public Object[] getEntityAtIndex(Context context, Arguments args) { public Object[] getEntityAtIndex(Context context, Arguments args) {
int index = args.checkInteger(0); int index = args.checkInteger(0) - 1;
RadarEntry e = entries.get(0); if(index > entries.size() || index < 0) {
boolean isPlayer = (boolean)this.isIndexPlayer(context, args)[0]; return new Object[] {null, "No entity exists at that index."};
int type = (int)this.getIndexType(context, args)[0]; }
if(isPlayer) { RadarEntry e = entries.get(index);
int type = e.blipLevel;
if(e.blipLevel == IRadarDetectableNT.PLAYER) {
return new Object[]{true, e.posX, e.posY, e.posZ, type, e.unlocalizedName}; return new Object[]{true, e.posX, e.posY, e.posZ, type, e.unlocalizedName};
} }
return new Object[]{false, e.posX, e.posY, e.posZ, type}; return new Object[]{false, e.posX, e.posY, e.posZ, type};