From a7836ef624c67be441082898cbd06ba199513780 Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 18 Jul 2024 19:30:44 +0200 Subject: [PATCH] feat(resource-pack-entry-widgets): do not provide default width/height --- .../entrywidgets/api/v0/ResourcePackEntryWidget.java | 8 ++------ .../jfronny/libjf/entrywidgets/test/TestWidget1.java | 10 ++++++++++ .../jfronny/libjf/entrywidgets/test/TestWidget2.java | 10 ++++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/libjf-resource-pack-entry-widgets-v0/src/client/java/io/gitlab/jfronny/libjf/entrywidgets/api/v0/ResourcePackEntryWidget.java b/libjf-resource-pack-entry-widgets-v0/src/client/java/io/gitlab/jfronny/libjf/entrywidgets/api/v0/ResourcePackEntryWidget.java index 9d55216..6b49488 100644 --- a/libjf-resource-pack-entry-widgets-v0/src/client/java/io/gitlab/jfronny/libjf/entrywidgets/api/v0/ResourcePackEntryWidget.java +++ b/libjf-resource-pack-entry-widgets-v0/src/client/java/io/gitlab/jfronny/libjf/entrywidgets/api/v0/ResourcePackEntryWidget.java @@ -39,9 +39,7 @@ public interface ResourcePackEntryWidget { * @param pack the pack to render the widget for * @return the width of the widget */ - default int getWidth(ResourcePackOrganizer.Pack pack) { - return 20; - } + int getWidth(ResourcePackOrganizer.Pack pack); /** * Gets the height of this widget. @@ -50,9 +48,7 @@ public interface ResourcePackEntryWidget { * @param rowHeight the height of the row containing the widget * @return the height of the widget */ - default int getHeight(ResourcePackOrganizer.Pack pack, int rowHeight) { - return 20; - } + int getHeight(ResourcePackOrganizer.Pack pack, int rowHeight); /** * Gets the Y position of this widget relative to the top of the row. diff --git a/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget1.java b/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget1.java index 0b1edb0..f244897 100644 --- a/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget1.java +++ b/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget1.java @@ -10,6 +10,16 @@ public class TestWidget1 implements ResourcePackEntryWidget { return (int) ((System.currentTimeMillis() % 5_000) / 100 + 10); } + @Override + public int getHeight(ResourcePackOrganizer.Pack pack, int rowHeight) { + return 16; + } + + @Override + public int getY(ResourcePackOrganizer.Pack pack, int rowHeight) { + return 14; + } + @Override public int getXMargin(ResourcePackOrganizer.Pack pack) { return (int) (Math.abs((System.currentTimeMillis() % 1_200) / 50 - 12) + 5); diff --git a/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget2.java b/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget2.java index e64c15f..6e88da7 100644 --- a/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget2.java +++ b/libjf-resource-pack-entry-widgets-v0/src/testmod/java/io/gitlab/jfronny/libjf/entrywidgets/test/TestWidget2.java @@ -10,6 +10,16 @@ public class TestWidget2 implements ResourcePackEntryWidget { return System.currentTimeMillis() % 1_000 < 500; } + @Override + public int getWidth(ResourcePackOrganizer.Pack pack) { + return 20; + } + + @Override + public int getHeight(ResourcePackOrganizer.Pack pack, int rowHeight) { + return 20; + } + @Override public void render(ResourcePackOrganizer.Pack pack, DrawContext context, int x, int y, boolean hovered, float tickDelta) { context.fill(x, y, x + getWidth(pack), y + getHeight(pack, 20), hovered ? 0x80FF0080 : 0x80FF0000);