- skin fixes

- scrollbar fixed

Author: Smartin-b

common/src/main/java/smartin/miapi/client/gui/ScrollList.java

@@ -5,9 +5,9 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.text.Text;
-import net.minecraft.util.math.ColorHelper;
 import org.joml.Matrix4f;
 import org.joml.Vector4f;
+import smartin.miapi.client.gui.crafting.CraftingScreen;
 
 import java.util.List;
 
@@ -24,6 +24,10 @@ public class ScrollList extends InteractAbleWidget {
     private int maxScrollAmount;
     public boolean saveMode = true;
     boolean needsScrollbar = false;
+    public boolean alwaysEnableScrollbar = false;
+    int barWidth = 8;
+    boolean scrollbarDragged = false;
+    public boolean altDesign = false;
 
     /**
      * Constructs a new ScrollList with the given x and y coordinates, width, height,
@@ -84,8 +88,8 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
             if (startY + widget.getHeight() >= this.getY() && startY <= this.getY() + this.height - 1) {
                 widget.setY(startY);
                 widget.setX(this.getX());
-                if (needsScrollbar) {
-                    widget.setWidth(this.width - 5);
+                if (showScrollbar()) {
+                    widget.setWidth(this.width - barWidth);
                 } else {
                     widget.setWidth(this.width);
                 }
@@ -100,15 +104,39 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
             startY += widget.getHeight();
         }
 
-        if (needsScrollbar) {
-            int barHeight = Math.max(10, this.height * this.height / (this.maxScrollAmount + this.height));
-            int barY = this.getY() + 1 + (int) ((this.height - barHeight - 2) * (float) this.scrollAmount / this.maxScrollAmount);
-            int barX = this.getX() + this.width - 5;
-            drawContext.fill(barX, getY(), barX + 5, this.getY() + this.height, 0xFFCCCCCC);
-            drawContext.fill(barX, barY, barX + 5, barY + barHeight, ColorHelper.Argb.getArgb(255, 50, 50, 50));
+        if (showScrollbar()) {
+            int barX = this.getX() + this.width - barWidth;
+            float percentage = (float) this.scrollAmount / (float) maxScrollAmount;
+            renderScrollbarBackground(drawContext, mouseX, mouseY, delta, barX, barWidth);
+            renderScrollbarClickAble(drawContext, mouseX, mouseY, delta, barX, barWidth, percentage);
         }
     }
 
+    public void renderScrollbarBackground(DrawContext drawContext, int mouseX, int mouseY, float delta, int barX, int barWidth) {
+        int offsetAlt = 0;
+        if (altDesign) {
+            offsetAlt = 28;
+        }
+        drawTextureWithEdge(drawContext, CraftingScreen.BACKGROUND_TEXTURE, barX, getY(), 498 - offsetAlt, 96, 14, 15, barWidth, getHeight(), 512, 512, 3);
+    }
+
+    public void renderScrollbarClickAble(DrawContext drawContext, int mouseX, int mouseY, float delta, int barX, int barWidth, float percent) {
+        int height = (int) ((this.getHeight() - 17) * percent) + 1 + getY();
+        int offset = 0;
+        if (!needsScrollbar) {
+            offset = 16;
+        }
+        int offsetAlt = 0;
+        if (altDesign) {
+            offsetAlt = 28;
+        }
+        drawTextureWithEdge(drawContext, CraftingScreen.BACKGROUND_TEXTURE, barX, height, 498 - 14 - offsetAlt, 96 + offset, 14, 15, barWidth, 15, 512, 512, 3);
+    }
+
+    private boolean showScrollbar() {
+        return needsScrollbar || alwaysEnableScrollbar;
+    }
+
     @Override
     public void renderHover(DrawContext drawContext, int mouseX, int mouseY, float delta) {
         if (isMouseOver(mouseX, mouseY)) {
@@ -166,10 +194,11 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
             }
 
             boolean clicked = false;
-            if (needsScrollbar) {
+            if (showScrollbar()) {
                 if (isMouseOver(mouseX, mouseY)) {
-                    if (mouseY > this.getX() + this.width - 5 && mouseY < this.getX() + this.width) {
-                        //TODO:drag motion?
+                    if (mouseX > this.getX() + this.width - barWidth && mouseX < this.getX() + this.width) {
+                        scrollbarDragged = true;
+                        return true;
                     }
                 }
             }
@@ -186,11 +215,37 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
         return false;
     }
 
+    @Override
+    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+        if (mouseX > this.getX() + this.width - barWidth && mouseX < this.getX() + this.width) {
+            if (mouseY < (double) this.getY()) {
+                this.scrollAmount = 0;
+                return true;
+            } else if (mouseY > (double) (this.getY() + this.height)) {
+                this.scrollAmount = maxScrollAmount;
+                return true;
+            } else {
+                double i = Math.min(1, Math.max(0, (mouseY - getY()) / (getHeight() - 10)));
+                this.scrollAmount = (int) (i * maxScrollAmount);
+                return true;
+            }
+        }
+        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+    }
+
     @Override
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
         if (this.widgets == null) {
             return false;
         }
+        if (showScrollbar()) {
+            if (isMouseOver(mouseX, mouseY)) {
+                if (mouseX > this.getX() + this.width - barWidth && mouseX < this.getX() + this.width) {
+                    scrollbarDragged = false;
+                    return true;
+                }
+            }
+        }
 
         boolean released = false;
 

common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatDisplay.java

@@ -17,7 +17,6 @@
 import smartin.miapi.client.gui.InteractAbleWidget;
 import smartin.miapi.client.gui.ScrollList;
 import smartin.miapi.client.gui.TransformableWidget;
-import smartin.miapi.client.gui.crafting.statdisplay.*;
 import smartin.miapi.modules.properties.*;
 
 import java.util.ArrayList;
@@ -160,6 +159,8 @@ public StatDisplay(int x, int y, int width, int height) {
         transformableWidget = new TransformableWidget(x, y, width, height, Text.empty());
         boxList = new BoxList(x , y, width, height, Text.empty(), new ArrayList<>());
         ScrollList list = new ScrollList(x , y , width, height, List.of(boxList));
+        list.altDesign = true;
+        list.alwaysEnableScrollbar = true;
         transformableWidget.addChild(list);
         transformableWidget.rawProjection = new Matrix4f();
         //transformableWidget.rawProjection.scale(0.5f, 0.5f, 0.5f);

common/src/main/java/smartin/miapi/modules/MiapiPermissions.java

@@ -39,6 +39,7 @@ public static List<String> getPerms(PlayerEntity player){
             return playerPerms.get(player);
         }
         List<String> perms = getPerms(player.getUuid());
+        perms.add("user");
         playerPerms.put(player,perms);
         return perms;
     }

common/src/main/resources/assets/miapi/textures/block/gui/crafter/background.png

@@ -32,7 +32,7 @@
     },
     "condition": {
         "type": "miapi_perm",
-        "perms": ["supporter","skyrim","goldbrand"]
+        "perms": ["user","supporter","skyrim","goldbrand"]
     },
     "texture": {
         "texture": "miapi:textures/skin/skyrim/goldbrand.png",

common/src/main/resources/data/miapi/skins/module/skyrim/goldbrand.json

@@ -28,6 +28,6 @@
     },
     "condition": {
         "type": "miapi_perm",
-        "perms": ["supporter","star_wars","anakin","lightsaber_hilt"]
+        "perms": ["user","supporter","star_wars","anakin","lightsaber_hilt"]
     }
 }