diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt index 6ce6de1b0..764a624df 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt @@ -1,5 +1,8 @@ package ru.dbotthepony.mc.otm.client.screen.panels +import net.minecraft.resources.ResourceLocation +import ru.dbotthepony.mc.otm.OverdriveThatMatters +import ru.dbotthepony.mc.otm.client.render.AtlasSkinElement import ru.dbotthepony.mc.otm.client.render.WidgetLocation import ru.dbotthepony.mc.otm.client.render.element @@ -13,17 +16,17 @@ object ScrollBarConstants { val BODY = WidgetLocation.SCROLL.element(0f, 46f, 14f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BOTTOM = WidgetLocation.SCROLL.element(0f, 51f, 14f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON = WidgetLocation.SCROLL.element(0f, 0f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON_HOVER = WidgetLocation.SCROLL.element(0f, 15f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON_PRESS = WidgetLocation.SCROLL.element(0f, 30f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val BUTTON_DISABLED = WidgetLocation.SCROLL.element(0f, 53f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) + val BUTTON = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/idle")) + val BUTTON_HOVER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/hovered")) + val BUTTON_PRESS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/pressed")) + val BUTTON_DISABLED = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar/disabled")) val SLIM_TOP = WidgetLocation.SCROLL.element(14f, 45f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BODY = WidgetLocation.SCROLL.element(14f, 46f, 8f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BOTTOM = WidgetLocation.SCROLL.element(14f, 51f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON = WidgetLocation.SCROLL.element(14f, 0f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON_HOVER = WidgetLocation.SCROLL.element(14f, 15f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON_PRESS = WidgetLocation.SCROLL.element(14f, 30f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) - val SLIM_BUTTON_DISABLED = WidgetLocation.SCROLL.element(14f, 53f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) + val SLIM_BUTTON = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/idle")) + val SLIM_BUTTON_HOVER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/hovered")) + val SLIM_BUTTON_PRESS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/pressed")) + val SLIM_BUTTON_DISABLED = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "widgets/scrollbar_slim/disabled")) } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png deleted file mode 100644 index a5c44ed98..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf deleted file mode 100644 index 756794938..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/background.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/background.png new file mode 100644 index 000000000..16a6d03eb Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/background.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/disabled.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/disabled.png new file mode 100644 index 000000000..c806a787f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/disabled.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/hovered.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/hovered.png new file mode 100644 index 000000000..2c1f8a772 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/hovered.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/idle.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/idle.png new file mode 100644 index 000000000..d0b74649f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/idle.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/pressed.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/pressed.png new file mode 100644 index 000000000..288b7262e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar/pressed.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/background.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/background.png new file mode 100644 index 000000000..2adde05a3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/background.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/disabled.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/disabled.png new file mode 100644 index 000000000..32aa4cf05 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/disabled.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/hovered.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/hovered.png new file mode 100644 index 000000000..358046b42 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/hovered.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/idle.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/idle.png new file mode 100644 index 000000000..11663c093 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/idle.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/pressed.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/pressed.png new file mode 100644 index 000000000..805e39d95 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets/scrollbar_slim/pressed.png differ