Skip to content

Commit

Permalink
Minor changes to scripting
Browse files Browse the repository at this point in the history
  • Loading branch information
@zbx1425
zbx1425 committed Aug 26, 2023
1 parent 58e9b97 commit 7b103a7
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 40 deletions.
2 changes: 1 addition & 1 deletion common/src/main/java/cn/zbx1425/mtrsteamloco/data/ScriptedCustomTrains.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static void init(ResourceManager resourceManager) {
if (jsonObject.has("script_files")) {
final String newBaseTrainType = jsonObject.get("base_type").getAsString().toLowerCase(Locale.ROOT);
TrainSoundBase trainSound = useBveSound
? new BveTrainSoundFix(new BveTrainSoundConfig(resourceManager, bveSoundBaseId))
? new BveTrainSound(new BveTrainSoundConfig(resourceManager, bveSoundBaseId))
: new JonTrainSound(speedSoundBaseId, new JonTrainSound.JonTrainSoundConfig(doorSoundBaseId, speedSoundCount, doorCloseSoundTime, accelSoundAtCoast, constPlaybackSpeed));

ScriptHolder scriptContext = new ScriptHolder();
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/ScriptHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void load(Map<ResourceLocation, String> scripts) {
scope = new ImporterTopLevel(rhinoCtx);

scope.put("include", scope, new NativeJavaMethod(
ScriptResourceUtil.class.getMethod("includeScript", ResourceLocation.class), "includeScript"));
ScriptResourceUtil.class.getMethod("includeScript", Object.class), "includeScript"));

scope.put("ModelManager", scope, Context.toObject(MainClient.modelManager, scope));
scope.put("Resources", scope, new NativeJavaClass(scope, ScriptResourceUtil.class));
Expand Down
8 changes: 7 additions & 1 deletion common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/ScriptResourceUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,13 @@ public static String readString(ResourceLocation identifier) {
}
}

public static void includeScript(ResourceLocation identifier) throws IOException {
public static void includeScript(Object pathOrIdentifier) throws IOException {
ResourceLocation identifier;
if (pathOrIdentifier instanceof ResourceLocation) {
identifier = (ResourceLocation) pathOrIdentifier;
} else {
identifier = idRelative(pathOrIdentifier.toString());
}
scriptsToExecute.add(new AbstractMap.SimpleEntry<>(identifier, ResourceUtil.readResource(manager(), identifier)));
}

Expand Down
80 changes: 43 additions & 37 deletions common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/train/TrainExtra.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import mtr.client.ClientData;
import mtr.data.*;
import mtr.path.PathData;
import net.minecraft.core.BlockPos;

import java.util.*;

Expand All @@ -15,8 +16,8 @@ public class TrainExtra {
public Matrix4f[] lastWorldPose;

private final TrainClient train;
private StationIndexMap trainStations;
private List<PathData> mapValidForPath;
private PlatformLookupMap trainPlatforms;
private List<PathData> trainPlatformsValidPath;

public TrainExtra(TrainClient train) {
doorLeftOpen = new boolean[train.trainCars];
Expand All @@ -26,20 +27,20 @@ public TrainExtra(TrainClient train) {
}

public void reset() {
if (mapValidForPath == null || !mapValidForPath.equals(train.path)) {
if (trainPlatformsValidPath == null || !trainPlatformsValidPath.equals(train.path)) {
if (train.getRouteIds().size() > 0) {
trainStations = getTrainStations();
mapValidForPath = train.path;
trainPlatforms = getTrainPlatforms();
trainPlatformsValidPath = train.path;
} else {
trainStations = new StationIndexMap();
trainPlatforms = new PlatformLookupMap();
}
}
}

private StationIndexMap getTrainStations() {
private PlatformLookupMap getTrainPlatforms() {
List<Long> routeIds = train.getRouteIds();
DataCache dataCache = ClientData.DATA_CACHE;
StationIndexMap result = new StationIndexMap();
PlatformLookupMap result = new PlatformLookupMap();
if (routeIds.isEmpty()) return result;
int sum = 0;
int processingPathIndex = 0;
Expand All @@ -63,91 +64,96 @@ private StationIndexMap getTrainStations() {
}
int difference = train.path.get(processingPathIndex).stopIndex - 1 - routeBeginOffset;
Station thisStation = dataCache.platformIdToStation.get((thisRoute.platformIds.get(difference)).platformId);
Platform thisPlatform = dataCache.platformIdMap.get((thisRoute.platformIds.get(difference)).platformId);
String customDestination = thisRoute.getDestination(difference);
double distance = ((TrainAccessor)train).getDistances().get(processingPathIndex);
result.put(processingPathIndex, new StationInfo(thisRoute, thisStation, lastStation, customDestination != null ? customDestination : lastStation.name, distance));
result.put(processingPathIndex, new PlatformInfo(thisRoute, thisStation, thisPlatform, lastStation, customDestination != null ? customDestination : lastStation.name, distance));
processingPathIndex++;
}
}
}
return result;
}

public StationInfo getStationRelative(int offset, boolean allowDifferentRoute) {
public PlatformInfo getStationRelative(int offset, boolean allowDifferentRoute) {
int headIndex = train.getIndex(0, train.spacing, true);
Map.Entry<Integer, Integer> ceilEntry = trainStations.idLookup.ceilingEntry(headIndex);
Map.Entry<Integer, Integer> ceilEntry = trainPlatforms.idLookup.ceilingEntry(headIndex);
if (ceilEntry == null) return null;
int queryIndex = ceilEntry.getValue() + offset;
if (queryIndex < 0 || queryIndex > trainStations.stations.size() - 1
|| (!allowDifferentRoute && !Objects.equals(trainStations.stations.get(queryIndex).route.id,
trainStations.stations.get(ceilEntry.getValue()).route.id))) {
if (queryIndex < 0 || queryIndex > trainPlatforms.platforms.size() - 1
|| (!allowDifferentRoute && !Objects.equals(trainPlatforms.platforms.get(queryIndex).route.id,
trainPlatforms.platforms.get(ceilEntry.getValue()).route.id))) {
return null;
} else {
return trainStations.stations.get(queryIndex);
return trainPlatforms.platforms.get(queryIndex);
}
}

public List<StationInfo> getAllRoutesStations() {
return trainStations.stations;
public List<PlatformInfo> getAllPlatforms() {
return trainPlatforms.platforms;
}

public int getAllRoutesNextStationIndex() {
public int getAllPlatformsNextIndex() {
int headIndex = train.getIndex(0, train.spacing, true);
Map.Entry<Integer, Integer> ceilEntry = trainStations.idLookup.ceilingEntry(headIndex);
if (ceilEntry == null) return trainStations.stations.size();
Map.Entry<Integer, Integer> ceilEntry = trainPlatforms.idLookup.ceilingEntry(headIndex);
if (ceilEntry == null) return trainPlatforms.platforms.size();
return ceilEntry.getValue();
}

public List<StationInfo> getCurrentRouteStations() {
int nextIndex = getAllRoutesNextStationIndex();
Map.Entry<Integer, Integer> routeBoundary = trainStations.routeBoundary.floorEntry(Math.max(nextIndex - 1, 0));
public List<PlatformInfo> getThisRoutePlatforms() {
int nextIndex = getAllPlatformsNextIndex();
Map.Entry<Integer, Integer> routeBoundary = trainPlatforms.routeBoundary.floorEntry(Math.max(nextIndex - 1, 0));
return routeBoundary == null ? List.of()
: trainStations.stations.subList(routeBoundary.getKey(), routeBoundary.getValue() + 1);
: trainPlatforms.platforms.subList(routeBoundary.getKey(), routeBoundary.getValue() + 1);
}

public int getCurrentRouteNextStationIndex() {
int nextIndex = getAllRoutesNextStationIndex();
Integer routeBoundaryFrom = trainStations.routeBoundary.floorKey(Math.max(nextIndex - 1, 0));
public int getThisRoutePlatformsNextIndex() {
int nextIndex = getAllPlatformsNextIndex();
Integer routeBoundaryFrom = trainPlatforms.routeBoundary.floorKey(Math.max(nextIndex - 1, 0));
return nextIndex - (routeBoundaryFrom == null ? 0 : routeBoundaryFrom);
}

public List<StationInfo> getDebugStations(int count) {
List<StationInfo> result = new ArrayList<>();
public List<PlatformInfo> getDebugPlatforms(int count) {
List<PlatformInfo> result = new ArrayList<>();
Route debugRoute = new Route(TransportMode.TRAIN);
debugRoute.name = "调试线路|Debug Route";
Station destinationStation = new Station();
destinationStation.name = String.format("车站 %d|Station %d", count, count);
for (int i = 0; i < count; i++) {
Station currentStation = new Station();
currentStation.name = String.format("车站 %d|Station %d", i + 1, i + 1);
result.add(new StationInfo(debugRoute, currentStation, destinationStation, destinationStation.name, i * 1000));
Platform currentPlatform = new Platform(TransportMode.TRAIN, BlockPos.ZERO, BlockPos.ZERO);
currentPlatform.name = "1";
result.add(new PlatformInfo(debugRoute, currentStation, currentPlatform, destinationStation, destinationStation.name, i * 1000));
}
return result;
}

private static class StationIndexMap {
private static class PlatformLookupMap {

private final TreeMap<Integer, Integer> idLookup = new TreeMap<>();
private final TreeMap<Integer, Integer> routeBoundary = new TreeMap<>();
private final ArrayList<StationInfo> stations = new ArrayList<>();
private final ArrayList<PlatformInfo> platforms = new ArrayList<>();

public void put(int index, StationInfo stationInfo) {
stations.add(stationInfo);
idLookup.put(index, stations.size() - 1);
public void put(int index, PlatformInfo platformInfo) {
platforms.add(platformInfo);
idLookup.put(index, platforms.size() - 1);
}
}

public static class StationInfo {
public static class PlatformInfo {

public Route route;
public Station station;
public Platform platform;
public Station destinationStation;
public String destinationName;
public double distance;

public StationInfo(Route route, Station station, Station destinationStation, String destinationName, double distance) {
public PlatformInfo(Route route, Station station, Platform platform, Station destinationStation, String destinationName, double distance) {
this.route = route;
this.station = station;
this.platform = platform;
this.destinationStation = destinationStation;
this.destinationName = destinationName;
this.distance = distance;
Expand Down
5 changes: 5 additions & 0 deletions common/src/main/java/cn/zbx1425/mtrsteamloco/render/scripting/util/TextUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ public static String getNonExtraParts(String src) {
return getExtraMatching(src, false);
}

public static String getNonCjkAndExtraParts(String src) {
String extraParts = getExtraMatching(src, false).trim();
return getCjkMatching(src, false).trim() + (extraParts.isEmpty() ? "" : "|" + extraParts);
}

private static String getExtraMatching(String src, boolean extra) {
if (src.contains("||")) {
return src.split("\\|\\|", 2)[extra ? 1 : 0].trim();
Expand Down

0 comments on commit 7b103a7

Please sign in to comment.