Improved paging

Added nexus (my private instance)

Signed-off-by: DeathsGun <deathsgun@protonmail.com>

Author: DeathsGun

build.gradle

@@ -1,3 +1,5 @@
+//file:noinspection GroovyAssignabilityCheck
+//file:noinspection GroovyAccessibility
 plugins {
 	id "fabric-loom" version "0.8-SNAPSHOT"
 	id "maven-publish"
@@ -80,6 +82,13 @@ publishing {
 	}
 
 	repositories {
-		mavenLocal()
+		maven {
+			url = "http://vault:8081/repository/maven-snapshots/"
+			allowInsecureProtocol true
+			credentials {
+				username "buildtool"
+				password project.buildtools_pw
+			}
+		}
 	}
 }

gradle.properties

@@ -22,7 +22,7 @@ minecraft_version=1.17
 yarn_mappings=1.17+build.6
 loader_version=0.11.3
 # Mod Properties
-mod_version=1.0.0
+mod_version=1.0.0-SNAPSHOT
 maven_group=xyz.deathsgun
 archives_base_name=modmanager
 # Dependencies

settings.gradle

@@ -23,3 +23,4 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+rootProject.name = "modmanager"

src/main/java/xyz/deathsgun/modmanager/gui/ModsOverviewScreen.java

@@ -20,11 +20,8 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.input.KeyboardInput;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.TranslatableText;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import xyz.deathsgun.modmanager.gui.widget.CategoryListEntry;
 import xyz.deathsgun.modmanager.gui.widget.CategoryListWidget;
 import xyz.deathsgun.modmanager.gui.widget.ModListEntry;
@@ -43,6 +40,8 @@ public class ModsOverviewScreen extends Screen implements IListScreen {
     private TextFieldWidget searchBox;
     private int paneWidth;
     private int rightPaneX;
+    private ButtonWidget previousPage;
+    private ButtonWidget nextPage;
 
     public ModsOverviewScreen(Screen previousScreen) {
         super(new TranslatableText("modmanager.title"));
@@ -67,9 +66,9 @@ protected void init() {
         this.categoryListWidget.init();
         this.modListWidget.init();
 
-        this.addDrawableChild(new ButtonWidget(rightPaneX, this.height - 30, modListWidth / 2 - 10, 20,
+        this.previousPage = this.addDrawableChild(new ButtonWidget(rightPaneX, this.height - 30, modListWidth / 2 - 10, 20,
                 new TranslatableText("modmanager.page.previous"), button -> this.modListWidget.showPreviousPage()));
-        this.addDrawableChild(new ButtonWidget(rightPaneX + modListWidth / 2, this.height - 30, modListWidth / 2, 20,
+        this.nextPage = this.addDrawableChild(new ButtonWidget(rightPaneX + modListWidth / 2, this.height - 30, modListWidth / 2, 20,
                 new TranslatableText("modmanager.page.next"), button -> this.modListWidget.showNextPage()));
     }
 
@@ -91,6 +90,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
     @Override
     public void tick() {
         this.searchBox.tick();
+        this.nextPage.active = this.modListWidget.getEntryCount() >= this.modListWidget.getLimit();
     }
 
     @Override
@@ -116,7 +116,9 @@ public <E> void updateSelectedEntry(Object widget, E entry) {
                     Objects.requireNonNull(this.client).openScreen(new ModDetailScreen(this, ((ModListEntry) entry).getMod()));
                     return;
                 }
-                this.selectedMod = (ModListEntry) entry;
+                if (entry instanceof ModListEntry) {
+                    this.selectedMod = (ModListEntry) entry;
+                }
             }
         }
     }

src/main/java/xyz/deathsgun/modmanager/gui/widget/ModListWidget.java

@@ -68,11 +68,16 @@ public void searchMods(String query) {
             this.category = null;
             ModManager.getModProvider().getMods(query, page, limit)
                     .forEach(mod -> this.addEntry(new ModListEntry(this, mod)));
+            this.query = query;
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    public int getLimit() {
+        return limit;
+    }
+
     private void clearMods() {
         this.mods.clear();
         for (int i = 0; i < this.getEntryCount(); i++) {

src/main/java/xyz/deathsgun/modmanager/gui/widget/better/BetterListWidget.java

@@ -185,6 +185,10 @@ public boolean isSelectedEntry(BetterListEntry<E> entry) {
     }
 
 
+    public int getEntryCount() {
+        return super.getEntryCount();
+    }
+
     public static abstract class BetterListEntry<E extends BetterListWidget.BetterListEntry<E>> extends AlwaysSelectedEntryListWidget.Entry<E> {
 
         protected final BetterListWidget<E> list;