Update Pulsar to 1.2.1, making deps work properly

SlimeKnights · Mar 20, 2016 · 60dd10b · 60dd10b
1 parent 637b830
commit 60dd10b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java
@@ -120,14 +120,15 @@ public void registerPulse(Object pulse) {
             configLoaded = true;
         }
 
-        String id, description, deps;
+        String id, description, deps, pulseDeps;
         boolean forced, enabled, defaultEnabled, missingDeps = false;
 
         try {
             Pulse p = pulse.getClass().getAnnotation(Pulse.class);
             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<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;
                 }
             }