Updated project

* Fixed thread lock bug
* Added deploy command for generating releases
* Made maven generate executable jar files
* Fixed palette not using the correct location on screen

Author: Kariaro

deploy.cmd

@@ -0,0 +1,11 @@
+:: Temporary fix for creating release zip file
+for /f "tokens=* usebackq" %%x in (`dir target /b ^| findstr [0-9]\.jar`) do set "filename=%%x"
+set "releasefolder=%filename:~0,-4% Release"
+mkdir "target/%releasefolder%"
+copy "LICENSE" "target/%releasefolder%/LICENSE"
+copy "README.md" "target/%releasefolder%/README.md"
+echo java -jar %filename% > "target/%releasefolder%/run.cmd"
+cd target
+copy "%filename%" "%releasefolder%/%filename%"
+cd ..
+exit /b

pom.xml

@@ -12,6 +12,39 @@
           <release>15</release>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>com.bobrust.main.Main</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>com.bobrust.main.Main</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

src/main/java/com/bobrust/gui/BobRustDrawDialog.java

@@ -237,7 +237,7 @@ private boolean findColorPalette() {
 				// 150x264
 				overlay.colorRegion.setLocation(screen.width - 150, red_middle.y - 163 + 132 + 100);
 
-				if(rustPalette.analyse(dialog, screenshot, new Point(screen.width - 150, red_middle.y - 163))) {
+				if(rustPalette.analyse(dialog, screenshot, screen.getLocation(), new Point(screen.x + screen.width - 150, screen.y + red_middle.y - 163))) {
 					// Found the palette.
 					LogUtils.info("Found the color palette (%d, %d)", red_middle.x, red_middle.y);
 					overlay.repaint();

src/main/java/com/bobrust/gui/BobRustOverlay.java

@@ -690,13 +690,14 @@ public void setRemainingTime(int index, int maxShapes, long timeLeft) {
 
 	private void updateButtons() {
 		boolean defaultAction = action == OverlayType.NONE;
+		boolean isPaused = gui.borstGenerator.isRunning() && gui.borstGenerator.isPaused();
 
 		// You should only be able to pick monitor the screen is enabled.
-		btnSelectMonitor.setEnabled(defaultAction || gui.borstGenerator.isRunning() && gui.borstGenerator.isPaused());
+		btnSelectMonitor.setEnabled(defaultAction || isPaused);
 		regionsPanelTest.setVisible(isFullscreen);
 		painterPanel.setVisible(isFullscreen);
 
-		btnHideRegions.setEnabled(defaultAction || gui.borstGenerator.isPaused() && gui.borstGenerator.isRunning());
+		btnHideRegions.setEnabled(defaultAction || isPaused);
 		boolean defaultRegion = !btnHideRegions.isSelected() && defaultAction;
 		btnSelectCanvasRegion.setEnabled(defaultRegion || action == OverlayType.SELECT_CANVAS_REGION);
 		btnSelectImageRegion.setEnabled(defaultRegion && image != null || action == OverlayType.SELECT_IMAGE_REGION);
@@ -705,8 +706,8 @@ private void updateButtons() {
 		btnOpenImage.setEnabled(defaultAction);
 		btnStartGenerate.setEnabled(isFullscreen && defaultAction && image != null && !gui.borstGenerator.isRunning());
 		btnPauseGenerate.setEnabled(isFullscreen && gui.borstGenerator.isRunning());
-		btnResetGenerate.setEnabled(gui.borstGenerator.isPaused() && gui.borstGenerator.isRunning());
-		btnDrawImage.setEnabled(gui.borstGenerator.isPaused() && gui.borstGenerator.isRunning());
+		btnResetGenerate.setEnabled(isPaused);
+		btnDrawImage.setEnabled(isPaused);
 	}
 
 	private void changeFullscreen(ActionEvent event) {
@@ -749,7 +750,7 @@ public void onBorstCallback(BorstData data) {
 		repaint();
 
 		if(data.isDone()) {
-			setPauseGeneration(false);
+			btnPauseGenerate.setText("Pause Generate");
 		}
 	}
 

src/main/java/com/bobrust/gui/BobRustShapeRender.java

@@ -13,7 +13,6 @@
 import com.bobrust.generator.Circle;
 import com.bobrust.generator.Model;
 
-// TODO: Sometimes generates the wrong cache.. Try fix this!
 public class BobRustShapeRender {
 	/**
 	 * Each element in this list is 'cacheInterval' shapes apart

src/main/java/com/bobrust/robot/BobRustPalette.java

@@ -24,12 +24,11 @@ public BobRustPalette() {
 		colorMap = new HashMap<>();
 	}
 
-	public synchronized boolean analyse(JDialog dialog, BufferedImage bi, Point panel_offset) {
-		panel_offset = new Point(panel_offset.x, panel_offset.y - 152);
-		this.panel_offset = panel_offset;
+	public synchronized boolean analyse(JDialog dialog, BufferedImage bi, Point screenLocation, Point screenOffset) {
+		this.panel_offset = new Point(screenOffset.x, screenOffset.y - 152);
 		this.colorMap.clear();
 
-		Rectangle rect = new Rectangle(panel_offset.x, panel_offset.y, 150, 525);
+		Rectangle rect = new Rectangle(panel_offset.x - screenLocation.x, panel_offset.y - screenLocation.y, 150, 525);
 		BufferedImage image;
 		try {
 			image = bi.getSubimage(rect.x, rect.y, rect.width, rect.height);