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 src/main/resources/fabric.mod.json | 6 +++--- src/main/resources/mixins.libgui.json | 4 +++- 13 files changed, 66 insertions(+), 4 deletions(-) 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') 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 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9a59c86..bbd2386 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,12 +25,12 @@ "mixins": ["mixins.libgui.json"], "depends": { "java": ">=17", - "fabricloader": ">=0.14.21", + "fabricloader": ">=0.14.22", "fabric-api-base": ">=0.4.4", "fabric-lifecycle-events-v1": "^2.0.2", - "fabric-networking-api-v1": "^1.0.21", + "fabric-networking-api-v1": "^3.0.5", "fabric-rendering-v1": "^3.0.6", - "minecraft": ">=1.20-rc.1", + "minecraft": ">=1.20.2-beta.2", "jankson": "^6.0.0", "libninepatch": "^1.2.0" }, diff --git a/src/main/resources/mixins.libgui.json b/src/main/resources/mixins.libgui.json index 6698d08..d72e129 100644 --- a/src/main/resources/mixins.libgui.json +++ b/src/main/resources/mixins.libgui.json @@ -7,7 +7,9 @@ "client": [ "client.MinecraftClientMixin", - "client.ScreenAccessor" + "client.PressableWidgetAccessor", + "client.ScreenAccessor", + "client.SliderWidgetAccessor" ], "injectors": { -- 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 --- .../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 6 files changed, 20 insertions(+) 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') 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 --- .../gui/sprites/widget/scroll_bar/background_dark.png | Bin 0 -> 165 bytes .../sprites/widget/scroll_bar/background_dark.png.mcmeta | 10 ++++++++++ .../gui/sprites/widget/scroll_bar/background_light.png | Bin 0 -> 159 bytes .../sprites/widget/scroll_bar/background_light.png.mcmeta | 10 ++++++++++ .../textures/gui/sprites/widget/scroll_bar/focus.png | Bin 0 -> 156 bytes .../gui/sprites/widget/scroll_bar/focus.png.mcmeta | 10 ++++++++++ .../textures/gui/sprites/widget/scroll_bar/thumb_dark.png | Bin 0 -> 164 bytes .../gui/sprites/widget/scroll_bar/thumb_dark.png.mcmeta | 10 ++++++++++ .../gui/sprites/widget/scroll_bar/thumb_hovered_dark.png | Bin 0 -> 164 bytes .../widget/scroll_bar/thumb_hovered_dark.png.mcmeta | 10 ++++++++++ .../gui/sprites/widget/scroll_bar/thumb_hovered_light.png | Bin 0 -> 164 bytes .../widget/scroll_bar/thumb_hovered_light.png.mcmeta | 10 ++++++++++ .../gui/sprites/widget/scroll_bar/thumb_light.png | Bin 0 -> 162 bytes .../gui/sprites/widget/scroll_bar/thumb_light.png.mcmeta | 10 ++++++++++ .../gui/sprites/widget/scroll_bar/thumb_pressed_dark.png | Bin 0 -> 164 bytes .../widget/scroll_bar/thumb_pressed_dark.png.mcmeta | 10 ++++++++++ .../gui/sprites/widget/scroll_bar/thumb_pressed_light.png | Bin 0 -> 161 bytes .../widget/scroll_bar/thumb_pressed_light.png.mcmeta | 10 ++++++++++ .../libgui/textures/widget/scroll_bar/background_dark.png | Bin 165 -> 0 bytes .../textures/widget/scroll_bar/background_light.png | Bin 159 -> 0 bytes .../assets/libgui/textures/widget/scroll_bar/focus.png | Bin 156 -> 0 bytes .../libgui/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 .../textures/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 27 files changed, 90 insertions(+) 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') 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') 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