Replace SimpleColorPicker with LuxColorPicker

Author: llbit

build.gradle

@@ -36,12 +36,14 @@ subprojects {
   configurations {
     jsonlib
     nbtlib
+    cplib
   }
 
   dependencies {
     compile configurations.jsonlib
     jsonlib 'se.llbit:jo-json:1.3.1'
     nbtlib 'se.llbit:jo-nbt:1.2.0'
+    cplib 'se.llbit:luxcp:1.0'
   }
 
   // Code coverage with Jacoco:

chunky/build.gradle

@@ -8,14 +8,15 @@ archivesBaseName = 'chunky-core'
 dependencies {
   compile 'org.apache.commons:commons-math3:3.2'
   compile configurations.nbtlib
+  compile configurations.cplib
   compile project(':lib')
 
   testCompile 'com.google.truth:truth:0.30'
   testCompile 'junit:junit:4.12'
 }
 
 jar {
-  // Include classes from the common library.
+  // Include all dependencies in the Jar.
   from project(':lib').configurations.archives.allArtifacts.files.collect {
     zipTree(it)
   }
@@ -25,6 +26,9 @@ jar {
   from configurations.nbtlib.files.collect {
     zipTree(it)
   }
+  from configurations.cplib.files.collect {
+    zipTree(it)
+  }
   manifest {
     attributes('Main-Class': mainClassName)
   }
@@ -136,10 +140,11 @@ project.afterEvaluate {
   def installers = project.tasks.install.repositories
   def deployers = project.tasks.uploadArchives.repositories
   installers.plus(deployers)*.pom*.whenConfigured {pom ->
-    // Exclude the :lib and jo-json dependencies because they are embedded in the built Jar.
+    // Exclude the dependencies that are embedded in the Jar.
     pom.dependencies.removeAll { it.groupId == 'se.llbit' && it.artifactId == 'lib' }
     pom.dependencies.removeAll { it.groupId == 'se.llbit' && it.artifactId == 'jo-json' }
     pom.dependencies.removeAll { it.groupId == 'se.llbit' && it.artifactId == 'jo-nbt' }
+    pom.dependencies.removeAll { it.groupId == 'se.llbit' && it.artifactId == 'luxcp' }
 
     // Change POM version to -SNAPSHOT for intermediate builds.
     if (project.version =~ /\d+\.\d+(\.\d+)?-.+/) {

chunky/src/java/se/llbit/chunky/ui/ChunkyFxController.java

@@ -64,6 +64,8 @@
 import se.llbit.chunky.world.Icon;
 import se.llbit.chunky.world.World;
 import se.llbit.chunky.world.listeners.ChunkUpdateListener;
+import se.llbit.fx.LuxColorPalette;
+import se.llbit.fx.LuxColorPicker;
 import se.llbit.fxutil.GroupedChangeListener;
 import se.llbit.log.Level;
 import se.llbit.log.Log;
@@ -139,7 +141,7 @@ public class ChunkyFxController
 
   @FXML private ChoiceBox<Block> highlightCb;
 
-  @FXML private SimpleColorPicker highlightColor;
+  @FXML private LuxColorPicker highlightColor;
 
   @FXML private Button editResourcePacks;
 

chunky/src/java/se/llbit/chunky/ui/GradientEditor.java

@@ -35,6 +35,7 @@
 import javafx.scene.paint.Color;
 import se.llbit.chunky.renderer.scene.Sky;
 import se.llbit.chunky.ui.render.SkyTab;
+import se.llbit.fx.LuxColorPicker;
 import se.llbit.json.JsonParser;
 import se.llbit.math.ColorUtil;
 import se.llbit.math.Constants;
@@ -76,7 +77,7 @@ public class GradientEditor extends VBox implements Initializable {
   @FXML private Button importBtn;
   @FXML private Button exportBtn;
   @FXML private Canvas canvas;
-  @FXML private SimpleColorPicker colorPicker;
+  @FXML private LuxColorPicker colorPicker;
 
   private List<Vector4> gradient;
   int selected = 0;