finish simplifying menu variables

Author: HSGamer

pom.xml

@@ -15,7 +15,7 @@
 
   <properties>
     <java.version>1.8</java.version>
-    <core.version>4.8.1</core.version>
+    <core.version>4.9.0</core.version>
     <minelib.version>1.3.0</minelib.version>
     <craftux.version>1.6.3</craftux.version>
     <craftitem.version>1.5.0</craftitem.version>

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

@@ -22,7 +22,7 @@ public class ClickActionHandler {
   /**
    * Create a new click action handler
    *
-   * @param menuElement         the menu element
+   * @param menuElement  the menu element
    * @param actionMap    the action map
    * @param closeOnClick if the menu should close when the player click
    */
@@ -35,7 +35,7 @@ public ClickActionHandler(MenuElement menuElement, Map<BukkitClickType, ActionAp
   /**
    * Create a new click action handler
    *
-   * @param menuElement         the menu element
+   * @param menuElement  the menu element
    * @param o            the action value
    * @param closeOnClick if the menu should close when the player click
    */

src/main/java/me/hsgamer/bettergui/api/replacer/LookupStringReplacer.java

@@ -1,6 +1,5 @@
 package me.hsgamer.bettergui.api.replacer;
 
-import me.hsgamer.bettergui.api.element.MenuElement;
 import me.hsgamer.hscore.common.Pair;
 import me.hsgamer.hscore.common.StringReplacer;
 import org.jetbrains.annotations.NotNull;

src/main/java/me/hsgamer/bettergui/argument/type/SingleArgumentProcessor.java

@@ -6,8 +6,6 @@
 import me.hsgamer.hscore.common.Pair;
 import me.hsgamer.hscore.common.StringReplacer;
 import me.hsgamer.hscore.task.BatchRunnable;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 import java.util.stream.Collectors;

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

@@ -24,7 +24,7 @@ public LegacyMenuButton(ButtonBuilder.Input input) {
   @Override
   protected WrappedPredicateButton.PredicateClickButton createButton(Map<String, Object> section) {
     Map<String, Object> keys = MapUtils.createLowercaseStringObjectMap(section);
-    WrappedSimpleButton simpleButton = new WrappedSimpleButton(new ButtonBuilder.Input(getMenu(), getName(), section));
+    WrappedSimpleButton simpleButton = new WrappedSimpleButton(new ButtonBuilder.Input(this, getName(), section));
     PredicateButton predicateButton = new PredicateButton();
     predicateButton.setButton(simpleButton);
     return WrappedPredicateButton.getPredicateButton(keys, this, checked, predicateButton);

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

@@ -24,7 +24,7 @@ public TemplateButton(ButtonBuilder.Input input) {
   @Override
   protected MenuButton createButton(Map<String, Object> section) {
     finalOptions = BetterGUI.getInstance().get(TemplateConfig.class).getValues(section, "type");
-    return BetterGUI.getInstance().get(ButtonBuilder.class).build(new ButtonBuilder.Input(getMenu(), getName(), finalOptions)).orElse(null);
+    return BetterGUI.getInstance().get(ButtonBuilder.class).build(new ButtonBuilder.Input(this, getName(), finalOptions)).orElse(null);
   }
 
   @Override

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

@@ -75,11 +75,11 @@ protected PredicateClickButton createButton(Map<String, Object> section) {
     PredicateButton predicateButton = new PredicateButton();
     Optional.ofNullable(keys.get("button"))
       .flatMap(MapUtils::castOptionalStringObjectMap)
-      .flatMap(subsection -> BetterGUI.getInstance().get(ButtonBuilder.class).build(new ButtonBuilder.Input(getMenu(), "button", subsection)))
+      .flatMap(subsection -> BetterGUI.getInstance().get(ButtonBuilder.class).build(new ButtonBuilder.Input(this, "button", subsection)))
       .ifPresent(predicateButton::setButton);
     Optional.ofNullable(keys.get("fallback"))
       .flatMap(MapUtils::castOptionalStringObjectMap)
-      .flatMap(subsection -> BetterGUI.getInstance().get(ButtonBuilder.class).build(new ButtonBuilder.Input(getMenu(), "fallback", subsection)))
+      .flatMap(subsection -> BetterGUI.getInstance().get(ButtonBuilder.class).build(new ButtonBuilder.Input(this, "fallback", subsection)))
       .ifPresent(predicateButton::setFallbackButton);
 
     return getPredicateButton(keys, this, checked, predicateButton);

src/main/java/me/hsgamer/bettergui/menu/BaseInventoryMenu.java

@@ -149,8 +149,7 @@ protected BaseInventoryMenu(Config config) {
 
   @Override
   public StringReplacer getStringReplacer() {
-    return StringReplacer.combine(
-      super.getStringReplacer(),
+    return StringReplacer.either(
       (LookupStringReplacer) original -> {
         if (defaultButton instanceof MenuButton) {
           MenuButton menuButton = (MenuButton) defaultButton;
@@ -161,7 +160,8 @@ public StringReplacer getStringReplacer() {
           }
         }
         return null;
-      }
+      },
+      super.getStringReplacer()
     );
   }
 

src/main/java/me/hsgamer/bettergui/menu/BaseMenu.java

@@ -1,8 +1,8 @@
 package me.hsgamer.bettergui.menu;
 
 import me.hsgamer.bettergui.action.ActionApplier;
-import me.hsgamer.bettergui.api.replacer.LookupStringReplacer;
 import me.hsgamer.bettergui.api.menu.StandardMenu;
+import me.hsgamer.bettergui.api.replacer.LookupStringReplacer;
 import me.hsgamer.bettergui.api.requirement.Requirement;
 import me.hsgamer.bettergui.argument.ArgumentHandler;
 import me.hsgamer.bettergui.config.MessageConfig;
@@ -145,8 +145,7 @@ public ArgumentHandler getArgumentHandler() {
 
   @Override
   public StringReplacer getStringReplacer() {
-    return StringReplacer.combine(
-      super.getStringReplacer(),
+    return StringReplacer.either(
       (LookupStringReplacer) original -> {
         if (original.startsWith("view") && viewRequirementApplier != null) {
           return Pair.of(viewRequirementApplier.getStringReplacer(), original.substring("view".length()));
@@ -158,7 +157,8 @@ public StringReplacer getStringReplacer() {
           return Pair.of(argumentHandler.getStringReplacer(), original.substring("arg".length()));
         }
         return null;
-      }
+      },
+      super.getStringReplacer()
     );
   }
 }

src/main/java/me/hsgamer/bettergui/menu/PredicateMenu.java

@@ -1,8 +1,8 @@
 package me.hsgamer.bettergui.menu;
 
 import me.hsgamer.bettergui.BetterGUI;
-import me.hsgamer.bettergui.api.replacer.LookupStringReplacer;
 import me.hsgamer.bettergui.api.menu.StandardMenu;
+import me.hsgamer.bettergui.api.replacer.LookupStringReplacer;
 import me.hsgamer.bettergui.api.requirement.Requirement;
 import me.hsgamer.bettergui.argument.ArgumentHandler;
 import me.hsgamer.bettergui.manager.MenuCommandManager;
@@ -131,14 +131,14 @@ public void closeAll() {
 
   @Override
   public StringReplacer getStringReplacer() {
-    return StringReplacer.combine(
-      super.getStringReplacer(),
+    return StringReplacer.either(
       (LookupStringReplacer) original -> {
         if (original.startsWith("arg")) {
           return Pair.of(argumentHandler.getStringReplacer(), original.substring("arg".length()));
         }
         return null;
-      }
+      },
+      super.getStringReplacer()
     );
   }