diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 8c54a0be05..33f6cc86e8 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -87,6 +87,7 @@ object Libraries { const val orangeExtensions = "1.0" const val petitparser = "2.3.1" const val plexus = "3.3.0" + const val radiance = "2.5.1" const val rxjava = "2.2.16" const val rxrelay = "2.1.1" const val scribejava = "6.9.0" @@ -96,8 +97,6 @@ object Libraries { const val springJdbc = "5.2.2.RELEASE" const val springboot = "2.2.2.RELEASE" const val sql2o = "1.6.0" - const val substance = "8.0.02" - const val trident = "1.5.00" } const val annotations = "org.jetbrains:annotations:${Versions.annotations}" @@ -175,7 +174,7 @@ object Libraries { const val springbootStarterTomcat = "org.springframework.boot:spring-boot-starter-tomcat:${Versions.springboot}" const val springbootJdbc = "org.springframework:spring-jdbc:${Versions.springJdbc}" const val sql2o = "org.sql2o:sql2o:${Versions.sql2o}" - const val substance = "net.runelite.pushingpixels:substance:${Versions.substance}" - const val trident = "net.runelite.pushingpixels:trident:${Versions.trident}" + const val substance = "org.pushing-pixels:radiance-substance:${Versions.radiance}" + const val trident = "org.pushing-pixels:radiance-trident:${Versions.radiance}" const val vanilla = "net.runelite.rs:vanilla:${ProjectVersions.rsversion}" } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 67ffd6fd58..15e297652b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -562,6 +562,7 @@ class ConfigPanel extends PluginPanel JSlider slider = new JSlider(min, max, value); sliderValueLabel.setText(String.valueOf(slider.getValue())); slider.setPreferredSize(new Dimension(80, 25)); + slider.setBackground(Color.WHITE); slider.addChangeListener((l) -> { sliderValueLabel.setText(String.valueOf(slider.getValue())); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java index 33400b0bdc..83d59167cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java @@ -65,10 +65,11 @@ class ObsidianSkin extends SubstanceSkin final SubstanceColorSchemeBundle defaultSchemeBundle = new SubstanceColorSchemeBundle( activeScheme, enabledScheme, enabledScheme); - defaultSchemeBundle.registerColorScheme(enabledScheme, 0.6f, - ComponentState.DISABLED_UNSELECTED); - defaultSchemeBundle.registerColorScheme(activeScheme, 0.6f, - ComponentState.DISABLED_SELECTED); + + defaultSchemeBundle.registerAlpha(0.6f, ComponentState.DISABLED_UNSELECTED); + defaultSchemeBundle.registerColorScheme(enabledScheme, ComponentState.DISABLED_UNSELECTED); + defaultSchemeBundle.registerAlpha(0.6f, ComponentState.DISABLED_SELECTED); + defaultSchemeBundle.registerColorScheme(activeScheme, ComponentState.DISABLED_SELECTED); // borders final SubstanceColorScheme borderDisabledSelectedScheme = schemes @@ -82,7 +83,8 @@ class ObsidianSkin extends SubstanceSkin final SubstanceColorScheme markActiveScheme = schemes.get("RuneLite Mark Active"); defaultSchemeBundle.registerColorScheme(markActiveScheme, ColorSchemeAssociationKind.MARK, ComponentState.getActiveStates()); - defaultSchemeBundle.registerColorScheme(markActiveScheme, 0.6f, + defaultSchemeBundle.registerAlpha(0.6f, ComponentState.DISABLED_SELECTED, ComponentState.DISABLED_UNSELECTED); + defaultSchemeBundle.registerColorScheme(markActiveScheme, ColorSchemeAssociationKind.MARK, ComponentState.DISABLED_SELECTED, ComponentState.DISABLED_UNSELECTED); @@ -102,8 +104,8 @@ class ObsidianSkin extends SubstanceSkin final SubstanceColorSchemeBundle decorationsSchemeBundle = new SubstanceColorSchemeBundle( activeScheme, enabledScheme, enabledScheme); - decorationsSchemeBundle.registerColorScheme(enabledScheme, 0.5f, - ComponentState.DISABLED_UNSELECTED); + decorationsSchemeBundle.registerAlpha(0.5f, ComponentState.DISABLED_UNSELECTED); + decorationsSchemeBundle.registerColorScheme(enabledScheme, ComponentState.DISABLED_UNSELECTED); // borders decorationsSchemeBundle.registerColorScheme(borderDisabledSelectedScheme, @@ -129,8 +131,8 @@ class ObsidianSkin extends SubstanceSkin final SubstanceColorSchemeBundle headerSchemeBundle = new SubstanceColorSchemeBundle(activeScheme, enabledScheme, enabledScheme); - headerSchemeBundle.registerColorScheme(enabledScheme, 0.5f, - ComponentState.DISABLED_UNSELECTED); + headerSchemeBundle.registerAlpha(0.5f, ComponentState.DISABLED_UNSELECTED); + headerSchemeBundle.registerColorScheme(enabledScheme, ComponentState.DISABLED_UNSELECTED); // borders final SubstanceColorScheme headerBorderScheme = schemes.get("RuneLite Header Border"); @@ -142,13 +144,15 @@ class ObsidianSkin extends SubstanceSkin headerSchemeBundle.registerColorScheme(markActiveScheme, ColorSchemeAssociationKind.MARK, ComponentState.getActiveStates()); - headerSchemeBundle.registerHighlightColorScheme(activeScheme, 0.7f, + headerSchemeBundle.registerAlpha(0.7f, ComponentState.ROLLOVER_UNSELECTED, + ComponentState.ROLLOVER_ARMED, ComponentState.ARMED); + headerSchemeBundle.registerHighlightColorScheme(activeScheme, ComponentState.ROLLOVER_UNSELECTED, ComponentState.ROLLOVER_ARMED, ComponentState.ARMED); - headerSchemeBundle.registerHighlightColorScheme(activeScheme, 0.8f, - ComponentState.SELECTED); - headerSchemeBundle.registerHighlightColorScheme(activeScheme, 1.0f, - ComponentState.ROLLOVER_SELECTED); + headerSchemeBundle.registerAlpha(0.8f, ComponentState.SELECTED); + headerSchemeBundle.registerHighlightColorScheme(activeScheme, ComponentState.SELECTED); + headerSchemeBundle.registerAlpha(1.0f, ComponentState.ROLLOVER_SELECTED); + headerSchemeBundle.registerHighlightColorScheme(activeScheme, ComponentState.ROLLOVER_SELECTED); final SubstanceColorScheme headerWatermarkScheme = schemes.get("RuneLite Header Watermark");