mirror of
https://github.com/GTNewHorizons/Mantle.git
synced 2026-11-19 03:39:18 +00:00
Update Pulsar to 1.2.1, making deps work properly
This commit is contained in:
1 parent
21c453525a
commit
65005ac13f
1 file changed
+5
-5
@@ -120,7 +120,7 @@ public class PulseManager {
|
||||
configLoaded = true;
|
||||
}
|
||||
|
||||
String id, description, deps;
|
||||
String id, description, deps, pulseDeps;
|
||||
boolean forced, enabled, defaultEnabled, missingDeps = false;
|
||||
|
||||
try {
|
||||
@@ -128,6 +128,7 @@ public class PulseManager {
|
||||
id = p.id();
|
||||
description = p.description();
|
||||
deps = p.modsRequired();
|
||||
pulseDeps = p.pulsesRequired();
|
||||
forced = p.forced();
|
||||
enabled = p.defaultEnable();
|
||||
defaultEnabled = p.defaultEnable();
|
||||
@@ -151,7 +152,7 @@ public class PulseManager {
|
||||
}
|
||||
|
||||
PulseMeta meta = new PulseMeta(id, description, forced, enabled, defaultEnabled);
|
||||
meta.setMissingDeps(missingDeps);
|
||||
meta.setMissingDeps(missingDeps || !hasRequiredPulses(meta, pulseDeps));
|
||||
meta.setEnabled(getEnabledFromConfig(meta));
|
||||
|
||||
if (meta.isEnabled()) {
|
||||
@@ -213,13 +214,12 @@ public class PulseManager {
|
||||
blockNewRegistrations = true;
|
||||
}
|
||||
|
||||
private boolean hasRequiredPulses(Map.Entry<Object, PulseMeta> entry) {
|
||||
String deps = entry.getKey().getClass().getAnnotation(Pulse.class).pulsesRequired();
|
||||
private boolean hasRequiredPulses(PulseMeta meta, String deps) {
|
||||
if (!deps.equals("")) {
|
||||
String[] parsedDeps = deps.split(";");
|
||||
for (String s : parsedDeps) {
|
||||
if (!isPulseLoaded(s)) {
|
||||
log.info("Skipping Pulse " + entry.getValue().getId() + "; missing pulse: " + s);
|
||||
log.info("Skipping Pulse " + meta.getId() + "; missing pulse: " + s);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user