Working on BrowserGUI fixes (Search Button not working)

Im-Fran · TheProgramSrc · commit e7f1a632eca2 · 2020-10-14T19:51:09.000-03:00
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>xyz.theprogramsrc</groupId>
   <artifactId>SuperCoreAPI</artifactId>
   <name>SuperCoreAPI</name>
-  <version>4.0.0</version>
+  <version>4.2.10_BETA4</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <defaultGoal>clean package</defaultGoal>
@@ -14,7 +14,7 @@
         <directory>src/main/resources</directory>
       </resource>
     </resources>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.16.1-R0.1-SNAPSHOT</version>
+      <version>1.16.3-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>net.md-5</groupId>
       <artifactId>bungeecord-api</artifactId>
-      <version>1.16-R0.2</version>
+      <version>1.16-R0.3</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.15.2-R0.1-20200625.172449-18</version>
+      <version>1.16.3-R0.1-20201003.002207-3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -151,35 +151,15 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>RELEASE</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>junit-jupiter-api</artifactId>
-          <groupId>org.junit.jupiter</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>junit-jupiter-params</artifactId>
-          <groupId>org.junit.jupiter</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>junit-jupiter-engine</artifactId>
-          <groupId>org.junit.jupiter</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
   <distributionManagement>
     <repository>
-      <id>codemc-releases</id>
-      <url>https://repo.codemc.io/repository/maven-releases/</url>
+      <id>theprogramsrc-releases</id>
+      <url>https://repo.theprogramsrc.xyz/repository/maven-releases/</url>
     </repository>
     <snapshotRepository>
-      <id>codemc-snapshots</id>
-      <url>https://repo.codemc.io/repository/maven-snapshots/</url>
+      <id>theprogramsrc-snapshots</id>
+      <url>https://repo.theprogramsrc.xyz/repository/maven-snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
   <properties>
diff --git a/src/main/java/xyz/theprogramsrc/supercoreapi/plugin/SpigotPlugin.java b/src/main/java/xyz/theprogramsrc/supercoreapi/plugin/SpigotPlugin.java
@@ -1,26 +1,57 @@
 package xyz.theprogramsrc.supercoreapi.plugin;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.entity.Player;
+import xyz.theprogramsrc.supercoreapi.spigot.commands.CommandResult;
+import xyz.theprogramsrc.supercoreapi.spigot.commands.SpigotCommand;
+import xyz.theprogramsrc.supercoreapi.spigot.guis.action.ClickAction;
+import xyz.theprogramsrc.supercoreapi.spigot.guis.precreated.MaterialBrowser;
+import xyz.theprogramsrc.supercoreapi.spigot.utils.SpigotConsole;
+import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
+
+public class SpigotPlugin extends xyz.theprogramsrc.supercoreapi.spigot.SpigotPlugin {
 
-public class SpigotPlugin extends JavaPlugin {
 
     @Override
-    public void onEnable() {
-        this.log("&3SuperCoreAPI &awas loaded as .jar file");
+    public void onPluginLoad() {
+
     }
 
     @Override
-    public void onDisable() {
-        this.log("&3SuperCoreAPI &awas disabled");
+    public void onPluginEnable() {
+        new Command();
     }
 
-    private void log(String s){
-        Bukkit.getConsoleSender().sendMessage(c(s));
+    @Override
+    public void onPluginDisable() {
+
     }
 
-    private String c(String s){
-        return ChatColor.translateAlternateColorCodes('&', s);
+    static class Command extends SpigotCommand {
+
+        @Override
+        public String getCommand() {
+            return "scapi";
+        }
+
+        @Override
+        public CommandResult onPlayerExecute(Player player, String[] args) {
+            new MaterialBrowser(player){
+                @Override
+                public void onBack(ClickAction clickAction) {
+                    this.close();
+                }
+
+                @Override
+                public void onSelect(ClickAction clickAction, XMaterial xMaterial) {
+                    clickAction.getPlayer().getInventory().addItem(xMaterial.parseItem());
+                }
+            }.open();
+            return CommandResult.COMPLETED;
+        }
+
+        @Override
+        public CommandResult onConsoleExecute(SpigotConsole console, String[] args) {
+            return CommandResult.COMPLETED;
+        }
     }
 }
diff --git a/src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/BrowserGUI.java b/src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/BrowserGUI.java
@@ -1,15 +1,14 @@
 package xyz.theprogramsrc.supercoreapi.spigot.guis;
 
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import xyz.theprogramsrc.supercoreapi.global.translations.Base;
-import xyz.theprogramsrc.supercoreapi.global.utils.Utils;
 import xyz.theprogramsrc.supercoreapi.spigot.dialog.Dialog;
 import xyz.theprogramsrc.supercoreapi.spigot.guis.action.ClickAction;
 import xyz.theprogramsrc.supercoreapi.spigot.guis.objects.GUIRows;
 import xyz.theprogramsrc.supercoreapi.spigot.items.SimpleItem;
 
-import java.util.Arrays;
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,16 +34,34 @@ protected GUIRows getRows() {
     @Override
     public GUIButton[] getButtons() {
         OBJ[] objs = this.getObjects();
-        List<OBJ> objectsFound = Arrays.stream(objs).filter(o-> this.searchTerm == null || new SimpleItem(this.getButton(o).getItemStack()).getDisplayName().toLowerCase().contains(this.searchTerm.toLowerCase())).collect(Collectors.toList());
-        int index0 = this.page * maxItemsPerPage;
-        int index1 = Math.min(index0 + maxItemsPerPage, objectsFound.size());
-        List<GUIButton> buttons = objectsFound.subList(index0, index1).stream().map(this::getButton).collect(Collectors.toList());
+        List<OBJ> objectsFound = new ArrayList<>();
+        for (OBJ obj : objs) {
+            if(obj != null){
+                if(this.searchTerm == null){
+                    objectsFound.add(obj);
+                }else{
+                    GUIButton button = this.getButton(obj);
+                    String name = ChatColor.stripColor(new SimpleItem(button.getItemStack()).getDisplayName()).toLowerCase();
+                    if(name.contains(ChatColor.stripColor(this.searchTerm.toLowerCase()))){
+                        objectsFound.add(obj);
+                    }
+                }
+            }
+        }
+        int index0 = this.page * this.maxItemsPerPage;
+        int index1 = Math.min(index0 + this.maxItemsPerPage, objectsFound.size());
+        int maxPages = (int)Math.round(Math.ceil((double)objectsFound.size() / (double)maxItemsPerPage));
+        List<GUIButton> buttons1 = new ArrayList<>();
         int slot = 0;
-        for(Iterator<GUIButton> it = buttons.iterator(); it.hasNext(); ++slot){
-            it.next().setSlot(slot);
+        for (GUIButton b : objectsFound.subList(index0, index1).stream().map(this::getButton).collect(Collectors.toList())) {
+            b.setSlot(slot);
+            buttons1.add(b);
+            slot++;
         }
+        List<GUIButton> buttons = new ArrayList<>(buttons1);
+        buttons1.clear(); // Save memory
+        objectsFound.clear(); // Save memory
 
-        int maxPages = (int)Math.round(Math.ceil((double)objectsFound.size() / (double)maxItemsPerPage));
         buttons.add(new GUIButton(49, this.searchTerm == null ? this.getPreloadedItems().getSearchItem() : this.getPreloadedItems().getEndSearchItem()).setAction(a -> {
             if(this.searchTerm == null){
                 new Dialog(this.getPlayer()){
@@ -66,17 +83,16 @@ public String getActionbar() {
 
                     @Override
                     public boolean onResult(String playerInput) {
-                        this.getSpigotTasks().runTask(()-> {
-                            BrowserGUI.this.searchTerm = playerInput;
-                            BrowserGUI.this.page = 0;
-                            BrowserGUI.this.open();
-                        });
+                        BrowserGUI.this.searchTerm = playerInput;
                         return true;
                     }
-                };
+                }.setRecall(player ->{
+                    this.page = 0;
+                    this.open();
+                });
             }else{
-                this.page = 0;
                 this.searchTerm = null;
+                this.page = 0;
                 this.open();
             }
         }));
@@ -95,7 +111,9 @@ public boolean onResult(String playerInput) {
             }));
         }
 
-        return buttons.stream().filter(Utils::nonNull).toArray(GUIButton[]::new);
+        GUIButton[] guiButtons = new GUIButton[buttons.size()];
+        guiButtons = buttons.toArray(guiButtons);
+        return guiButtons;
     }
 
     /**
diff --git a/src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/GUI.java b/src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/GUI.java
