Refactored texture select screen hierarchy and texture widget (#5)

src/main/java/io/github/jumperonjava/customcursor/CursorEditScreen.java

@@ -1,10 +1,7 @@
 package io.github.jumperonjava.customcursor;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import io.github.jumperonjava.customcursor.util.AskScreen;
-import io.github.jumperonjava.customcursor.util.FolderTextureAskList;
-import io.github.jumperonjava.customcursor.util.SliderWidget;
-import io.github.jumperonjava.customcursor.util.VersionFunctions;
+import io.github.jumperonjava.customcursor.util.*;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -61,12 +58,10 @@ protected void init() {
         var confrmButton = new ButtonWidget.Builder(Text.translatable("customcursor.edit.confirm"), this::confirm);
         var cancelButton = new ButtonWidget.Builder(Text.translatable("customcursor.edit.cancel"), (f) -> close());
         var folderButton = new ButtonWidget.Builder(Text.translatable("customcursor.edit.folder"), (b) -> {
-            AskScreen.ask(
+            FolderTextureAskList.ask(
                     new FolderTextureAskList(
                             CustomCursorInit.TEXTURE_FOLDER,
-                            this::setIdentifier,
-                            () -> {
-                            }
+                            this::setIdentifier
                     )
             );
         });

src/main/java/io/github/jumperonjava/customcursor/util/FolderTextureAskList.java

@@ -1,6 +1,10 @@
 package io.github.jumperonjava.customcursor.util;
 
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -9,23 +13,78 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-public class FolderTextureAskList extends TextureListAsk{
+public class FolderTextureAskList extends Screen {
+    public static final int gap = 2;
     private final TextureFolder folder;
+    private final Consumer<Identifier> onSuccess;
+
+    ScrollListWidget list;
+
+    protected Identifier EMPTY_TEXTURE = Identifier.of("minecraft", "empty");
     private List<Identifier> textures = new ArrayList<>();
 
-    public FolderTextureAskList(TextureFolder folder, Consumer<Identifier> onSuccess, Runnable onFail) {
-        super(onSuccess, onFail);
+    private Identifier selectedTexture = EMPTY_TEXTURE;
+
+    private Screen parent;
+    private String lastFilter = "";
+
+    public FolderTextureAskList(TextureFolder folder, Consumer<Identifier> onSuccess) {
+        super(Text.empty());
+        this.onSuccess = onSuccess;
         this.folder = folder;
     }
 
+    public static void ask(FolderTextureAskList askScreen) {
+        var client = MinecraftClient.getInstance();
+        var currentScreen = client.currentScreen;
+        if (currentScreen == null) {
+            client.setScreen(askScreen);
+            return;
+        }
+        client.setScreen(askScreen);
+        askScreen.parent = currentScreen;
+    }
     @Override
     protected void init() {
-        super.init();
-        var cancel = new ButtonWidget.Builder(Text.translatable("customcursor.folder.openfolder"), b->openCursorFolder())
-                .dimensions((int) (240+gap*2),height-20-gap,100,20).build();
-        addDrawableChild(cancel);
+        // Initializations
+        list = new ScrollListWidget(client, width, height - 64, 0, 22, 40);
+        var search = new TextFieldWidget(client.textRenderer, 0, 0, width, 20, Text.empty());
+        var accept = new ButtonWidget.Builder(Text.translatable("customcursor.folder.accept"), b1 -> {
+            if (selectedTexture != EMPTY_TEXTURE)
+                success(selectedTexture);
+        });
+        var cancel1 = new ButtonWidget.Builder(Text.translatable("customcursor.folder.cancel"), b1 -> closeScreen());
+        var cancel = new ButtonWidget.Builder(Text.translatable("customcursor.folder.openfolder"), b -> openCursorFolder());
+
+        accept.dimensions(40 + gap, height - 20 - gap, 100, 20);
+        cancel1.dimensions((int) (140 + gap * 1.5), height - 20 - gap, 100, 20);
+        cancel.dimensions(240 + gap * 2, height - 20 - gap, 100, 20);
+
+        // Adding Widgets
+        refreshListByFilter("");
+        addDrawableChild(list);
+        search.setChangedListener(this::refreshListByFilter);
+        addDrawableChild(search);
+        addDrawableChild(accept.build());
+        addDrawableChild(cancel1.build());
+        addDrawableChild(cancel.build());
+        addDrawableChild(((context, mouseX, mouseY, delta) ->
+        {
+            var texture = selectedTexture == EMPTY_TEXTURE ? Identifier.of("minecraft", "textures/item/barrier.png") : selectedTexture;
+            TextureWidget.render(context,texture, gap / 2, height - 40 - gap / 2, 40, 40);
+        }));
+
+        setTexturesCallback(this::setTextures);
+        addDrawableChild(((context, mouseX, mouseY, delta) -> context.drawText(
+                textRenderer,
+                Text.translatable("customcursor.folder.selected").append(": ").append(selectedTexture.toString()),
+                45,
+                height - 30 - 6 - gap / 2,
+                0xFFFFFFFF,
+                true)));
     }
 
+
     private void openCursorFolder() {
         Util.getOperatingSystem().open(folder.path.toFile());
     }
@@ -39,4 +98,47 @@ public void setTexturesCallback(Consumer<List<Identifier>> consumer) {
         });
 
     }
+
+    public void setTextures(List<Identifier> identifiers) {
+        this.textures = identifiers;
+        refreshListByFilter(lastFilter);
+    }
+
+    private void refreshListByFilter(String s) {
+        lastFilter = s;
+        list.children().clear();
+        //? if < 1.21.4 {
+        list.setScrollAmount(0);
+         //?} else {
+        /*list.setScrollY(0);
+        *///?}
+        for (var key : textures) {
+            if (key == null) continue;
+            var id = key.toString();
+            if (!id.toLowerCase().contains(s.toLowerCase()))
+                continue;
+            Identifier finalKey = key;
+            var entry = new ScrollListWidget.ScrollListEntry(key, () -> {
+                this.selectedTexture = finalKey;
+            });
+            list.addEntry(entry);
+        }
+    }
+
+    //? if <= 1.20.1 {
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        renderBackground(context);
+        super.render(context, mouseX, mouseY, delta);
+    }
+    //?}
+
+    public void success(Identifier ret) {
+        onSuccess.accept(ret);
+        this.closeScreen();
+    }
+
+    private void closeScreen() {
+        MinecraftClient.getInstance().setScreen(this.parent);
+    }
 }

src/main/java/io/github/jumperonjava/customcursor/util/ScrollListWidget.java

@@ -80,7 +80,7 @@ public void render(DrawContext context,
                            int mouseX, int mouseY,
                            boolean hovered,
                            float delta) {
-            new TextureWidget(key,x,y,entryHeight,entryHeight).render(context, mouseX, mouseY, delta);
+            TextureWidget.render(context,key,x,y,entryHeight,entryHeight);
             context.drawText(MinecraftClient.getInstance().textRenderer,key.toString(),x+entryHeight+5,y+entryHeight/2-5,0xFFFFFFFF,true);
         }