remove BetterGUI#getInstance

Author: HSGamer

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

@@ -22,7 +22,6 @@
 import me.hsgamer.hscore.config.proxy.ConfigGenerator;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.AdvancedPie;
-import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -33,15 +32,6 @@
  * The main class of the plugin
  */
 public final class BetterGUI extends BasePlugin implements PostEnable {
-  /**
-   * Get the instance of the plugin
-   *
-   * @return the instance
-   */
-  public static BetterGUI getInstance() {
-    return JavaPlugin.getPlugin(BetterGUI.class);
-  }
-
   @Override
   protected List<Object> getComponents() {
     return Arrays.asList(
@@ -55,11 +45,11 @@ protected List<Object> getComponents() {
 
       new ActionBuilder(this),
       new ArgumentProcessorBuilder(),
-      new ButtonBuilder(),
+      new ButtonBuilder(this),
       new ConfigBuilder(),
       new InventoryBuilder(),
       new ItemModifierBuilder(),
-      new MenuBuilder(),
+      new MenuBuilder(this),
       new RequirementBuilder(),
 
       new Permissions(this),

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

@@ -9,6 +9,7 @@
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.task.element.TaskPool;
 import me.hsgamer.hscore.task.element.TaskProcess;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.Collections;
 import java.util.List;
@@ -43,7 +44,7 @@ public ActionApplier(List<Action> actions, StringReplacer replacer) {
    * @param value       the value
    */
   public ActionApplier(MenuElement menuElement, Object value) {
-    this(BetterGUI.getInstance().get(ActionBuilder.class).build(menuElement, value), StringReplacer.of((original, uuid) -> StringReplacerApplier.replace(original, uuid, menuElement)));
+    this(JavaPlugin.getPlugin(BetterGUI.class).get(ActionBuilder.class).build(menuElement, value), StringReplacer.of((original, uuid) -> StringReplacerApplier.replace(original, uuid, menuElement)));
   }
 
   /**

src/main/java/me/hsgamer/bettergui/action/type/BackAction.java

@@ -14,11 +14,13 @@
 import java.util.UUID;
 
 public class BackAction implements Action {
+  private final BetterGUI plugin;
   private final Menu menu;
   private final String value;
   private final boolean bypass;
 
-  public BackAction(ActionBuilder.Input input) {
+  public BackAction(BetterGUI plugin, ActionBuilder.Input input) {
+    this.plugin = plugin;
     this.menu = input.getMenuElement().getMenu();
     this.value = input.getValue();
     this.bypass = input.getOption().equalsIgnoreCase("bypassChecks");
@@ -36,7 +38,7 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
       ? stringReplacer.replaceOrOriginal(value, uuid).split(" ")
       : new String[0];
 
-    Runnable runnable = BetterGUI.getInstance().get(MenuManager.class).getParentMenu(uuid, menu)
+    Runnable runnable = plugin.get(MenuManager.class).getParentMenu(uuid, menu)
       .<Runnable>map(parentMenu -> () -> parentMenu.create(player, args, bypass))
       .orElse(player::closeInventory);
     SchedulerUtil.entity(player)

src/main/java/me/hsgamer/bettergui/action/type/OpenMenuAction.java

@@ -16,14 +16,14 @@
 import java.util.Arrays;
 import java.util.UUID;
 
-import static me.hsgamer.bettergui.BetterGUI.getInstance;
-
 public class OpenMenuAction implements Action {
+  private final BetterGUI plugin;
   private final Menu menu;
   private final String value;
   private final boolean bypass;
 
-  public OpenMenuAction(ActionBuilder.Input input) {
+  public OpenMenuAction(BetterGUI plugin, ActionBuilder.Input input) {
+    this.plugin = plugin;
     this.menu = input.getMenuElement().getMenu();
     this.value = input.getValue();
     this.bypass = input.getOption().equalsIgnoreCase("bypassChecks");
@@ -46,20 +46,19 @@ public void apply(UUID uuid, TaskProcess process, StringReplacer stringReplacer)
     }
 
     // Open menu
-    if (getInstance().get(MenuManager.class).contains(menu)) {
+    if (plugin.get(MenuManager.class).contains(menu)) {
       String[] finalArgs = args;
       Menu parentMenu = this.menu;
       SchedulerUtil.entity(player)
         .run(() -> {
           try {
-            getInstance().get(MenuManager.class).openMenu(menu, player, finalArgs, parentMenu, bypass);
+            plugin.get(MenuManager.class).openMenu(menu, player, finalArgs, parentMenu, bypass);
           } finally {
             process.next();
           }
         }, process::next);
     } else {
-      BetterGUI betterGUI = getInstance();
-      MessageUtils.sendMessage(player, betterGUI.get(MessageConfig.class).getMenuNotFound());
+      MessageUtils.sendMessage(player, plugin.get(MessageConfig.class).getMenuNotFound());
       process.next();
     }
   }

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

@@ -6,6 +6,7 @@
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.config.Config;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -66,7 +67,7 @@ public StringReplacer getStringReplacer() {
       @Override
       public @Nullable String replace(@NotNull String original, @NotNull UUID uuid) {
         if (original.equalsIgnoreCase("parent-menu")) {
-          return BetterGUI.getInstance().get(MenuManager.class).getParentMenu(uuid, Menu.this).map(Menu::getName).orElse(null);
+          return JavaPlugin.getPlugin(BetterGUI.class).get(MenuManager.class).getParentMenu(uuid, Menu.this).map(Menu::getName).orElse(null);
         }
         return replace(original);
       }

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

@@ -8,6 +8,7 @@
 import me.hsgamer.hscore.common.MapUtils;
 import me.hsgamer.hscore.common.Pair;
 import me.hsgamer.hscore.common.StringReplacer;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.*;
 
@@ -30,7 +31,7 @@ public ArgumentHandler(MenuElement menuElement, Map<String, Object> section) {
       if (value instanceof Map) {
         //noinspection unchecked
         Map<String, Object> map = (Map<String, Object>) value;
-        BetterGUI.getInstance().get(ArgumentProcessorBuilder.class)
+        JavaPlugin.getPlugin(BetterGUI.class).get(ArgumentProcessorBuilder.class)
           .build(new ArgumentProcessorBuilder.Input(menuElement, key, map))
           .ifPresent(processors::add);
       }

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

@@ -2,14 +2,18 @@
 
 import io.github.projectunified.minelib.plugin.base.Loadable;
 import me.hsgamer.bettergui.BetterGUI;
-import me.hsgamer.bettergui.action.type.*;
+import me.hsgamer.bettergui.action.type.BackAction;
+import me.hsgamer.bettergui.action.type.CloseMenuAction;
+import me.hsgamer.bettergui.action.type.OpenMenuAction;
+import me.hsgamer.bettergui.action.type.UpdateMenuAction;
 import me.hsgamer.bettergui.api.element.MenuElement;
 import me.hsgamer.hscore.action.builder.ActionInput;
 import me.hsgamer.hscore.action.common.Action;
 import me.hsgamer.hscore.bukkit.action.PlayerAction;
 import me.hsgamer.hscore.bukkit.action.builder.BukkitActionBuilder;
 import me.hsgamer.hscore.bukkit.utils.ColorUtils;
 import me.hsgamer.hscore.common.CollectionUtils;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,8 +31,8 @@ public ActionBuilder(BetterGUI plugin) {
   @Override
   public void load() {
     BukkitActionBuilder.register(this, plugin, ColorUtils::colorize);
-    register(OpenMenuAction::new, "open-menu", "open", "menu", "open-menu");
-    register(BackAction::new, "back-menu", "backmenu");
+    register(input -> new OpenMenuAction(plugin, input), "open-menu", "open", "menu", "open-menu");
+    register(input -> new BackAction(plugin, input), "back-menu", "backmenu");
     register(input -> new CloseMenuAction(input.getMenuElement().getMenu()), "close-menu", "closemenu");
     register(input -> new UpdateMenuAction(input.getMenuElement().getMenu()), "update-menu", "updatemenu");
   }
@@ -51,7 +55,7 @@ public List<Action> build(MenuElement menuElement, Object object) {
       .stream()
       .map(input -> Input.create(menuElement, input))
       .collect(Collectors.toList());
-    return build(inputs, input -> new PlayerAction(BetterGUI.getInstance(), input.getOriginalValue()));
+    return build(inputs, input -> new PlayerAction(JavaPlugin.getPlugin(BetterGUI.class), input.getOriginalValue()));
   }
 
   public interface Input extends ActionInput {

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

@@ -1,6 +1,7 @@
 package me.hsgamer.bettergui.builder;
 
 import io.github.projectunified.minelib.plugin.base.Loadable;
+import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.button.MenuButton;
 import me.hsgamer.bettergui.api.element.MenuElement;
 import me.hsgamer.bettergui.button.*;
@@ -17,20 +18,23 @@
  * The button builder
  */
 public final class ButtonBuilder extends FunctionalMassBuilder<ButtonBuilder.Input, MenuButton> implements Loadable {
-  public ButtonBuilder() {
+  private final BetterGUI plugin;
+
+  public ButtonBuilder(BetterGUI plugin) {
+    this.plugin = plugin;
   }
 
   @Override
   public void load() {
-    register(TemplateButton::new, "template");
-    register(WrappedDummyButton::new, "dummy", "raw");
+    register(input -> new TemplateButton(plugin, input), "template");
+    register(input -> new WrappedDummyButton(plugin, input), "dummy", "raw");
     register(EmptyButton::new, "empty");
     register(WrappedAirButton::new, "air");
-    register(WrappedPredicateButton::new, "predicate", "requirement");
-    register(WrappedListButton::new, "list");
-    register(WrappedAnimatedButton::new, "animated", "animate", "anim");
+    register(input -> new WrappedPredicateButton(plugin, input), "predicate", "requirement");
+    register(input -> new WrappedListButton(plugin, input), "list");
+    register(input -> new WrappedAnimatedButton(plugin, input), "animated", "animate", "anim");
     register(WrappedNullButton::new, "null", "none");
-    register(WrappedSimpleButton::new, "simple");
+    register(input -> new WrappedSimpleButton(plugin, input), "simple");
   }
 
   @Override

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

@@ -1,6 +1,7 @@
 package me.hsgamer.bettergui.builder;
 
 import io.github.projectunified.minelib.plugin.base.Loadable;
+import me.hsgamer.bettergui.BetterGUI;
 import me.hsgamer.bettergui.api.menu.Menu;
 import me.hsgamer.bettergui.menu.AddonMenu;
 import me.hsgamer.bettergui.menu.PredicateMenu;
@@ -15,14 +16,17 @@
  * The menu builder
  */
 public final class MenuBuilder extends FunctionalMassBuilder<Config, Menu> implements Loadable {
-  public MenuBuilder() {
+  private final BetterGUI plugin;
+
+  public MenuBuilder(BetterGUI plugin) {
+    this.plugin = plugin;
   }
 
   @Override
   public void load() {
-    register(SimpleMenu::new, "simple");
-    register(AddonMenu::new, "addon");
-    register(PredicateMenu::new, "predicate");
+    register(input -> new SimpleMenu(plugin, input), "simple");
+    register(input -> new AddonMenu(plugin, input), "addon");
+    register(input -> new PredicateMenu(plugin, input), "predicate");
   }
 
   @Override

src/main/java/me/hsgamer/bettergui/button/ActionButton.java

@@ -12,6 +12,7 @@
 import me.hsgamer.hscore.common.MapUtils;
 import me.hsgamer.hscore.task.BatchRunnable;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.Collections;
 import java.util.Map;
@@ -35,7 +36,7 @@ protected Button createButton(Map<String, Object> section) {
       Optional.ofNullable(keys.get("close-on-click")).map(String::valueOf).map(Boolean::parseBoolean).orElse(false)
     );
     return getButtonFunction(section).apply(clickEvent -> {
-      BukkitClickType clickType = ClickTypeUtils.getClickTypeFromEvent(clickEvent, BetterGUI.getInstance().get(MainConfig.class).isModernClickType());
+      BukkitClickType clickType = ClickTypeUtils.getClickTypeFromEvent(clickEvent, JavaPlugin.getPlugin(BetterGUI.class).get(MainConfig.class).isModernClickType());
       BatchRunnable batchRunnable = new BatchRunnable();
       clickActionHandler.apply(clickEvent.getWhoClicked().getUniqueId(), clickType, batchRunnable);
       SchedulerUtil.async().run(batchRunnable);