Fix freecam rotation on macOS (#16) · starhaven.dev/diorama@1dd33b0

+13 -3

.classpath

··· 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <classpath> 3 - <classpathentry kind="src" output="bin/main" path="src/main/resources"/> 4 - <classpathentry kind="src" output="bin/main" path="src/main/java"/> 5 - <classpathentry kind="src" path="src/bootstrap/java"/> 3 + <classpathentry kind="src" output="bin/main" path="src/main/resources"> 4 + <attributes> 5 + <attribute name="gradle_scope" value="main" /> 6 + <attribute name="gradle_used_by_scope" value="main,test" /> 7 + </attributes> 8 + </classpathentry> 9 + <classpathentry kind="src" output="bin/main" path="src/main/java"> 10 + <attributes> 11 + <attribute name="gradle_scope" value="main" /> 12 + <attribute name="gradle_used_by_scope" value="main,test" /> 13 + </attributes> 14 + </classpathentry> 15 + <classpathentry kind="src" path="src/bootstrap/java" /> 6 16 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/> 7 17 <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/> 8 18 <classpathentry kind="output" path="bin/default"/>

+2

flake.nix

··· 29 29 in 30 30 '' 31 31 export JAVA_TOOL_OPTIONS="${loadLombok}${prev}" 32 + export JAVA_HOME="${jdk}" 33 + export GRADLE_HOME="${gradle}" 32 34 ''; 33 35 }; 34 36 });

+24

gradle/verification-metadata.xml

··· 3 3 <configuration> 4 4 <verify-metadata>true</verify-metadata> 5 5 <verify-signatures>false</verify-signatures> 6 + <trusted-artifacts> 7 + <trust file=".*-javadoc[.]jar" regex="true" /> 8 + <trust file=".*-sources[.]jar" regex="true" /> 9 + </trusted-artifacts> 6 10 </configuration> 7 11 <components> 8 12 <component group="com.alexandriasoftware.swing" name="jsplitbutton" version="1.3.1"> ··· 725 729 </artifact> 726 730 </component> 727 731 <component group="org.junit" name="junit-bom" version="5.10.0"> 732 + <artifact name="junit-bom-5.10.0.module"> 733 + <sha256 value="eb3ee6127608010694a898056e7407d117296003aba5f5db801df430b9887fcf" 734 + origin="Generated by Gradle" /> 735 + </artifact> 728 736 <artifact name="junit-bom-5.10.0.pom"> 729 737 <sha256 value="e006dd8894f9fc7b75fc32bb12fe5ed8be65667d5b454f99e2e0b8c5bb8d30b3" origin="Generated by Gradle"/> 730 738 </artifact> ··· 746 754 </artifact> 747 755 </component> 748 756 <component group="org.junit" name="junit-bom" version="5.7.2"> 757 + <artifact name="junit-bom-5.7.2.module"> 758 + <sha256 value="f3bceb1c59dd4f6993f4304dffa580172b8df65a76cd36fa4fd92c0578d28ad8" 759 + origin="Generated by Gradle" /> 760 + </artifact> 749 761 <artifact name="junit-bom-5.7.2.pom"> 750 762 <sha256 value="cd14aaa869991f82021c585d570d31ff342bcba58bb44233b70193771b96487b" origin="Generated by Gradle"/> 751 763 </artifact> 752 764 </component> 753 765 <component group="org.junit" name="junit-bom" version="5.9.1"> 766 + <artifact name="junit-bom-5.9.1.module"> 767 + <sha256 value="9026c1656690fa145ad75ece83674211aa12ad8930a91b107c2f5cdece2f1b1c" 768 + origin="Generated by Gradle" /> 769 + </artifact> 754 770 <artifact name="junit-bom-5.9.1.pom"> 755 771 <sha256 value="b163c1cfc8fc1fd58b457a00d586c04c46e986d75904e9ca54c03a97d65b496c" origin="Generated by Gradle"/> 756 772 </artifact> ··· 1004 1020 </artifact> 1005 1021 </component> 1006 1022 <component group="org.springframework" name="spring-framework-bom" version="5.3.11"> 1023 + <artifact name="spring-framework-bom-5.3.11.module"> 1024 + <sha256 value="6632b6f9d8f35d67a7d1e130146817de97b17a4b0cd761ac171efc1036af29db" 1025 + origin="Generated by Gradle" /> 1026 + </artifact> 1007 1027 <artifact name="spring-framework-bom-5.3.11.pom"> 1008 1028 <sha256 value="1cd05f081ec2ad11ad3859f430c3996c14fc1f00dc5fe9388ece325ab946b92a" origin="Generated by Gradle"/> 1009 1029 </artifact> 1010 1030 </component> 1011 1031 <component group="org.springframework" name="spring-framework-bom" version="5.3.24"> 1032 + <artifact name="spring-framework-bom-5.3.24.module"> 1033 + <sha256 value="1996e1f617cb03fa76ea11850fe2a1e20b0e30a1046ba6d5db3bdbbf44113fce" 1034 + origin="Generated by Gradle" /> 1035 + </artifact> 1012 1036 <artifact name="spring-framework-bom-5.3.24.pom"> 1013 1037 <sha256 value="535213566bbbefe2636a0d4e8dd1a73ade612e2430c8ffd310dcc2a3b3b9ba41" origin="Generated by Gradle"/> 1014 1038 </artifact>

+6 -1

src/main/java/app/Environment.java

··· 26 26 import javax.swing.JOptionPane; 27 27 import javax.swing.SwingUtilities; 28 28 29 + import org.apache.commons.io.FileExistsException; 29 30 import org.apache.commons.io.FileUtils; 30 31 import org.apache.commons.lang3.SystemUtils; 31 32 import org.yaml.snakeyaml.Yaml; ··· 378 379 // backwards compatibility for Star Rod 0.9.2 and below: move old config to new location 379 380 File oldConfigFile = new File(codeSource.getParent(), "cfg/main.cfg"); 380 381 if (oldConfigFile.exists()) { 381 - FileUtils.moveFile(oldConfigFile, configFile); 382 + try { 383 + FileUtils.moveFile(oldConfigFile, configFile); 384 + } catch (FileExistsException e) { 385 + // existing configFile takes precedence 386 + } 382 387 } 383 388 384 389 // we may need to create a new config file here

+7 -2

src/main/java/common/MouseInput.java

··· 17 17 18 18 import javax.swing.SwingUtilities; 19 19 20 + import app.Environment; 20 21 import util.Logger; 21 22 22 23 public class MouseInput implements MouseListener, MouseWheelListener ··· 196 197 new Point(), 197 198 null); 198 199 try { 199 - robot = new Robot(); 200 + if (Environment.isMacOS()) { 201 + // Moving mouse with Robot on macOS is not supported without enabling accessibility permissions 202 + } else { 203 + robot = new Robot(); 204 + } 200 205 } 201 206 catch (AWTException e) { 202 207 robot = null; ··· 230 235 SwingUtilities.convertPointFromScreen(curPos, comp); 231 236 232 237 boolean hadLocation = hasLocation; 233 - hasLocation = comp.contains(curPos); 238 + hasLocation = comp.contains(curPos) || Environment.isMacOS(); 234 239 235 240 if (hasLocation) { 236 241 int posX = (int) Math.round(curPos.getX());

Configure Feed

Configure Feed