From 60dd10bf5e2e8a08f26197689ed7ba32b84a627a Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 19 Mar 2016 19:31:39 +0100 Subject: [PATCH] Update Pulsar to 1.2.1, making deps work properly --- .../mantle/pulsar/control/PulseManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java index 3524b00e..67409e87 100644 --- a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java +++ b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java @@ -120,7 +120,7 @@ public void registerPulse(Object pulse) { configLoaded = true; } - String id, description, deps; + String id, description, deps, pulseDeps; boolean forced, enabled, defaultEnabled, missingDeps = false; try { @@ -128,6 +128,7 @@ public void registerPulse(Object pulse) { 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 void registerPulse(Object pulse) { } 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 @@ private void preInit(FMLPreInitializationEvent evt) { blockNewRegistrations = true; } - private boolean hasRequiredPulses(Map.Entry 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; } }