From d4e3a1f0bccbfd05d00823e2c2a2dcc888daff45 Mon Sep 17 00:00:00 2001 From: progwml6 Date: Wed, 2 Jul 2014 21:03:30 -0400 Subject: [PATCH] fix another derp, and un deprecate pulseproxy --- src/mantle/pulsar/config/ForgeCFG.java | 12 ++---------- src/mantle/pulsar/pulse/PulseProxy.java | 2 -- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/mantle/pulsar/config/ForgeCFG.java b/src/mantle/pulsar/config/ForgeCFG.java index e485299..c43f88d 100644 --- a/src/mantle/pulsar/config/ForgeCFG.java +++ b/src/mantle/pulsar/config/ForgeCFG.java @@ -14,8 +14,6 @@ public class ForgeCFG implements IConfiguration{ private final String confPath; private final String description; - private Map modules; - /** * Creates a new Configuration object. * @@ -37,14 +35,8 @@ public class ForgeCFG implements IConfiguration{ @Override public boolean isModuleEnabled(PulseMeta meta) { - Boolean enabled = modules.get(meta.getId()); - if (enabled == null) { - modules.put(meta.getId(), meta.isEnabled()); - enabled = meta.isEnabled(); - config.get(description, meta.getId(), meta.isEnabled(), meta.getDescription()).set(meta.isEnabled()); - } - return enabled; - + logger.warn("pulsar stuffs " + meta.getId()); + return config.get(description, meta.getId(), meta.isEnabled(), meta.getDescription()).getBoolean(meta.isEnabled()); } @Override diff --git a/src/mantle/pulsar/pulse/PulseProxy.java b/src/mantle/pulsar/pulse/PulseProxy.java index b8089bb..c18cb62 100644 --- a/src/mantle/pulsar/pulse/PulseProxy.java +++ b/src/mantle/pulsar/pulse/PulseProxy.java @@ -5,8 +5,6 @@ import java.lang.annotation.*; /** * Annotation to denote a field that should be populated by a side-specific proxy. * - * @deprecated Use FML's @SidedProxy instead. - * * @author Arkan */ @Retention(RetentionPolicy.RUNTIME)