From 2a05170b93d9522cc9d54d954a783dd6a7f01c1c Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sat, 9 Sep 2023 13:59:24 +0300 Subject: Initial port to 1.20.2 --- .../libgui/textures/gui/sprites/widget/button_dark.png | Bin 0 -> 3228 bytes .../textures/gui/sprites/widget/button_dark.png.mcmeta | 10 ++++++++++ .../textures/gui/sprites/widget/button_disabled_dark.png | Bin 0 -> 2107 bytes .../gui/sprites/widget/button_disabled_dark.png.mcmeta | 10 ++++++++++ .../gui/sprites/widget/button_highlighted_dark.png | Bin 0 -> 3233 bytes .../sprites/widget/button_highlighted_dark.png.mcmeta | 10 ++++++++++ .../textures/gui/sprites/widget/slider_handle_dark.png | Bin 0 -> 748 bytes .../gui/sprites/widget/slider_handle_dark.png.mcmeta | 15 +++++++++++++++ .../sprites/widget/slider_handle_highlighted_dark.png | Bin 0 -> 748 bytes .../widget/slider_handle_highlighted_dark.png.mcmeta | 15 +++++++++++++++ .../assets/libgui/textures/widget/dark_widgets.png | Bin 5798 -> 0 bytes 11 files changed, 60 insertions(+) create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta delete mode 100644 src/main/resources/assets/libgui/textures/widget/dark_widgets.png (limited to 'src/main/resources/assets/libgui') diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png new file mode 100644 index 0000000..437de7c Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta new file mode 100644 index 0000000..bcf5fc2 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 200, + "height": 20, + "border": 3 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png new file mode 100644 index 0000000..83e5146 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta new file mode 100644 index 0000000..bcf5fc2 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 200, + "height": 20, + "border": 3 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png new file mode 100644 index 0000000..59f0561 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta new file mode 100644 index 0000000..bcf5fc2 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 200, + "height": 20, + "border": 3 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png new file mode 100644 index 0000000..f843714 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta new file mode 100644 index 0000000..dab004a --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta @@ -0,0 +1,15 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 8, + "height": 20, + "border": { + "left": 2, + "top": 2, + "right": 2, + "bottom": 3 + } + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png new file mode 100644 index 0000000..dff8794 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta new file mode 100644 index 0000000..dab004a --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta @@ -0,0 +1,15 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 8, + "height": 20, + "border": { + "left": 2, + "top": 2, + "right": 2, + "bottom": 3 + } + } + } +} diff --git a/src/main/resources/assets/libgui/textures/widget/dark_widgets.png b/src/main/resources/assets/libgui/textures/widget/dark_widgets.png deleted file mode 100644 index 8482d76..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/dark_widgets.png and /dev/null differ -- cgit From c891cde665a8f10c9264951085173c37e7aad9fe Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sat, 9 Sep 2023 14:07:49 +0300 Subject: Use GUI sprites for panel textures --- .../cottonmc/cotton/gui/client/BackgroundPainter.java | 4 ++-- .../libgui/textures/gui/sprites/widget/panel_dark.png | Bin 0 -> 1644 bytes .../textures/gui/sprites/widget/panel_dark.png.mcmeta | 10 ++++++++++ .../libgui/textures/gui/sprites/widget/panel_light.png | Bin 0 -> 650 bytes .../textures/gui/sprites/widget/panel_light.png.mcmeta | 10 ++++++++++ .../assets/libgui/textures/widget/panel_dark.png | Bin 1644 -> 0 bytes .../assets/libgui/textures/widget/panel_light.png | Bin 650 -> 0 bytes 7 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta delete mode 100644 src/main/resources/assets/libgui/textures/widget/panel_dark.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/panel_light.png (limited to 'src/main/resources/assets/libgui') diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/BackgroundPainter.java b/src/main/java/io/github/cottonmc/cotton/gui/client/BackgroundPainter.java index 7831f33..a709b64 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/BackgroundPainter.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/BackgroundPainter.java @@ -41,8 +41,8 @@ public interface BackgroundPainter { * @since 1.5.0 */ public static BackgroundPainter VANILLA = createLightDarkVariants( - createNinePatch(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/panel_light.png")), - createNinePatch(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/panel_dark.png")) + createGuiSprite(new Identifier(LibGuiCommon.MOD_ID, "widget/panel_light")), + createGuiSprite(new Identifier(LibGuiCommon.MOD_ID, "widget/panel_dark")) ); /** diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png new file mode 100644 index 0000000..c4e643f Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta new file mode 100644 index 0000000..0f75440 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 4 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png new file mode 100644 index 0000000..8bb50a8 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta new file mode 100644 index 0000000..0f75440 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 4 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/widget/panel_dark.png b/src/main/resources/assets/libgui/textures/widget/panel_dark.png deleted file mode 100644 index c4e643f..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/panel_dark.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/panel_light.png b/src/main/resources/assets/libgui/textures/widget/panel_light.png deleted file mode 100644 index 8bb50a8..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/panel_light.png and /dev/null differ -- cgit From 8d1d2442866b3bb3a4b1d098add0ccb65343cd60 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sat, 9 Sep 2023 22:19:41 +0300 Subject: Move scroll bar textures to GUI sprites --- .../cotton/gui/impl/client/WidgetTextures.java | 19 ++++++++++ .../cottonmc/cotton/gui/widget/WScrollBar.java | 39 ++++++--------------- .../sprites/widget/scroll_bar/background_dark.png | Bin 0 -> 165 bytes .../widget/scroll_bar/background_dark.png.mcmeta | 10 ++++++ .../sprites/widget/scroll_bar/background_light.png | Bin 0 -> 159 bytes .../widget/scroll_bar/background_light.png.mcmeta | 10 ++++++ .../gui/sprites/widget/scroll_bar/focus.png | Bin 0 -> 156 bytes .../gui/sprites/widget/scroll_bar/focus.png.mcmeta | 10 ++++++ .../gui/sprites/widget/scroll_bar/thumb_dark.png | Bin 0 -> 164 bytes .../widget/scroll_bar/thumb_dark.png.mcmeta | 10 ++++++ .../widget/scroll_bar/thumb_hovered_dark.png | Bin 0 -> 164 bytes .../scroll_bar/thumb_hovered_dark.png.mcmeta | 10 ++++++ .../widget/scroll_bar/thumb_hovered_light.png | Bin 0 -> 164 bytes .../scroll_bar/thumb_hovered_light.png.mcmeta | 10 ++++++ .../gui/sprites/widget/scroll_bar/thumb_light.png | Bin 0 -> 162 bytes .../widget/scroll_bar/thumb_light.png.mcmeta | 10 ++++++ .../widget/scroll_bar/thumb_pressed_dark.png | Bin 0 -> 164 bytes .../scroll_bar/thumb_pressed_dark.png.mcmeta | 10 ++++++ .../widget/scroll_bar/thumb_pressed_light.png | Bin 0 -> 161 bytes .../scroll_bar/thumb_pressed_light.png.mcmeta | 10 ++++++ .../textures/widget/scroll_bar/background_dark.png | Bin 165 -> 0 bytes .../widget/scroll_bar/background_light.png | Bin 159 -> 0 bytes .../libgui/textures/widget/scroll_bar/focus.png | Bin 156 -> 0 bytes .../textures/widget/scroll_bar/scroll_bar_dark.png | Bin 164 -> 0 bytes .../widget/scroll_bar/scroll_bar_hovered_dark.png | Bin 164 -> 0 bytes .../widget/scroll_bar/scroll_bar_hovered_light.png | Bin 164 -> 0 bytes .../widget/scroll_bar/scroll_bar_light.png | Bin 162 -> 0 bytes .../widget/scroll_bar/scroll_bar_pressed_dark.png | Bin 164 -> 0 bytes .../widget/scroll_bar/scroll_bar_pressed_light.png | Bin 161 -> 0 bytes 29 files changed, 120 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png create mode 100644 src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/background_dark.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/background_light.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/focus.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_dark.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_dark.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_light.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_light.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_dark.png delete mode 100644 src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_light.png (limited to 'src/main/resources/assets/libgui') diff --git a/src/main/java/io/github/cottonmc/cotton/gui/impl/client/WidgetTextures.java b/src/main/java/io/github/cottonmc/cotton/gui/impl/client/WidgetTextures.java index 86a2630..fd5a806 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/impl/client/WidgetTextures.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/impl/client/WidgetTextures.java @@ -22,6 +22,18 @@ public final class WidgetTextures { id("widget/button_disabled_dark"), id("widget/button_highlighted_dark") ); + private static final ScrollBarTextures LIGHT_SCROLL_BAR = new ScrollBarTextures( + id("widget/scroll_bar/background_light"), + id("widget/scroll_bar/thumb_light"), + id("widget/scroll_bar/thumb_pressed_light"), + id("widget/scroll_bar/thumb_hovered_light") + ); + private static final ScrollBarTextures DARK_SCROLL_BAR = new ScrollBarTextures( + id("widget/scroll_bar/background_dark"), + id("widget/scroll_bar/thumb_dark"), + id("widget/scroll_bar/thumb_pressed_dark"), + id("widget/scroll_bar/thumb_hovered_dark") + ); public static ButtonTextures getButtonTextures(boolean dark) { return dark ? DARK_BUTTON : PressableWidgetAccessor.libgui$getTextures(); @@ -31,7 +43,14 @@ public final class WidgetTextures { return dark ? DARK_LABELED_SLIDER_HANDLE : LIGHT_LABELED_SLIDER_HANDLE; } + public static ScrollBarTextures getScrollBarTextures(boolean dark) { + return dark ? DARK_SCROLL_BAR : LIGHT_SCROLL_BAR; + } + private static Identifier id(String path) { return new Identifier(LibGuiCommon.MOD_ID, path); } + + public record ScrollBarTextures(Identifier background, Identifier thumb, Identifier thumbPressed, Identifier thumbHovered) { + } } diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WScrollBar.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WScrollBar.java index a0c04be..add8688 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WScrollBar.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WScrollBar.java @@ -7,17 +7,14 @@ import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.screen.narration.NarrationPart; import net.minecraft.util.Identifier; -import io.github.cottonmc.cotton.gui.client.BackgroundPainter; import io.github.cottonmc.cotton.gui.impl.LibGuiCommon; import io.github.cottonmc.cotton.gui.impl.client.NarrationMessages; -import io.github.cottonmc.cotton.gui.impl.client.NinePatchTextureRendererImpl; +import io.github.cottonmc.cotton.gui.impl.client.WidgetTextures; import io.github.cottonmc.cotton.gui.widget.data.Axis; import io.github.cottonmc.cotton.gui.widget.data.InputResult; -import juuxel.libninepatch.NinePatch; - -import static io.github.cottonmc.cotton.gui.client.BackgroundPainter.createNinePatch; public class WScrollBar extends WWidget { + private static final Identifier FOCUS_TEXTURE = new Identifier(LibGuiCommon.MOD_ID, "widget/scroll_bar/focus"); private static final int SCROLLING_SPEED = 4; protected Axis axis = Axis.HORIZONTAL; @@ -49,34 +46,35 @@ public class WScrollBar extends WWidget { public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) { var matrices = context.getMatrices(); boolean darkMode = shouldRenderInDarkMode(); + var textures = WidgetTextures.getScrollBarTextures(darkMode); - Painters.BACKGROUND.paintBackground(context, x, y, this); + context.drawGuiTexture(textures.background(), x, y, getWidth(), getHeight()); - NinePatch painter = (darkMode ? Painters.SCROLL_BAR_DARK : Painters.SCROLL_BAR); + Identifier thumbTexture = textures.thumb(); if (maxValue <= 0) return; if (sliding) { - painter = (darkMode ? Painters.SCROLL_BAR_PRESSED_DARK : Painters.SCROLL_BAR_PRESSED); + thumbTexture = textures.thumbPressed(); } else if (isWithinBounds(mouseX, mouseY)) { - painter = (darkMode ? Painters.SCROLL_BAR_HOVERED_DARK : Painters.SCROLL_BAR_HOVERED); + thumbTexture = textures.thumbHovered(); } matrices.push(); if (axis == Axis.HORIZONTAL) { matrices.translate(x + 1 + getHandlePosition(), y + 1, 0); - painter.draw(NinePatchTextureRendererImpl.INSTANCE, context, getHandleSize(), height - 2); + context.drawGuiTexture(thumbTexture, 0, 0, getHandleSize(), getHeight() - 2); if (isFocused()) { - Painters.FOCUS.draw(NinePatchTextureRendererImpl.INSTANCE, context, getHandleSize(), height - 2); + context.drawGuiTexture(FOCUS_TEXTURE, 0, 0, getHandleSize(), getHeight() - 2); } } else { matrices.translate(x + 1, y + 1 + getHandlePosition(), 0); - painter.draw(NinePatchTextureRendererImpl.INSTANCE, context, width - 2, getHandleSize()); + context.drawGuiTexture(thumbTexture, 0, 0, getWidth() - 2, getHandleSize()); if (isFocused()) { - Painters.FOCUS.draw(NinePatchTextureRendererImpl.INSTANCE, context, width - 2, getHandleSize()); + context.drawGuiTexture(FOCUS_TEXTURE, 0, 0, getWidth() - 2, getHandleSize()); } } @@ -255,19 +253,4 @@ public class WScrollBar extends WWidget { builder.put(NarrationPart.TITLE, NarrationMessages.SCROLL_BAR_TITLE); builder.put(NarrationPart.USAGE, NarrationMessages.SLIDER_USAGE); } - - @Environment(EnvType.CLIENT) - static final class Painters { - static final NinePatch SCROLL_BAR = NinePatch.builder(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/scroll_bar_light.png")).cornerSize(4).cornerUv(0.25f).build(); - static final NinePatch SCROLL_BAR_DARK = NinePatch.builder(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/scroll_bar_dark.png")).cornerSize(4).cornerUv(0.25f).build(); - static final NinePatch SCROLL_BAR_PRESSED = NinePatch.builder(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/scroll_bar_pressed_light.png")).cornerSize(4).cornerUv(0.25f).build(); - static final NinePatch SCROLL_BAR_PRESSED_DARK = NinePatch.builder(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/scroll_bar_pressed_dark.png")).cornerSize(4).cornerUv(0.25f).build(); - static final NinePatch SCROLL_BAR_HOVERED = NinePatch.builder(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/scroll_bar_hovered_light.png")).cornerSize(4).cornerUv(0.25f).build(); - static final NinePatch SCROLL_BAR_HOVERED_DARK = NinePatch.builder(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/scroll_bar_hovered_dark.png")).cornerSize(4).cornerUv(0.25f).build(); - static final BackgroundPainter BACKGROUND = BackgroundPainter.createLightDarkVariants( - createNinePatch(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/background_light.png")), - createNinePatch(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/background_dark.png")) - ); - static final NinePatch FOCUS = NinePatch.builder(new Identifier(LibGuiCommon.MOD_ID, "textures/widget/scroll_bar/focus.png")).cornerSize(4).cornerUv(0.25f).build(); - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png new file mode 100644 index 0000000..3df12e3 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png new file mode 100644 index 0000000..38c6ef8 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png new file mode 100644 index 0000000..955aa7e Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png new file mode 100644 index 0000000..4c2aab0 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png new file mode 100644 index 0000000..472db90 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png new file mode 100644 index 0000000..b0695ed Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png new file mode 100644 index 0000000..6d802e7 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png new file mode 100644 index 0000000..8835712 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png new file mode 100644 index 0000000..9df19b0 Binary files /dev/null and b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png differ diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta new file mode 100644 index 0000000..731ee64 --- /dev/null +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } + } +} diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/background_dark.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/background_dark.png deleted file mode 100644 index 3df12e3..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/background_dark.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/background_light.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/background_light.png deleted file mode 100644 index 38c6ef8..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/background_light.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/focus.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/focus.png deleted file mode 100644 index 955aa7e..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/focus.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_dark.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_dark.png deleted file mode 100644 index 4c2aab0..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_dark.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_dark.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_dark.png deleted file mode 100644 index 472db90..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_dark.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_light.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_light.png deleted file mode 100644 index b0695ed..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_hovered_light.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_light.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_light.png deleted file mode 100644 index 6d802e7..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_light.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_dark.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_dark.png deleted file mode 100644 index 8835712..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_dark.png and /dev/null differ diff --git a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_light.png b/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_light.png deleted file mode 100644 index 9df19b0..0000000 Binary files a/src/main/resources/assets/libgui/textures/widget/scroll_bar/scroll_bar_pressed_light.png and /dev/null differ -- cgit From 5741cdd02b7b7b304bb44fb788900f1cf0097fc2 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sat, 9 Sep 2023 22:25:51 +0300 Subject: Fix messed up mcmeta formatting --- .../gui/sprites/widget/button_dark.png.mcmeta | 14 ++++++------- .../sprites/widget/button_disabled_dark.png.mcmeta | 14 ++++++------- .../widget/button_highlighted_dark.png.mcmeta | 14 ++++++------- .../gui/sprites/widget/panel_dark.png.mcmeta | 14 ++++++------- .../gui/sprites/widget/panel_light.png.mcmeta | 14 ++++++------- .../widget/scroll_bar/background_dark.png.mcmeta | 14 ++++++------- .../widget/scroll_bar/background_light.png.mcmeta | 14 ++++++------- .../gui/sprites/widget/scroll_bar/focus.png.mcmeta | 14 ++++++------- .../widget/scroll_bar/thumb_dark.png.mcmeta | 14 ++++++------- .../scroll_bar/thumb_hovered_dark.png.mcmeta | 14 ++++++------- .../scroll_bar/thumb_hovered_light.png.mcmeta | 14 ++++++------- .../widget/scroll_bar/thumb_light.png.mcmeta | 14 ++++++------- .../scroll_bar/thumb_pressed_dark.png.mcmeta | 14 ++++++------- .../scroll_bar/thumb_pressed_light.png.mcmeta | 14 ++++++------- .../sprites/widget/slider_handle_dark.png.mcmeta | 24 +++++++++++----------- .../slider_handle_highlighted_dark.png.mcmeta | 24 +++++++++++----------- 16 files changed, 122 insertions(+), 122 deletions(-) (limited to 'src/main/resources/assets/libgui') diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta index bcf5fc2..287153a 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 200, - "height": 20, - "border": 3 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 200, + "height": 20, + "border": 3 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta index bcf5fc2..287153a 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_disabled_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 200, - "height": 20, - "border": 3 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 200, + "height": 20, + "border": 3 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta index bcf5fc2..287153a 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/button_highlighted_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 200, - "height": 20, - "border": 3 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 200, + "height": 20, + "border": 3 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta index 0f75440..628f1c7 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 4 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 4 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta index 0f75440..628f1c7 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/panel_light.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 4 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 4 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/background_light.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/focus.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_hovered_light.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_dark.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta index 731ee64..83b4877 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/scroll_bar/thumb_pressed_light.png.mcmeta @@ -1,10 +1,10 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 16, - "height": 16, - "border": 1 + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 1 + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta index dab004a..2024b86 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_dark.png.mcmeta @@ -1,15 +1,15 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 8, - "height": 20, - "border": { - "left": 2, - "top": 2, - "right": 2, - "bottom": 3 - } + "gui": { + "scaling": { + "type": "nine_slice", + "width": 8, + "height": 20, + "border": { + "left": 2, + "top": 2, + "right": 2, + "bottom": 3 + } + } } - } } diff --git a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta index dab004a..2024b86 100644 --- a/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta +++ b/src/main/resources/assets/libgui/textures/gui/sprites/widget/slider_handle_highlighted_dark.png.mcmeta @@ -1,15 +1,15 @@ { - "gui": { - "scaling": { - "type": "nine_slice", - "width": 8, - "height": 20, - "border": { - "left": 2, - "top": 2, - "right": 2, - "bottom": 3 - } + "gui": { + "scaling": { + "type": "nine_slice", + "width": 8, + "height": 20, + "border": { + "left": 2, + "top": 2, + "right": 2, + "bottom": 3 + } + } } - } } -- cgit