Skip to content

Commit

Permalink
feat: added fixes from 1.12 for loading and changeing signals
Browse files Browse the repository at this point in the history
  • Loading branch information
@Uhutown
Uhutown committed Oct 21, 2024
1 parent 78c6701 commit a0db73f
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 52 deletions.
11 changes: 9 additions & 2 deletions src/main/java/com/troblecodings/signals/core/SignalStateListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@

public interface SignalStateListener {

public void update(final SignalStateInfo info,
final Map<SEProperty, String> changedProperties, final ChangedState changedState);
public void update(final SignalStateInfo info, final Map<SEProperty, String> changedProperties,
final ChangedState changedState);

default SignalStateListener andThen(final SignalStateListener otherTask) {
return (info, properties, state) -> {
this.update(info, properties, state);
otherTask.update(info, properties, state);
};
}
}
13 changes: 7 additions & 6 deletions src/main/java/com/troblecodings/signals/handler/NameHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public final class NameHandler implements INetworkSync {
private static final Map<StateInfo, List<NameStateListener>> TASKS_WHEN_LOAD = new HashMap<>();
private static final Map<StateInfo, List<LoadHolder<?>>> LOAD_COUNTER = new HashMap<>();
private static ExecutorService writeService = Executors.newFixedThreadPool(5);
private static final ExecutorService threadService = Executors.newCachedThreadPool();
private static EventNetworkChannel channel;
private static ResourceLocation channelName;

Expand Down Expand Up @@ -92,15 +93,15 @@ public static void createName(final StateInfo info, final String name,
final PlayerEntity creator) {
if (info.world.isClientSide || name == null)
return;
new Thread(() -> {
threadService.execute(() -> {
setNameForNonSignal(info, name);
final List<LoadHolder<?>> list = new ArrayList<>();
list.add(new LoadHolder<>(creator));
synchronized (LOAD_COUNTER) {
LOAD_COUNTER.put(info, list);
}
createToFile(info, name);
}, "OSNameHandler:createName").start();
});
}

public static void setNameForSignal(final StateInfo info, final String name) {
Expand All @@ -117,12 +118,12 @@ public static void setNameForSignal(final StateInfo info, final String name) {
public static void setNameForNonSignal(final StateInfo info, final String name) {
if (info.world.isClientSide || name == null)
return;
new Thread(() -> {
threadService.execute(() -> {
synchronized (ALL_NAMES) {
ALL_NAMES.put(info, name);
}
sendToAll(info, name);
}, "OSNameHandler:setName").start();
});
}

public static String getName(final StateInfo info) {
Expand Down Expand Up @@ -336,7 +337,7 @@ public static void loadNames(final List<StateLoadHolder> infos,
final @Nullable PlayerEntity player) {
if (infos == null || infos.isEmpty())
return;
new Thread(() -> {
threadService.execute(() -> {
infos.forEach(info -> {
boolean isLoaded = false;
synchronized (LOAD_COUNTER) {
Expand Down Expand Up @@ -380,7 +381,7 @@ public static void loadNames(final List<StateLoadHolder> infos,
}
}
});
}, "NameHandler:loadNames").start();
});
}

public static void unloadName(final StateLoadHolder holder) {
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/troblecodings/signals/handler/SignalStateHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
public final class SignalStateHandler implements INetworkSync {

private static ExecutorService writeService = Executors.newFixedThreadPool(5);
private static final ExecutorService threadService = Executors.newCachedThreadPool();
private static final Map<SignalStateInfo, Map<SEProperty, String>> CURRENTLY_LOADED_STATES = new HashMap<>();
private static final Map<World, SignalStateFileV2> ALL_LEVEL_FILES = new HashMap<>();
private static final Map<SignalStateInfo, List<LoadHolder<?>>> SIGNAL_COUNTER = new HashMap<>();
Expand Down Expand Up @@ -104,15 +105,15 @@ public static void createStates(final SignalStateInfo info,
CURRENTLY_LOADED_STATES.put(info, ImmutableMap.copyOf(states));
}
updateListeners(info, states, ChangedState.ADDED_TO_FILE);
new Thread(() -> {
threadService.execute(() -> {
final List<LoadHolder<?>> list = new ArrayList<>();
list.add(new LoadHolder<>(creator));
synchronized (SIGNAL_COUNTER) {
SIGNAL_COUNTER.put(info, list);
}
sendToAll(info, states);
createToFile(info, states);
}, "OSSignalStateHandler:createStates").start();
});
}

public static boolean isSignalLoaded(final SignalStateInfo info) {
Expand Down Expand Up @@ -237,13 +238,13 @@ public static void setStates(final SignalStateInfo info, final Map<SEProperty, S
}
}
updateListeners(info, changedProperties, ChangedState.UPDATED);
new Thread(() -> {
threadService.execute(() -> {
sendToAll(info, changedProperties);
info.signal.getUpdate(info.world, info.pos);
if (!contains.get()) {
createToFile(info, changedProperties);
}
}, "OSSignalStateHandler:setStates").start();
});
info.world.getServer().execute(() -> info.world.updateNeighborsAt(info.pos, info.signal));
}

Expand Down Expand Up @@ -547,7 +548,7 @@ public static void loadSignals(final List<SignalStateLoadHoler> signals,
final @Nullable PlayerEntity player) {
if (signals == null || signals.isEmpty())
return;
new Thread(() -> {
threadService.execute(() -> {
signals.forEach(info -> {
boolean isLoaded = false;
synchronized (SIGNAL_COUNTER) {
Expand Down Expand Up @@ -582,7 +583,7 @@ public static void loadSignals(final List<SignalStateLoadHoler> signals,
}
}
});
}, "OSSignalStateHandler:loadSignals").start();
});
}

public static void unloadSignal(final SignalStateLoadHoler info) {
Expand Down
14 changes: 2 additions & 12 deletions src/main/java/com/troblecodings/signals/signalbox/SignalBoxGrid.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,9 @@ protected void addPathway(final PathwayData data) {
}

protected void updatePrevious(final SignalBoxPathway pathway) {
SignalBoxPathway previousPath = pathway;
int count = 0;
while ((previousPath = endsToPath.get(previousPath.getFirstPoint())) != null) {
if (count > endsToPath.size()) {
break;
}
SignalBoxPathway previousPath = endsToPath.get(pathway.getFirstPoint());
if (previousPath != null) {
previousPath.setSignals();
count++;
}
if (count == 0) {
if (OpenSignalsMain.isDebug()) {
OpenSignalsMain.getLogger().debug("Could not find previous! " + pathway);
}
}
}

Expand Down
34 changes: 27 additions & 7 deletions src/main/java/com/troblecodings/signals/signalbox/SignalBoxPathway.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
public class SignalBoxPathway implements IChunkLoadable {

protected final PathwayData data;
protected final SignalConfig config;

protected boolean isBlocked;
protected boolean isAutoPathway = false;
Expand All @@ -58,6 +59,7 @@ public void setTile(final SignalBoxTileEntity tile) {
}

public SignalBoxPathway(final PathwayData data) {
this.config = new SignalConfig(this);
this.data = data;
this.originalFirstPoint = new Point(data.getFirstPoint());
updatePathwayToAutomatic();
Expand Down Expand Up @@ -152,6 +154,12 @@ public void setPathStatus(final EnumPathUsage status) {
setPathStatus(status, null);
}

public void updatePrevious() {
if (grid == null)
return;
grid.updatePrevious(this);
}

protected SignalStateInfo lastSignalInfo = null;

protected SignalStateInfo getLastSignalInfo() {
Expand Down Expand Up @@ -198,9 +206,14 @@ protected void setSignals(final SignalStateInfo lastSignal) {
if (first == null)
return;
final SignalStateInfo firstInfo = new SignalStateInfo(world, startSignal.pos, first);
SignalConfig.change(new ConfigInfo(firstInfo, lastSignal, data));
config.change(new ConfigInfo(firstInfo, lastSignal, data));
updatePreSignals();
}
final SignalBoxPathway next = getNextPathway();
if (next != null && (next.isEmptyOrBroken() || next.isBlocked)) {
updateSignalStates();
return;
}
final Map<BlockPosSignalHolder, OtherSignalIdentifier> distantSignalPositions = data
.getOtherSignals();
distantSignalPositions.forEach((holder, position) -> {
Expand All @@ -213,9 +226,9 @@ protected void setSignals(final SignalStateInfo lastSignal) {
new SignalStateInfo(world, position.pos, current), lastSignal, data,
position.isRepeater);
if (position.guiMode.equals(EnumGuiMode.HP)) {
SignalConfig.loadDisable(info);
config.loadDisable(info);
} else {
SignalConfig.change(info);
config.change(info);
}
});
updateSignalStates();
Expand All @@ -225,6 +238,10 @@ private void updatePreSignals() {
final MainSignalIdentifier startSignal = data.getStartSignal();
if (startSignal == null)
return;
final SignalBoxPathway next = getNextPathway();
if (next != null && (next.isEmptyOrBroken() || next.isBlocked)) {
return;
}
final StateInfo identifier = new StateInfo(tile.getLevel(), tile.getBlockPos());
final Signal first = SignalBoxHandler.getSignal(identifier, startSignal.pos);
if (first == null)
Expand All @@ -235,7 +252,7 @@ private void updatePreSignals() {
final Signal current = SignalBoxHandler.getSignal(identifier, posIdent.pos);
if (current == null)
return;
SignalConfig.change(
config.change(
new ConfigInfo(new SignalStateInfo(tile.getLevel(), posIdent.pos, current),
firstInfo, data, posIdent.isRepeater));
});
Expand Down Expand Up @@ -269,8 +286,12 @@ protected void updateSignalStates() {
final SignalBoxPathway next = getNextPathway();
final SignalState previous = position.state;
if (endSignal != null && next != null && !next.isEmptyOrBroken()) {
if (!next.isExecutingSignalSet)
if (!next.isExecutingSignalSet) {
position.state = SignalState.GREEN;
}
if (next.isBlocked) {
position.state = SignalState.RED;
}
} else {
position.state = SignalState.RED;
}
Expand Down Expand Up @@ -422,7 +443,6 @@ public void resetPathway(final @Nullable Point point) {
resetFirstSignal();
System.out.println(getListOfNodes());
if (data.totalPathwayReset(point)) {
this.isBlocked = false;
resetOther();
resetAllTrainNumbers();
sendTrainNumberUpdates();
Expand Down Expand Up @@ -603,7 +623,7 @@ private void resetAllTrainNumbers() {
}

private void resetAllTrainNumbers(final List<ModeIdentifier> trainNumberDisplays) {
if (grid != null)
if (grid != null && trainNumberDisplays != null)
trainNumberDisplays.forEach(ident -> grid.getNode(ident.point).getOption(ident.mode)
.orElse(new PathOptionEntry()).removeEntry(PathEntryType.TRAINNUMBER));
}
Expand Down
44 changes: 25 additions & 19 deletions src/main/java/com/troblecodings/signals/signalbox/config/SignalConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,23 @@
import com.troblecodings.signals.handler.SignalStateHandler;
import com.troblecodings.signals.handler.SignalStateInfo;
import com.troblecodings.signals.properties.PredicatedPropertyBase.ConfigProperty;
import com.troblecodings.signals.signalbox.SignalBoxPathway;

public final class SignalConfig {

private static final LoadHolder<Class<SignalConfig>> LOAD_HOLDER = new LoadHolder<>(
SignalConfig.class);

private SignalConfig() {
private final SignalBoxPathway pathway;

public SignalConfig(final SignalBoxPathway pathway) {
this.pathway = pathway;
}

public static void change(final ConfigInfo info) {
public void change(final ConfigInfo info) {
final Signal currentSignal = info.currentinfo.signal;
if (info.type.equals(PathType.NORMAL)) {
if (info.nextinfo != null) {
if (info.nextinfo != null && info.nextinfo.isValid()) {
final Signal nextSignal = info.nextinfo.signal;
final List<ConfigProperty> values = ChangeConfigParser.CHANGECONFIGS
.get(Maps.immutableEntry(currentSignal, nextSignal));
Expand All @@ -45,13 +49,15 @@ public static void change(final ConfigInfo info) {
} else if (info.type.equals(PathType.SHUNTING)) {
final List<ConfigProperty> shuntingValues = OneSignalNonPredicateConfigParser.SHUNTINGCONFIGS
.get(currentSignal);
if (shuntingValues != null) {
if (shuntingValues != null && info.currentinfo.isValid()) {
loadWithoutPredicate(shuntingValues, info.currentinfo);
}
}
}

private static void loadDefault(final ConfigInfo info) {
private void loadDefault(final ConfigInfo info) {
if (!info.currentinfo.isValid())
return;
final List<ConfigProperty> defaultValues = OneSignalPredicateConfigParser.DEFAULTCONFIGS
.get(info.currentinfo.signal);
if (defaultValues != null) {
Expand Down Expand Up @@ -79,34 +85,31 @@ public static void reset(final ResetInfo info) {
});
if (!propertiesToSet.isEmpty())
SignalStateHandler.setStates(info.current, propertiesToSet);
unloadSignal(stateInfo);
});
}

public static void loadDisable(final ConfigInfo info) {
public void loadDisable(final ConfigInfo info) {
final List<ConfigProperty> disableValues = OneSignalPredicateConfigParser.DISABLECONFIGS
.get(info.currentinfo.signal);
if (disableValues != null) {
changeIfPresent(disableValues, info);
}
}

private static void changeIfPresent(final List<ConfigProperty> values, final ConfigInfo info) {
private void changeIfPresent(final List<ConfigProperty> values, final ConfigInfo info) {
loadSignalAndRunTask(info.currentinfo, (stateInfo, oldProperties, _u) -> {
if (info.nextinfo != null) {
loadSignalAndRunTask(info.nextinfo, (nextInfo, nextProperties, _u2) -> {
changeSignals(values, info, oldProperties, nextProperties);
unloadSignal(nextInfo);
});
} else {
changeSignals(values, info, oldProperties, null);
}
unloadSignal(stateInfo);
});

}

private static void changeSignals(final List<ConfigProperty> values, final ConfigInfo info,
private void changeSignals(final List<ConfigProperty> values, final ConfigInfo info,
final Map<SEProperty, String> oldProperties,
final Map<SEProperty, String> nextProperties) {
final Map<Class<?>, Object> object = new HashMap<>();
Expand All @@ -122,11 +125,13 @@ private static void changeSignals(final List<ConfigProperty> values, final Confi
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
}
});
if (!propertiesToSet.isEmpty())
if (!propertiesToSet.isEmpty()) {
SignalStateHandler.setStates(info.currentinfo, propertiesToSet);
pathway.updatePrevious();
}
}

private static void loadWithoutPredicate(final List<ConfigProperty> values,
private void loadWithoutPredicate(final List<ConfigProperty> values,
final SignalStateInfo current) {
if (values != null) {
loadSignalAndRunTask(current, (info, oldProperties, _u) -> {
Expand All @@ -138,18 +143,19 @@ private static void loadWithoutPredicate(final List<ConfigProperty> values,
});
if (!propertiesToSet.isEmpty())
SignalStateHandler.setStates(current, propertiesToSet);
unloadSignal(info);
pathway.updatePrevious();
});
}
}

private static void loadSignalAndRunTask(final SignalStateInfo info,
final SignalStateListener task) {
SignalStateHandler.loadSignal(new SignalStateLoadHoler(info, LOAD_HOLDER));
final boolean isSignalLoaded = SignalStateHandler.isSignalLoaded(info);
if (!isSignalLoaded) {
SignalStateHandler.loadSignal(new SignalStateLoadHoler(info, LOAD_HOLDER));
task.andThen((_u1, _u2, _u3) -> SignalStateHandler
.unloadSignal(new SignalStateLoadHoler(info, LOAD_HOLDER)));
}
SignalStateHandler.runTaskWhenSignalLoaded(info, task);
}

private static void unloadSignal(final SignalStateInfo info) {
SignalStateHandler.unloadSignal(new SignalStateLoadHoler(info, LOAD_HOLDER));
}
}

0 comments on commit a0db73f

Please sign in to comment.