tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added isTrainEnroute to station peripheral API

Browse source 
- isTrainEnroute checks if a train is currently navigating to the station
- Reworded null station exception to "station is not connected to a track"
- Refactored StationPeripheral#inAssemblyMode to StationPeripheral#isInAssemblyMode
- Added a check to StationPeripheral#disassemble to make sure the station isn't in assembly mode
This commit is contained in:
caelwarner 2023-03-13 16:29:05 -07:00
parent fac1ebcd3f
commit 7f3ca1cfa0
No known key found for this signature in database
GPG key ID: 514BEF5EADE889FF
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/com/simibubi/create/compat/computercraft/peripherals/StationPeripheral.java
View file

@ -52,7 +52,10 @@ public class StationPeripheral extends SyncedPeripheral<StationTileEntity> {
@LuaFunction(mainThread = true)
public final void disassemble() throws LuaException {
Train train = getTrainOrThrow();
if (tile.isAssembling())
throw new LuaException("station must not be in assembly mode");
getTrainOrThrow();
if (!tile.enterAssemblyMode(null))
throw new LuaException("could not disassemble train");
@ -70,7 +73,7 @@ public class StationPeripheral extends SyncedPeripheral<StationTileEntity> {
}
@LuaFunction
public final boolean inAssemblyMode() {
public final boolean isInAssemblyMode() {
return tile.isAssembling();
}
@ -78,7 +81,7 @@ public class StationPeripheral extends SyncedPeripheral<StationTileEntity> {
public final String getStationName() throws LuaException {
GlobalStation station = tile.getStation();
if (station == null)
throw new LuaException("train station does not exist");
throw new LuaException("station is not connected to a track");
return station.name;
}
@ -93,7 +96,7 @@ public class StationPeripheral extends SyncedPeripheral<StationTileEntity> {
public final boolean isTrainPresent() throws LuaException {
GlobalStation station = tile.getStation();
if (station == null)
throw new LuaException("train station does not exist");
throw new LuaException("station is not connected to a track");
return station.getPresentTrain() != null;
}
@ -102,11 +105,20 @@ public class StationPeripheral extends SyncedPeripheral<StationTileEntity> {
public final boolean isTrainImminent() throws LuaException {
GlobalStation station = tile.getStation();
if (station == null)
throw new LuaException("train station does not exist");
throw new LuaException("station is not connected to a track");
return station.getImminentTrain() != null;
}
@LuaFunction
public final boolean isTrainEnroute() throws LuaException {
GlobalStation station = tile.getStation();
if (station == null)
throw new LuaException("station is not connected to a track");
return station.getNearestTrain() != null;
}
@LuaFunction
public final String getTrainName() throws LuaException {
Train train = getTrainOrThrow();
@ -148,7 +160,7 @@ public class StationPeripheral extends SyncedPeripheral<StationTileEntity> {
private @NotNull Train getTrainOrThrow() throws LuaException {
GlobalStation station = tile.getStation();
if (station == null)
throw new LuaException("train station does not exist");
throw new LuaException("station is not connected to a track");
Train train = station.getPresentTrain();
if (train == null)