finish updating usage

Author: HSGamer

src/main/java/me/hsgamer/bettergui/BetterGUI.java

@@ -5,7 +5,6 @@
 import io.github.projectunified.minelib.plugin.command.CommandComponent;
 import io.github.projectunified.minelib.plugin.postenable.PostEnable;
 import io.github.projectunified.minelib.plugin.postenable.PostEnableComponent;
-import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.builder.*;
 import me.hsgamer.bettergui.command.*;
 import me.hsgamer.bettergui.config.MainConfig;
@@ -15,24 +14,22 @@
 import me.hsgamer.bettergui.manager.AddonManager;
 import me.hsgamer.bettergui.manager.MenuCommandManager;
 import me.hsgamer.bettergui.manager.MenuManager;
-import me.hsgamer.bettergui.papi.ExtraPlaceholderExpansion;
-import me.hsgamer.bettergui.util.StringReplacerApplier;
+import me.hsgamer.bettergui.manager.VariableManager;
+import me.hsgamer.bettergui.papi.PlaceholderAPIHook;
 import me.hsgamer.hscore.bukkit.config.BukkitConfig;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
-import me.hsgamer.hscore.bukkit.variable.BukkitVariableBundle;
 import me.hsgamer.hscore.checker.spigotmc.SpigotVersionChecker;
 import me.hsgamer.hscore.common.CachedValue;
-import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.config.proxy.ConfigGenerator;
-import me.hsgamer.hscore.variable.CommonVariableBundle;
-import me.hsgamer.hscore.variable.VariableBundle;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.AdvancedPie;
 import org.bstats.charts.DrilldownPie;
-import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * The main class of the plugin
@@ -51,25 +48,20 @@ public static BetterGUI getInstance() {
 
   @Override
   protected List<Object> getComponents() {
-    VariableBundle variableBundle = new VariableBundle();
-    CommonVariableBundle.registerVariables(variableBundle);
-    BukkitVariableBundle.registerVariables(variableBundle);
-    variableBundle.register("menu_", StringReplacer.of((original, uuid) -> {
-      String[] split = original.split("_", 2);
-      String menuName = split[0].trim();
-      String variable = split.length > 1 ? split[1].trim() : "";
-      Menu menu = get(MenuManager.class).getMenu(menuName);
-      if (menu == null) {
-        return null;
-      }
-      return menu.getVariableManager().setVariables(StringReplacerApplier.normalizeQuery(variable), uuid);
-    }));
-
-    List<Object> components = new ArrayList<>(Arrays.asList(
-      variableBundle,
+    return Arrays.asList(
+      new VariableManager(this),
 
       new PostEnableComponent(this),
 
+      new ActionBuilder(this),
+      new ArgumentProcessorBuilder(),
+      new ButtonBuilder(),
+      new ConfigBuilder(),
+      new InventoryBuilder(),
+      new ItemModifierBuilder(),
+      new MenuBuilder(),
+      new RequirementBuilder(),
+
       new Permissions(this),
       new CommandComponent(this,
         new OpenCommand(this),
@@ -89,14 +81,9 @@ protected List<Object> getComponents() {
       new MenuCommandManager(this),
       new AddonDownloader(this),
 
-      new SpigotInventoryUIListener(this)
-    ));
-
-    if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
-      components.add(new ExtraPlaceholderExpansion(this));
-    }
-
-    return components;
+      new SpigotInventoryUIListener(this),
+      new PlaceholderAPIHook(this)
+    );
   }
 
   @Override
@@ -143,12 +130,6 @@ public void postEnable() {
   @Override
   public void disable() {
     get(SpigotInventoryUIListener.class).unregister();
-    ActionBuilder.INSTANCE.clear();
-    ButtonBuilder.INSTANCE.clear();
-    ItemModifierBuilder.INSTANCE.clear();
-    MenuBuilder.INSTANCE.clear();
-    RequirementBuilder.INSTANCE.clear();
-    get(VariableBundle.class).unregisterAll();
     INSTANCE_CACHE.clearCache();
   }
 }

src/main/java/me/hsgamer/bettergui/action/ActionApplier.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.action;
 
+import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.api.process.ProcessApplier;
 import me.hsgamer.bettergui.builder.ActionBuilder;
@@ -42,7 +43,7 @@ public ActionApplier(List<Action> actions, StringReplacer replacer) {
    * @param value the value
    */
   public ActionApplier(Menu menu, Object value) {
-    this(ActionBuilder.INSTANCE.build(menu, value), StringReplacer.of((original, uuid) -> StringReplacerApplier.replace(original, uuid, menu)));
+    this(BetterGUI.getInstance().get(ActionBuilder.class).build(menu, value), StringReplacer.of((original, uuid) -> StringReplacerApplier.replace(original, uuid, menu)));
   }
 
   /**

src/main/java/me/hsgamer/bettergui/action/ClickActionHandler.java

@@ -9,10 +9,7 @@
 import me.hsgamer.hscore.task.BatchRunnable;
 import org.bukkit.Bukkit;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * A handler to handle the click action
@@ -49,8 +46,9 @@ public ClickActionHandler(Menu menu, Object o, boolean closeOnClick) {
       Map<String, Object> keys = MapUtils.createLowercaseStringObjectMap((Map<?, ?>) o);
       Optional<ActionApplier> defaultActionApplier = Optional.ofNullable(keys.get("default")).map(value -> new ActionApplier(menu, value));
       clickTypeMap.forEach((clickTypeName, clickType) -> {
-        if (keys.containsKey(clickTypeName)) {
-          actionMap.put(clickType, new ActionApplier(menu, keys.get(clickTypeName)));
+        Object value = keys.get(clickTypeName.toLowerCase(Locale.ROOT));
+        if (value != null) {
+          actionMap.put(clickType, new ActionApplier(menu, value));
         } else {
           defaultActionApplier.ifPresent(actionApplier -> actionMap.put(clickType, actionApplier));
         }

src/main/java/me/hsgamer/bettergui/api/menu/Menu.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.api.menu;
 
+import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.config.Config;
 import me.hsgamer.hscore.variable.VariableManager;
@@ -29,7 +30,7 @@ protected Menu(Config config) {
     this.config = config;
     variableManager.register("current-menu", original -> getName(), true);
     variableManager.register("parent-menu", StringReplacer.of((original, uuid) -> getParentMenu(uuid).map(Menu::getName).orElse("")));
-    variableManager.addExternalReplacer(VariableManager.GLOBAL);
+    variableManager.addExternalReplacer(BetterGUI.getInstance().get(VariableManager.class));
   }
 
   /**

src/main/java/me/hsgamer/bettergui/argument/ArgumentHandler.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.argument;
 
+import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.argument.ArgumentProcessor;
 import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.builder.ArgumentProcessorBuilder;
@@ -28,7 +29,7 @@ public ArgumentHandler(Menu menu, Map<String, Object> section) {
       if (value instanceof Map) {
         //noinspection unchecked
         Map<String, Object> map = (Map<String, Object>) value;
-        ArgumentProcessorBuilder.INSTANCE
+        BetterGUI.getInstance().get(ArgumentProcessorBuilder.class)
           .build(new ArgumentProcessorBuilder.Input(menu, key, map))
           .ifPresent(processor -> processorMap.put(key, processor));
       }

src/main/java/me/hsgamer/bettergui/builder/ActionBuilder.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.builder;
 
+import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.action.type.*;
 import me.hsgamer.bettergui.api.menu.Menu;
@@ -16,21 +17,28 @@
 /**
  * The action builder
  */
-public final class ActionBuilder extends me.hsgamer.hscore.action.builder.ActionBuilder<ActionBuilder.Input> {
-  /**
-   * The instance of the action builder
-   */
-  public static final ActionBuilder INSTANCE = new ActionBuilder();
+public final class ActionBuilder extends me.hsgamer.hscore.action.builder.ActionBuilder<ActionBuilder.Input> implements Loadable {
+  private final BetterGUI plugin;
+
+  public ActionBuilder(BetterGUI plugin) {
+    this.plugin = plugin;
+  }
 
-  private ActionBuilder() {
-    BukkitActionBuilder.register(this, BetterGUI.getInstance());
+  @Override
+  public void load() {
+    BukkitActionBuilder.register(this, plugin);
     register(OpenMenuAction::new, "open-menu", "open", "menu", "open-menu");
     register(BackAction::new, "back-menu", "backmenu");
     register(input -> new CloseMenuAction(input.getMenu()), "close-menu", "closemenu");
     register(input -> new UpdateMenuAction(input.getMenu()), "update-menu", "updatemenu");
     register(input -> new SoundAction(input.getValue()), "sound", "raw-sound");
   }
 
+  @Override
+  public void disable() {
+    clear();
+  }
+
   /**
    * Build a list of actions
    *

src/main/java/me/hsgamer/bettergui/builder/ArgumentProcessorBuilder.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.builder;
 
+import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.bettergui.api.argument.ArgumentProcessor;
 import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.argument.type.*;
@@ -12,13 +13,12 @@
 /**
  * The argument processor builder
  */
-public final class ArgumentProcessorBuilder extends FunctionalMassBuilder<ArgumentProcessorBuilder.Input, ArgumentProcessor> {
-  /**
-   * The instance of the argument processor builder
-   */
-  public static final ArgumentProcessorBuilder INSTANCE = new ArgumentProcessorBuilder();
+public final class ArgumentProcessorBuilder extends FunctionalMassBuilder<ArgumentProcessorBuilder.Input, ArgumentProcessor> implements Loadable {
+  public ArgumentProcessorBuilder() {
+  }
 
-  private ArgumentProcessorBuilder() {
+  @Override
+  public void enable() {
     register(StoreArgumentProcessor::new, "store");
     register(PlayerArgumentProcessor::new, "player");
     register(NumberArgumentProcessor::new, "number", "int", "integer", "long");
@@ -27,6 +27,11 @@ private ArgumentProcessorBuilder() {
     register(MaterialArgumentProcessor::new, "material", "item");
   }
 
+  @Override
+  public void disable() {
+    clear();
+  }
+
   @Override
   protected String getType(Input input) {
     return Objects.toString(MapUtils.createLowercaseStringObjectMap(input.options).get("type"), "store");

src/main/java/me/hsgamer/bettergui/builder/ButtonBuilder.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.builder;
 
+import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.button.WrappedButton;
 import me.hsgamer.bettergui.api.menu.Menu;
@@ -17,13 +18,12 @@
 /**
  * The button builder
  */
-public final class ButtonBuilder extends FunctionalMassBuilder<ButtonBuilder.Input, WrappedButton> {
-  /**
-   * The instance of the button builder
-   */
-  public static final ButtonBuilder INSTANCE = new ButtonBuilder();
+public final class ButtonBuilder extends FunctionalMassBuilder<ButtonBuilder.Input, WrappedButton> implements Loadable {
+  public ButtonBuilder() {
+  }
 
-  private ButtonBuilder() {
+  @Override
+  public void load() {
     register(TemplateButton::new, "template");
     register(WrappedDummyButton::new, "dummy", "raw");
     register(EmptyButton::new, "empty");
@@ -40,6 +40,11 @@ private ButtonBuilder() {
     );
   }
 
+  @Override
+  public void disable() {
+    clear();
+  }
+
   @Override
   protected String getType(Input input) {
     return Objects.toString(MapUtils.createLowercaseStringObjectMap(input.options).get("type"), "simple");

src/main/java/me/hsgamer/bettergui/builder/ConfigBuilder.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.builder;
 
+import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.hscore.builder.FunctionalMassBuilder;
 import me.hsgamer.hscore.bukkit.config.BukkitConfig;
 import me.hsgamer.hscore.config.Config;
@@ -9,16 +10,20 @@
 /**
  * The config builder
  */
-public class ConfigBuilder extends FunctionalMassBuilder<File, Config> {
-  /**
-   * the singleton instance
-   */
-  public static final ConfigBuilder INSTANCE = new ConfigBuilder();
+public class ConfigBuilder extends FunctionalMassBuilder<File, Config> implements Loadable {
+  public ConfigBuilder() {
+  }
 
-  private ConfigBuilder() {
+  @Override
+  public void load() {
     register(BukkitConfig::new, "yml", "yaml");
   }
 
+  @Override
+  public void disable() {
+    clear();
+  }
+
   @Override
   protected String getType(File input) {
     String name = input.getName();

src/main/java/me/hsgamer/bettergui/builder/InventoryBuilder.java

@@ -1,5 +1,6 @@
 package me.hsgamer.bettergui.builder;
 
+import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.bettergui.menu.BaseInventoryMenu;
 import me.hsgamer.hscore.builder.Builder;
 import me.hsgamer.hscore.common.Pair;
@@ -13,13 +14,13 @@
 /**
  * A builder to get the creator to build the {@link Inventory} for any {@link me.hsgamer.bettergui.menu.BaseInventoryMenu} implementation
  */
-public class InventoryBuilder extends Builder<Pair<BaseInventoryMenu<?>, Map<String, Object>>, BiFunction<UUID, InventoryHolder, Inventory>> {
-  /**
-   * The singleton instance
-   */
-  public static final InventoryBuilder INSTANCE = new InventoryBuilder();
-
-  private InventoryBuilder() {
+public class InventoryBuilder extends Builder<Pair<BaseInventoryMenu<?>, Map<String, Object>>, BiFunction<UUID, InventoryHolder, Inventory>> implements Loadable {
+  public InventoryBuilder() {
     // EMPTY
   }
+
+  @Override
+  public void disable() {
+    clear();
+  }
 }